diff --git a/.github/workflows/build-release-assets.yml b/.github/workflows/build-release-assets.yml
index 8e71ff715..a8f7ab4b9 100644
--- a/.github/workflows/build-release-assets.yml
+++ b/.github/workflows/build-release-assets.yml
@@ -47,7 +47,7 @@ jobs:
         helm package verticadb-operator
         ls -lhrt
     
-    - name: Upload files
+    - name: Upload release-artifacts
       uses: actions/upload-artifact@v4
       with:
         name: release-artifacts
@@ -56,4 +56,10 @@ jobs:
           /home/runner/work/vertica-kubernetes/vertica-kubernetes/config/release-manifests/*yaml
           /home/runner/work/vertica-kubernetes/vertica-kubernetes/helm-charts/*.tgz
           /home/runner/work/vertica-kubernetes/vertica-kubernetes/bin/vdb-gen
+
+    - name: Upload bundle
+      uses: actions/upload-artifact@v4
+      with:
+        name: olm-bundle
+        path: |
           /home/runner/work/vertica-kubernetes/vertica-kubernetes/bundle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03599b89d..0a4118d58 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -99,20 +99,20 @@ jobs:
       if: ${{ inputs.action == 'upload bundle for operatorhub OLM catalog' || inputs.action == 'all' }}
       uses: ./vertica-kubernetes/.github/actions/upload-opm-bundle
       with:
-        token: ${{ secrets.PAT_TOKEN }}
+        token: ${{ secrets.OLM_RELEASE }}
         version: ${{ env.VERSION }}
         upstreamRepo: k8s-operatorhub/community-operators
-        forkRepo: spilchen/community-operators
+        forkRepo: cchen-vertica/community-operators
         localRepoPath: community-operators
-        bundlePath: vertica-kubernetes/ci-artifacts/${{ env.VERSION }}/olm-bundle
+        bundlePath: vertica-kubernetes/ci-artifacts/${{ env.VERSION }}/release-artifacts/bundle
 
     - name: Upload the OPM bundle to fork of redhat-openshift-ecosystem/community-operators-prod
       if: ${{ inputs.action == 'upload bundle for openshift OLM catalog' || inputs.action == 'all' }}
       uses: ./vertica-kubernetes/.github/actions/upload-opm-bundle
       with:
-        token: ${{ secrets.PAT_TOKEN }}
+        token: ${{ secrets.OLM_RELEASE }}
         version: ${{ env.VERSION }}
         upstreamRepo: redhat-openshift-ecosystem/community-operators-prod
-        forkRepo: spilchen/community-operators-prod
+        forkRepo: cchen-vertica/community-operators-prod
         localRepoPath: community-operators-prod
-        bundlePath: vertica-kubernetes/ci-artifacts/${{ env.VERSION }}/olm-bundle
+        bundlePath: vertica-kubernetes/ci-artifacts/${{ env.VERSION }}/release-artifacts/bundle
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index b488f95a0..7ab8797ea 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -83,4 +83,7 @@ gh release create v$VERSION \
     --notes-file $TMP_CHANGELOG_FILE \
     --target $VERSION_SHA \
     --title "Vertica Kubernetes $VERSION" \
-    $ARTIFACTS_DIR/*
+    $ARTIFACTS_DIR/bin/* \
+    $ARTIFACTS_DIR/config/*/* \
+    $ARTIFACTS_DIR/helm-charts/*tgz \
+    $ARTIFACTS_DIR/helm-charts/verticadb-operator/crds/*