diff --git a/src/package-lock.json b/src/package-lock.json
index 64a8ad0c..33dc78df 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@event-driven-io/core",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@event-driven-io/core",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "workspaces": [
         "packages/emmett",
         "packages/emmett-postgresql",
@@ -10965,7 +10965,7 @@
     },
     "packages/emmett": {
       "name": "@event-driven-io/emmett",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "peerDependencies": {
         "@types/async-retry": "^1.4.8",
         "@types/uuid": "^10.0.0",
@@ -10976,21 +10976,21 @@
     },
     "packages/emmett-esdb": {
       "name": "@event-driven-io/emmett-esdb",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "devDependencies": {
-        "@event-driven-io/emmett-testcontainers": "0.17.0"
+        "@event-driven-io/emmett-testcontainers": "0.18.0"
       },
       "peerDependencies": {
-        "@event-driven-io/emmett": "0.17.0",
+        "@event-driven-io/emmett": "0.18.0",
         "@eventstore/db-client": "^6.2.1"
       }
     },
     "packages/emmett-expressjs": {
       "name": "@event-driven-io/emmett-expressjs",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "devDependencies": {},
       "peerDependencies": {
-        "@event-driven-io/emmett": "0.17.0",
+        "@event-driven-io/emmett": "0.18.0",
         "@types/express": "^4.17.21",
         "@types/supertest": "^6.0.2",
         "express": "^4.19.2",
@@ -11001,10 +11001,10 @@
     },
     "packages/emmett-fastify": {
       "name": "@event-driven-io/emmett-fastify",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "devDependencies": {},
       "peerDependencies": {
-        "@event-driven-io/emmett": "0.17.0",
+        "@event-driven-io/emmett": "0.18.0",
         "@fastify/compress": "^7.0.3",
         "@fastify/etag": "^5.2.0",
         "@fastify/formbody": "^7.4.0",
@@ -11014,21 +11014,21 @@
     },
     "packages/emmett-postgresql": {
       "name": "@event-driven-io/emmett-postgresql",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "devDependencies": {
-        "@event-driven-io/emmett-testcontainers": "0.17.0",
+        "@event-driven-io/emmett-testcontainers": "0.18.0",
         "@testcontainers/postgresql": "^10.12.0"
       },
       "peerDependencies": {
-        "@event-driven-io/emmett": "0.17.0",
+        "@event-driven-io/emmett": "0.18.0",
         "@event-driven-io/pongo": "0.13.1"
       }
     },
     "packages/emmett-testcontainers": {
       "name": "@event-driven-io/emmett-testcontainers",
-      "version": "0.17.0",
+      "version": "0.18.0",
       "dependencies": {
-        "@event-driven-io/emmett": "0.17.0",
+        "@event-driven-io/emmett": "0.18.0",
         "testcontainers": "^10.12.0"
       },
       "devDependencies": {
diff --git a/src/package.json b/src/package.json
index 7cc20164..ac4d63c7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/core",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Emmett - Event Sourcing development made simple",
   "engines": {
     "node": ">=20.11.1"
diff --git a/src/packages/emmett-esdb/package.json b/src/packages/emmett-esdb/package.json
index 0bf7b286..344a93d5 100644
--- a/src/packages/emmett-esdb/package.json
+++ b/src/packages/emmett-esdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-esdb",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Emmett - EventStoreDB - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -47,10 +47,10 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "@event-driven-io/emmett-testcontainers": "0.17.0"
+    "@event-driven-io/emmett-testcontainers": "0.18.0"
   },
   "peerDependencies": {
-    "@event-driven-io/emmett": "0.17.0",
+    "@event-driven-io/emmett": "0.18.0",
     "@eventstore/db-client": "^6.2.1"
   }
 }
diff --git a/src/packages/emmett-expressjs/package.json b/src/packages/emmett-expressjs/package.json
index 5c5b45d3..778bdd95 100644
--- a/src/packages/emmett-expressjs/package.json
+++ b/src/packages/emmett-expressjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-expressjs",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Emmett - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -48,7 +48,7 @@
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {
-    "@event-driven-io/emmett": "0.17.0",
+    "@event-driven-io/emmett": "0.18.0",
     "@types/express": "^4.17.21",
     "@types/supertest": "^6.0.2",
     "express": "^4.19.2",
diff --git a/src/packages/emmett-fastify/package.json b/src/packages/emmett-fastify/package.json
index 88a531d6..96adabf5 100644
--- a/src/packages/emmett-fastify/package.json
+++ b/src/packages/emmett-fastify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-fastify",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Emmett - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -52,7 +52,7 @@
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {
-    "@event-driven-io/emmett": "0.17.0",
+    "@event-driven-io/emmett": "0.18.0",
     "fastify": "^4.28.1",
     "@fastify/compress": "^7.0.3",
     "@fastify/etag": "^5.2.0",
diff --git a/src/packages/emmett-postgresql/package.json b/src/packages/emmett-postgresql/package.json
index 25af91e7..fda95d91 100644
--- a/src/packages/emmett-postgresql/package.json
+++ b/src/packages/emmett-postgresql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-postgresql",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Emmett - PostgreSQL - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -49,10 +49,10 @@
   ],
   "devDependencies": {
     "@testcontainers/postgresql": "^10.12.0",
-    "@event-driven-io/emmett-testcontainers": "0.17.0"
+    "@event-driven-io/emmett-testcontainers": "0.18.0"
   },
   "peerDependencies": {
-    "@event-driven-io/emmett": "0.17.0",
+    "@event-driven-io/emmett": "0.18.0",
     "@event-driven-io/pongo": "0.13.1"
   }
 }
diff --git a/src/packages/emmett-testcontainers/package.json b/src/packages/emmett-testcontainers/package.json
index 84e098f3..2287d619 100644
--- a/src/packages/emmett-testcontainers/package.json
+++ b/src/packages/emmett-testcontainers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-testcontainers",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Emmett - TestContainers - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -46,7 +46,7 @@
     "dist"
   ],
   "dependencies": {
-    "@event-driven-io/emmett": "0.17.0",
+    "@event-driven-io/emmett": "0.18.0",
     "testcontainers": "^10.12.0"
   },
   "devDependencies": {
diff --git a/src/packages/emmett/package.json b/src/packages/emmett/package.json
index 4e88e81e..fa7ae64f 100644
--- a/src/packages/emmett/package.json
+++ b/src/packages/emmett/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Emmett - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",