diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index a0ec41740d..41241e7c41 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -23,16 +23,16 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Forge
-        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.1
+        uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.3
         with:
-          version: 0.14.0
+          version: 0.18.0
         if: always()
 
       - name: Setup CI
-        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.1
+        uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.3
 
       - name: Run tests
-        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
+        uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.3
         if: always()
         continue-on-error: true
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef1bb73e3d..447c5beb78 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,4 +12,4 @@ jobs:
   ci:
     uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.3
     with:
-      forge_version: 0.16.0
\ No newline at end of file
+      forge_version: 0.18.0
\ No newline at end of file
diff --git a/blueprint.cue b/blueprint.cue
index efd41e3781..74d4563a00 100644
--- a/blueprint.cue
+++ b/blueprint.cue
@@ -1,4 +1,3 @@
-version: "1.0"
 global: {
 	ci: {
 		local: [
diff --git a/containers/event-db-migrations/blueprint.cue b/containers/event-db-migrations/blueprint.cue
index 586006bc39..346188934f 100644
--- a/containers/event-db-migrations/blueprint.cue
+++ b/containers/event-db-migrations/blueprint.cue
@@ -1,4 +1,3 @@
-version: "1.0.0"
 project: {
 	name: "event-db-migrations"
 	deployment: {
@@ -7,83 +6,88 @@ project: {
 			tag: {}
 		}
 
-		bundle: modules: main: {
-			name:    "app"
-			version: "0.11.0"
-			values: {
-				jobs: migration: containers: main: {
-					image: {
-						name: _ @forge(name="CONTAINER_IMAGE")
-						tag:  _ @forge(name="GIT_HASH_OR_TAG")
-					}
-					env: {
-						DB_HOST: {
-							secret: {
-								name: "db"
-								key:  "host"
-							}
-						}
-						DB_NAME: {
-							value: "eventdb"
+		bundle:
+		{
+			env:  string | *"dev"
+			_env: env
+			modules: main: {
+				name:    "app"
+				version: "0.11.1"
+				values: {
+					jobs: migration: containers: main: {
+						image: {
+							name: _ @forge(name="CONTAINER_IMAGE")
+							tag:  _ @forge(name="GIT_HASH_OR_TAG")
 						}
-						DB_PORT: {
-							secret: {
-								name: "db"
-								key:  "port"
+						env: {
+							DB_HOST: {
+								secret: {
+									name: "db"
+									key:  "host"
+								}
 							}
-						}
-						DB_ROOT_NAME: {
-							value: "postgres"
-						}
-						DB_SUPERUSER: {
-							secret: {
-								name: "root"
-								key:  "username"
+							DB_NAME: {
+								value: "eventdb"
 							}
-						}
-						DB_SUPERUSER_PASSWORD: {
-							secret: {
-								name: "root"
-								key:  "password"
+							DB_PORT: {
+								secret: {
+									name: "db"
+									key:  "port"
+								}
 							}
-						}
-						DB_USER: {
-							secret: {
-								name: "db"
-								key:  "username"
+							DB_ROOT_NAME: {
+								value: "postgres"
 							}
-						}
-						DB_USER_PASSWORD: {
-							secret: {
-								name: "db"
-								key:  "password"
+							DB_SUPERUSER: {
+								secret: {
+									name: "root"
+									key:  "username"
+								}
+							}
+							DB_SUPERUSER_PASSWORD: {
+								secret: {
+									name: "root"
+									key:  "password"
+								}
+							}
+							DB_USER: {
+								secret: {
+									name: "db"
+									key:  "username"
+								}
+							}
+							DB_USER_PASSWORD: {
+								secret: {
+									name: "db"
+									key:  "password"
+								}
+							}
+							INIT_AND_DROP_DB: {
+								value: string | *"true"
+							}
+							STAGE: {
+								value: string | *_env
 							}
 						}
-						INIT_AND_DROP_DB: {
-							value: string | *"true"
-						}
-						STAGE: {
-							value: string | *"dev"
+						mounts: state: {
+							ref: volume: name: "state"
+							path:     "/eventdb/tmp"
+							readOnly: false
 						}
 					}
-					mounts: state: {
-						ref: volume: name: "state"
-						path:     "/eventdb/tmp"
-						readOnly: false
-					}
-				}
 
-				secrets: {
-					db: {
-						ref: "db/eventdb"
-					}
-					root: {
-						ref: "db/root_account"
+					secrets: {
+						db: {
+							ref: "db/eventdb"
+						}
+						root: {
+							ref: "db/root_account"
+						}
 					}
-				}
 
-				volumes: state: {
-					size: "1Mi"
+					volumes: state: {
+						size: "1Mi"
+					}
 				}
 			}
 		}
diff --git a/services/voting-node/blueprint.cue b/services/voting-node/blueprint.cue
index c51438eda9..0a43f53ade 100644
--- a/services/voting-node/blueprint.cue
+++ b/services/voting-node/blueprint.cue
@@ -1,4 +1,3 @@
-version: "1.0.0"
 project: {
 	name: "voting-node"
 	release: {