diff --git a/.github/workflows/pr-operator.yml b/.github/workflows/pr-operator.yml
index 454b412..dc3cd16 100644
--- a/.github/workflows/pr-operator.yml
+++ b/.github/workflows/pr-operator.yml
@@ -55,8 +55,9 @@ jobs:
         id: set-variables
         env:
           BUILD_PLATFORMS: ${{ inputs.BUILD_PLATFORMS }}
+          CHECKOUT_CODE: ${{ inputs.CHECKOUT_CODE }}
         run: |
-          echo "repository_name=$(basename $GITHUB_REPOSITORY)" >> $GITHUB_OUTPUT
+          echo "repository_name=$(basename ${{ env.CHECKOUT_CODE }})" >> $GITHUB_OUTPUT
           echo "bin_dir=$(pwd)/bin" >> $GITHUB_OUTPUT
 
           # Create Distribution Matrix
@@ -492,7 +493,7 @@ jobs:
         shell: bash
         run: |
           # Render Helm Chart
-          make helmchart VERSION=${{ env.HELM_RELEASE_VERSION }} IMG=${{ env.OPERATOR_IMAGE_REPOSITORY }}:${{ env.OPERATOR_VERSION }}
+          make helmchart OPERATOR_NAME=${{ env.REPOSITORY_NAME }} VERSION=${{ env.HELM_RELEASE_VERSION }} IMG=${{ env.OPERATOR_IMAGE_REPOSITORY }}:${{ env.OPERATOR_VERSION }}
 
           # Package Helm Chart
           mkdir dist
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
deleted file mode 100644
index 94351d9..0000000
--- a/.github/workflows/pr.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Testing
-on:
-  pull_request:
-  schedule:
-    - cron: '0 1 * * 1'
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  cert-utils-operator-workflow:
-    name: Test PR shared-operator-workflow
-    uses: ./.github/workflows/pr-operator.yml
-    with:
-      RUN_UNIT_TESTS: true
-      RUN_INTEGRATION_TESTS: false
-      RUN_HELMCHART_TEST: true
-      GO_VERSION: ~1.19
-      CHECKOUT_CODE: "redhat-cop/cert-utils-operator"
-
-  group-sync-operator-workflow:
-    name: Test PR shared-operator-workflow
-    uses: ./.github/workflows/pr-operator.yml
-    with:
-      GO_VERSION: ~1.21
-      RUN_UNIT_TESTS: true
-      RUN_INTEGRATION_TESTS: false
-      RUN_HELMCHART_TEST: false
-      OPERATOR_SDK_VERSION: v1.25.2
-      CHECKOUT_CODE: "redhat-cop/group-sync-operator"
-
-  namespace-configuration-operator-workflow:
-    name: Test PR shared-operator-workflow
-    uses: ./.github/workflows/pr-operator.yml
-    with:
-      RUN_UNIT_TESTS: true
-      RUN_INTEGRATION_TESTS: true
-      RUN_HELMCHART_TEST: true
-      GO_VERSION: ~1.21
-      OPERATOR_SDK_VERSION: v1.31.0
-      CHECKOUT_CODE: "redhat-cop/namespace-configuration-operator"
-
-  patch-operator-workflow:
-    name: Test PR shared-operator-workflow
-    uses: ./.github/workflows/pr-operator.yml
-    with:
-      RUN_UNIT_TESTS: true
-      RUN_INTEGRATION_TESTS: false
-      RUN_HELMCHART_TEST: true
-      GO_VERSION: ~1.21
-      OPERATOR_SDK_VERSION: v1.23.0
-      CHECKOUT_CODE: "redhat-cop/patch-operator"
-
-  vault-config-operator-workflow:
-    name: Test PR shared-operator-workflow
-    uses: ./.github/workflows/pr-operator.yml
-    with:
-      RUN_UNIT_TESTS: true
-      RUN_INTEGRATION_TESTS: true
-      RUN_HELMCHART_TEST: true
-      GO_VERSION: ~1.21
-      OPERATOR_SDK_VERSION: v1.25.3
-      CHECKOUT_CODE: "redhat-cop/vault-config-operator"
-
-
diff --git a/.github/workflows/test-cert-utils-operator.yaml b/.github/workflows/test-cert-utils-operator.yaml
new file mode 100644
index 0000000..c2d6214
--- /dev/null
+++ b/.github/workflows/test-cert-utils-operator.yaml
@@ -0,0 +1,23 @@
+name: Testing cert-utils-operator
+on:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * 1'
+
+# Declare default permissions as read only.
+permissions: read-all
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  cert-utils-operator-workflow:
+    name: Test PR shared-operator-workflow for cert-utils-operator
+    uses: ./.github/workflows/pr-operator.yml
+    with:
+      RUN_UNIT_TESTS: true
+      RUN_INTEGRATION_TESTS: false
+      RUN_HELMCHART_TEST: false #todo
+      GO_VERSION: ~1.19
+      CHECKOUT_CODE: "redhat-cop/cert-utils-operator"
diff --git a/.github/workflows/test-group-sync-operator.yaml b/.github/workflows/test-group-sync-operator.yaml
new file mode 100644
index 0000000..c3d8b23
--- /dev/null
+++ b/.github/workflows/test-group-sync-operator.yaml
@@ -0,0 +1,24 @@
+name: Testing group-sync-operator
+on:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * 1'
+
+# Declare default permissions as read only.
+permissions: read-all
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  group-sync-operator-workflow:
+    name: Test PR shared-operator-workflow for group-sync-operator
+    uses: ./.github/workflows/pr-operator.yml
+    with:
+      GO_VERSION: ~1.21
+      RUN_UNIT_TESTS: true
+      RUN_INTEGRATION_TESTS: false
+      RUN_HELMCHART_TEST: false
+      OPERATOR_SDK_VERSION: v1.25.2
+      CHECKOUT_CODE: "redhat-cop/group-sync-operator"
diff --git a/.github/workflows/test-namespace-configuration-operator.yaml b/.github/workflows/test-namespace-configuration-operator.yaml
new file mode 100644
index 0000000..2b37ccf
--- /dev/null
+++ b/.github/workflows/test-namespace-configuration-operator.yaml
@@ -0,0 +1,24 @@
+name: Testing namespace-configuration-operator
+on:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * 1'
+
+# Declare default permissions as read only.
+permissions: read-all
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  namespace-configuration-operator-workflow:
+    name: Test PR shared-operator-workflow for namespace-configuration-operator
+    uses: ./.github/workflows/pr-operator.yml
+    with:
+      RUN_UNIT_TESTS: true
+      RUN_INTEGRATION_TESTS: true
+      RUN_HELMCHART_TEST: false #todo
+      GO_VERSION: ~1.21
+      OPERATOR_SDK_VERSION: v1.31.0
+      CHECKOUT_CODE: "redhat-cop/namespace-configuration-operator"
diff --git a/.github/workflows/test-patch-operator.yaml b/.github/workflows/test-patch-operator.yaml
new file mode 100644
index 0000000..ba85559
--- /dev/null
+++ b/.github/workflows/test-patch-operator.yaml
@@ -0,0 +1,24 @@
+name: Testing patch-operator
+on:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * 1'
+
+# Declare default permissions as read only.
+permissions: read-all
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  patch-operator-workflow:
+    name: Test PR shared-operator-workflow for patch-operator
+    uses: ./.github/workflows/pr-operator.yml
+    with:
+      RUN_UNIT_TESTS: true
+      RUN_INTEGRATION_TESTS: false
+      RUN_HELMCHART_TEST: false #todo
+      GO_VERSION: ~1.21
+      OPERATOR_SDK_VERSION: v1.23.0
+      CHECKOUT_CODE: "redhat-cop/patch-operator"
diff --git a/.github/workflows/test-vault-config-operator.yaml b/.github/workflows/test-vault-config-operator.yaml
new file mode 100644
index 0000000..50d6a29
--- /dev/null
+++ b/.github/workflows/test-vault-config-operator.yaml
@@ -0,0 +1,24 @@
+name: Testing vault-config-operator
+on:
+  pull_request:
+  schedule:
+    - cron: '0 1 * * 1'
+
+# Declare default permissions as read only.
+permissions: read-all
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+  
+jobs:
+  vault-config-operator-workflow:
+    name: Test PR shared-operator-workflow for vault-config-operator
+    uses: ./.github/workflows/pr-operator.yml
+    with:
+      RUN_UNIT_TESTS: true
+      RUN_INTEGRATION_TESTS: true
+      RUN_HELMCHART_TEST: false #todo
+      GO_VERSION: ~1.21
+      OPERATOR_SDK_VERSION: v1.25.3
+      CHECKOUT_CODE: "redhat-cop/vault-config-operator"