diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 41422e4d9c1..6d5a8720255 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,9 +14,9 @@ permissions:
 
 jobs:
   ci:
-    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.4.0
+    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.0
     with:
-      forge_version: 0.7.0
+      forge_version: 0.8.0
 
   test_reporting:
     if: always()
diff --git a/.github/workflows/generate-allure-report.yml b/.github/workflows/generate-allure-report.yml
index c630c2ba63b..792d5c26472 100644
--- a/.github/workflows/generate-allure-report.yml
+++ b/.github/workflows/generate-allure-report.yml
@@ -26,16 +26,16 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Forge
-        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.4.0
+        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.0
         with:
-          version: 0.7.0
+          version: 0.8.0
         if: always()
 
       - name: Setup CI
-        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.4.0
+        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.0
 
       - name: Get catalyst gateway unit test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.4.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.0
         if: always()
         continue-on-error: true
         with:
@@ -43,7 +43,7 @@ jobs:
           args: ./catalyst-gateway+build
 
       - name: Get schemathesis test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.4.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.0
         if: always()
         continue-on-error: true
         with:
@@ -51,7 +51,7 @@ jobs:
           args: ./catalyst-gateway/tests/schemathesis_tests+test-fuzzer-api
 
       - name: Get flutter unit test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.4.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.0
         if: always()
         continue-on-error: true
         with:
@@ -59,7 +59,7 @@ jobs:
           args: ./catalyst_voices+test-unit
 
       - name: Get python api test report
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.4.0
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.0
         if: always()
         continue-on-error: true
         with:
diff --git a/catalyst_voices/blueprint.cue b/catalyst_voices/blueprint.cue
index 4f50b953086..6a295fb274e 100644
--- a/catalyst_voices/blueprint.cue
+++ b/catalyst_voices/blueprint.cue
@@ -2,6 +2,10 @@ version: "1.0.0"
 project: {
 	name: "voices"
 	deployment: {
+		on: {
+			merge: {}
+			tag: {}
+		}
 		environment: "dev"
 		modules: main: {
 			container: "voices-deployment"
@@ -9,7 +13,7 @@ project: {
 			values: {
 				environment: name: "dev"
 				frontend: image: {
-					tag: _ @forge(name="GIT_COMMIT_HASH")
+					tag: _ @forge(name="GIT_HASH_OR_TAG")
 				}
 			}
 		}
@@ -21,7 +25,7 @@ project: {
 				tag: {}
 			}
 			config: {
-				tag: _ @forge(name="GIT_COMMIT_HASH")
+				tag: _ @forge(name="GIT_HASH_OR_TAG")
 			}
 		}
 	}