diff --git a/.ansible-lint b/.ansible-lint
index 040b3902c..252cf1e14 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,7 +1,6 @@
 # Vim filetype=yaml
 ---
 offline: false
-#requirements: ansible/execution_environment/requirements.yml
 
 exclude_paths:
   - .cache/
diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
index c2b2981bb..7c494efa2 100644
--- a/.github/workflows/ansible-lint.yml
+++ b/.github/workflows/ansible-lint.yml
@@ -11,7 +11,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Lint Ansible Playbook
-        uses: ansible/ansible-lint-action@v6
-        # Let's point it to the path
-        with:
-          path: "ansible/"
+        uses: ansible/ansible-lint@06f616d6e86e9ce4c74393318d1cbb2d016af413
diff --git a/.github/workflows/jsonschema.yaml b/.github/workflows/jsonschema.yaml
index 64ce8f852..b380309b6 100644
--- a/.github/workflows/jsonschema.yaml
+++ b/.github/workflows/jsonschema.yaml
@@ -38,7 +38,9 @@ jobs:
 
       - name: Verify ClusterGroup values.schema.json against values-*yaml files
         run: |
-          set -e; for i in values-hub.yaml values-group-one.yaml; do
+          set -e
+          find . -maxdepth 1 -type f -name "values-*.yaml" ! -name "values-global.yaml" -print0 | while IFS= read -r -d '' i;
+          do
             echo "$i"
             # disable shellcheck of single quotes in yq
             # shellcheck disable=2016
diff --git a/values-4.18-hub.yaml b/overrides/values-4.18-hub.yaml
similarity index 100%
rename from values-4.18-hub.yaml
rename to overrides/values-4.18-hub.yaml
diff --git a/values-4.19-hub.yaml b/overrides/values-4.19-hub.yaml
similarity index 100%
rename from values-4.19-hub.yaml
rename to overrides/values-4.19-hub.yaml
diff --git a/values-group-one.yaml b/values-group-one.yaml
index f17a726d4..1ffc14be4 100644
--- a/values-group-one.yaml
+++ b/values-group-one.yaml
@@ -1,6 +1,6 @@
 global:
   options:
-    useCSV: False
+    useCSV: false
     syncPolicy: Automatic
     installPlanApproval: Automatic
 clusterGroup:
diff --git a/values-hub.yaml b/values-hub.yaml
index 085009299..f0abae474 100644
--- a/values-hub.yaml
+++ b/values-hub.yaml
@@ -12,7 +12,7 @@ clusterGroup:
       name: advanced-cluster-management
       namespace: open-cluster-management
       channel: release-2.11
-      #csv: advanced-cluster-management.v2.6.1
+      # csv: advanced-cluster-management.v2.6.1
   projects:
     - hub
     - config-demo
@@ -21,6 +21,7 @@ clusterGroup:
   # We can use self-referential variables because the chart calls the tpl function with these variables defined
   sharedValueFiles:
     - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/overrides/values-{{ $.Values.global.clusterVersion }}-{{ $.Values.clusterGroup.name }}.yaml'
   # sharedValueFiles is a flexible mechanism that will add the listed valuefiles to every app defined in the
   # applications section. We intend this to supplement and possibly even replace previous "magic" mechanisms, though
   # we do not at present have a target date for removal.
@@ -98,7 +99,7 @@ clusterGroup:
           #   credentials and OCP pull secrets are defined in Vault.
           #   See values-secret.yaml.template
           #
-          #clusterPools:
+          # clusterPools:
           #  exampleAWSPool:
           #    name: aws-ap
           #    openshiftVersion: 4.10.18