diff --git a/.github/workflows/helm-charts-test.yaml b/.github/workflows/helm-charts-test.yaml
index 127eb9b..24f1468 100644
--- a/.github/workflows/helm-charts-test.yaml
+++ b/.github/workflows/helm-charts-test.yaml
@@ -18,33 +18,39 @@ jobs:
       - name: Lint charts
         id: lint
         run: ct lint --all
-#  collect-values-files-to-validate:
-#    runs-on: ubuntu-latest
-#    name: Validate values schema json
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#      - name: Validate values schema json
-#        uses: losisin/helm-values-schema-json-action@v1
-#        with:
-#          input: values.yaml
-#          fail-on-diff: true
-#  validate-values-schema:
-#    runs-on: ubuntu-latest
-#    name: Validate values schema json
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#      - name: Validate values schema json
-#        uses: losisin/helm-values-schema-json-action@v1
-#        with:
-#          input: values.yaml
-#          fail-on-diff: true
+  validate-values-schema:
+    runs-on: ubuntu-latest
+    name: Validate values schema json
+    strategy:
+      matrix:
+        chart:
+          - cron-jobs
+          - default-backend
+          - docker-hub-exporter
+          - pi-hole-exporter
+          - redirect
+          - redis-db-assignment-operator
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            charts/${{ matrix.chart }}/
+      - name: Get values files
+        id: value
+        run: |
+          printf "files=%s" $(ls -R charts/${{ matrix.chart }}/**/*values.yaml | tr -s ' ' ,) >> $GITHUB_OUTPUT
+      - name: Validate values schema json
+        uses: losisin/helm-values-schema-json-action@v1
+        with:
+          input: ${{ steps.value.outputs.files }}
+          output: charts/${{ matrix.chart }}/values.schema.json
+          fail-on-diff: true
   test:
     runs-on: ubuntu-latest
     needs:
       - lint
-#      - validate-values-schema
+      - validate-values-schema
     strategy:
       fail-fast: false
       matrix: