diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 567d6ca..01371aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,11 +26,26 @@ image: registry.gitlab.com/src_prepare/gentoo-repoman-container:latest
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
+  common_pkgcheck_args: "--color 1"
 
-stages:
-  - test
 
-test:
-  stage: test
+repoman_push:
   script:
     - bash scripts/repomanci
+
+pkgcheck_push:
+  script:
+    - pkgcheck scan $common_pkgcheck_args --commits $CI_COMMIT_SHA
+
+pkgcheck_full_scan:
+  rules:
+    - allow_failure: true
+  script:
+    - pkgcheck ci $common_pkgcheck_args
+
+pkgcheck_merge:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  script:
+    - pkgcheck scan $common_pkgcheck_args --commits $CI_MERGE_REQUEST_DIFF_BASE_SHA..$CI_COMMIT_SHA
+
diff --git a/metadata/pkgcheck.conf b/metadata/pkgcheck.conf
new file mode 100644
index 0000000..bc40735
--- /dev/null
+++ b/metadata/pkgcheck.conf
@@ -0,0 +1,5 @@
+[src_prepare-overlay]
+profiles = stable,-default/linux/amd64/17.1/no-multilib,-default/linux/amd64/17.1/no-multilib/hardened,-default/linux/amd64/17.1/no-multilib/hardened/selinux
+# Append warning, style progressively as issues are fixed
+exit = error
+keywords = -NonexistentBlocker