diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c253c56f88477b245d50c2455b49438f19faab81..255233df4d7b255f5e3ac314910fde3e00905072 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 ---
 include:
   - local: 'images/.utils/gitlab-ci.yaml'
-  - local: 'charts/**/.gitlab-ci.yaml'
+  - local: 'charts/.utils/gitlab-ci.yaml'
 stages:
   - build
   - changelog
diff --git a/charts/keycloak/.gitlab-ci.yaml b/charts/.utils/gitlab-ci.yaml
similarity index 69%
rename from charts/keycloak/.gitlab-ci.yaml
rename to charts/.utils/gitlab-ci.yaml
index 6e947d2e9bfc291221767766f4c7744fc1774940..2e45ade0d6cea16ff6257c478437f19b57a1a3db 100644
--- a/charts/keycloak/.gitlab-ci.yaml
+++ b/charts/.utils/gitlab-ci.yaml
@@ -1,11 +1,19 @@
+.chart-matrix:
+  parallel:
+    matrix:
+      - CHART:
+          - keycloak
+          - mok
+
 chart-build-keycloak:
   stage: build
+  extends: .chart-matrix
   image: quay.io/helmpack/chart-testing:v3.6.0
   script:
     - export TMP_DIR=$(mktemp -d)
-    - helm package charts/keycloak -d "$TMP_DIR"
+    - helm package charts/${CHART} -d "$TMP_DIR"
     - for i in $(ls $TMP_DIR/*.tgz); do curl --request POST --user "gitlab-ci-token:$CI_JOB_TOKEN" --form "chart=@${i}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/${CI_COMMIT_REF_SLUG}/charts"; done
   rules:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
       changes:
-        - charts/keycloak/Chart.yaml
+        - charts/${CHART}/Chart.yaml
diff --git a/charts/mok/.gitlab-ci.yaml b/charts/mok/.gitlab-ci.yaml
deleted file mode 100644
index d59bc9331f0dbf774b287ebb6f8a231e4843bf80..0000000000000000000000000000000000000000
--- a/charts/mok/.gitlab-ci.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-chart-build-mok:
-  stage: build
-  image: quay.io/helmpack/chart-testing:v3.6.0
-  script:
-    - export TMP_DIR=$(mktemp -d)
-    - helm package charts/mok -d "$TMP_DIR"
-    - for i in $(ls $TMP_DIR/*.tgz); do curl --request POST --user "gitlab-ci-token:$CI_JOB_TOKEN" --form "chart=@${i}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/${CI_COMMIT_REF_SLUG}/charts"; done
-  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
-      changes:
-        - charts/mok/Chart.yaml