diff --git a/.github/workflows/olm_scorecard.yml b/.github/workflows/olm_scorecard.yml
new file mode 100644
index 000000000..34ff9ac5a
--- /dev/null
+++ b/.github/workflows/olm_scorecard.yml
@@ -0,0 +1,31 @@
+name: Operator Scorecard Test
+
+on: [push, pull_request]
+
+jobs:
+  scorecard-check:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+      
+    - name: Install Operator SDK
+      run: |
+        curl -LO https://github.com/operator-framework/operator-sdk/releases/download/v1.24.1/operator-sdk_linux_amd64
+        chmod +x operator-sdk_linux_amd64
+        sudo mv operator-sdk_linux_amd64 /usr/local/bin/operator-sdk
+
+    - name: Build bundle
+      run: make bundle-build
+
+    - name: Install yq
+      run: |
+        sudo wget -O /usr/bin/yq https://github.com/mikefarah/yq/releases/download/v4.6.1/yq_linux_amd64
+        sudo chmod +x /usr/bin/yq
+
+    - name: Modify scorecard config
+      run: |
+        yq e 'del(.stages[].tests[] | select(.labels.test == "olm-crds-have-resources-test"))' -i bundle/tests/scorecard/config.yaml
+        
+    - name: Run Operator SDK Scorecard
+      run: operator-sdk scorecard bundle/tests/scorecard/config.yaml
diff --git a/.github/workflows/olm_tests.yaml b/.github/workflows/olm_tests.yaml
index eb643b139..67c797beb 100644
--- a/.github/workflows/olm_tests.yaml
+++ b/.github/workflows/olm_tests.yaml
@@ -134,21 +134,6 @@ jobs:
           BUNDLE_PUSH_OPT: "--tls-verify=false"
           CATALOG_PUSH_OPT: "--tls-verify=false"
 
-      - name: Install yq
-        run: |
-          sudo wget -O /usr/bin/yq https://github.com/mikefarah/yq/releases/download/v4.6.1/yq_linux_amd64
-          sudo chmod +x /usr/bin/yq
-
-      - name: Modify scorecard config
-        run: |
-          yq e 'del(.stages[].tests[] | select(.labels.test == "olm-crds-have-resources-test"))' -i bundle/tests/scorecard/config.yaml
-
-      - name: Scorecard check
-        run: |
-          make scorecard-bundle
-        env:
-          IMG: "${{ env.REGISTRY_ADDRESS }}/codeflare-operator:v0.0.1"
-
       - name: Update Operator to the built version
         run: |
           ORIGINAL_POD_NAME=$(kubectl get pod -l app.kubernetes.io/name=codeflare-operator -n openshift-operators -o json | jq -r .items[].metadata.name)