diff --git a/.github/workflows/build-rp-archiver-push-tag-shared.yaml b/.github/workflows/build-rp-archiver-push-tag-shared.yaml
index 1c7aed2..2ecfe5a 100644
--- a/.github/workflows/build-rp-archiver-push-tag-shared.yaml
+++ b/.github/workflows/build-rp-archiver-push-tag-shared.yaml
@@ -3,6 +3,7 @@ name: Build Archiver in Shared (Push Tag)
 on:
   push:
     tags:
+      - '*.*.*-staging'
       - '*.*.*-develop'
 
 jobs:
diff --git a/.github/workflows/build-rp-archiver-push-tag-sp-india-ire.yaml b/.github/workflows/build-rp-archiver-push-tag-sp-india-ire.yaml
index 78d00b1..20d1dc8 100644
--- a/.github/workflows/build-rp-archiver-push-tag-sp-india-ire.yaml
+++ b/.github/workflows/build-rp-archiver-push-tag-sp-india-ire.yaml
@@ -3,7 +3,6 @@ name: Build Archiver in SP, India and Ireland (Push Tag)
 on:
   push:
     tags:
-      - '*.*.*-staging'
       - '*.*.*'
 
 jobs:
@@ -20,6 +19,8 @@ jobs:
             elif grep -qs -e '^.*.*-staging' <<< "${TAG}" ; then
               echo "Found environment: STAGING - ${TAG}"
               echo "ENVIRONMENT=staging" | tee -a "${GITHUB_ENV}"
+              exit 1 # stop action
+            elif grep -qs -e '^.*.*-staging' <<< "${TAG}" ; then
             elif grep -qs -e '^.*.*' <<< "${TAG}" ; then
               echo "No environment found, assuming: PRODUCTION - ${TAG}"
               echo "ENVIRONMENT=production" | tee -a "${GITHUB_ENV}"