diff --git a/.github/workflows/common-tests.yaml b/.github/workflows/common-tests.yaml
index 6d61090d2c7ef..10d9bf9e7144f 100644
--- a/.github/workflows/common-tests.yaml
+++ b/.github/workflows/common-tests.yaml
@@ -3,18 +3,19 @@ name: Common Library Tests
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 on:
+  workflow_call:
   push:
     branches:
-      - main
+      - master
     paths:
-      - "charts/charts/library/common/**"
-      - ".github/workflows/common-tests.yaml"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "charts/charts/library/common/**"
+      - "charts/library/common/**"
       - ".github/workflows/common-tests.yaml"
+  #pull_request:
+  #  branches:
+  #    - main
+  #  paths:
+  #    - "charts/charts/library/common/**"
+  #    - ".github/workflows/common-tests.yaml"
   workflow_dispatch:
 
 jobs:
@@ -49,7 +50,7 @@ jobs:
         run: |
           ct lint --config .github/ct-lint.yaml \
                   --lint-conf .github/lint-conf.yaml \
-                  --charts charts/library/common-test \
+                  --charts charts/library/common/common-test \
                   --debug
 
   unittest:
@@ -91,7 +92,7 @@ jobs:
           (helm unittest -h > /dev/null) || helm plugin install https://github.com/helm-unittest/helm-unittest --version v${helmUnitVersion} || (sleep 10 && helm plugin install https://github.com/helm-unittest/helm-unittest --version v${helmUnitVersion}) || echo "finished unittest reinstall tries"
 
           # Run tests
-          cd charts/library/common-test/
+          cd charts/library/common/common-test/
           helm dependency update
           helm unittest -f "tests/**/*.yaml" . -v ./unit-values.yaml
 
@@ -224,17 +225,17 @@ jobs:
       - name: Run chart-testing (install)
         run: |
           # Move all ci values on a temp location (or skip if already moved from another matrix job)
-          mv charts/library/common-test/ci charts/library/common-test/runtests || echo "Nothing to move"
+          mv charts/library/common/common-test/ci charts/library/common/common-test/runtests || echo "Nothing to move"
 
           # Move one values.yaml to the correct location to run the test
-          mv -f charts/library/common-test/runtests/${{ matrix.values }} charts/library/common-test/values.yaml
+          mv -f charts/library/common/common-test/runtests/${{ matrix.values }} charts/library/common/common-test/values.yaml
 
           # Stat kail on the background to grab logs from tests
           ./kail --ignore-ns kube-system --ignore-ns cert-manager --ignore-ns metallb-system --ignore-ns prometheus-operator >> /tmp/output.log &
 
           # Actually run the test
           ct install  --config .github/ct-install.yaml \
-                      --charts charts/library/common-test \
+                      --charts charts/library/common/common-test \
                       --debug || (echo -e "\n\n--===PODLOGS===--\n\n" && \
                                   cat /tmp/output.log && \
                                   rm -f /tmp/output.log && exit 1)