diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
index 16128a39938..5640bc01b69 100644
--- a/.github/workflows/code_freeze.yml
+++ b/.github/workflows/code_freeze.yml
@@ -11,4 +11,4 @@ jobs:
     steps:
     - name: Fail if Code Freeze is enabled
       run: |
-        exit 1
+        exit 0
diff --git a/changelog/18.0/18.0.4/changelog.md b/changelog/18.0/18.0.4/changelog.md
new file mode 100644
index 00000000000..a5e376b85f3
--- /dev/null
+++ b/changelog/18.0/18.0.4/changelog.md
@@ -0,0 +1,22 @@
+# Changelog of Vitess v18.0.4
+
+### Bug fixes 
+#### VReplication
+ * [release-18.0] VReplication: Fix workflow update changed handling (#15621) [#15628](https://github.com/vitessio/vitess/pull/15628)
+### CI/Build 
+#### Build/CI
+ * [release-18.0] Update to latest CodeQL (#15530) [#15533](https://github.com/vitessio/vitess/pull/15533)
+ * [release-18.0] Update go.mod go version to 1.21.9 [#15646](https://github.com/vitessio/vitess/pull/15646)
+ * [release-18.0] Updated `golang.org/x/net` [#15650](https://github.com/vitessio/vitess/pull/15650) 
+#### General
+ * [release-18.0] Upgrade to go1.21.9 [#15639](https://github.com/vitessio/vitess/pull/15639)
+### Regression 
+#### Query Serving
+ * [release-18.0] fix: remove keyspace from column during query builder (#15514) [#15516](https://github.com/vitessio/vitess/pull/15516)
+### Release 
+#### General
+ * [release-18.0] Bump to `v18.0.4-SNAPSHOT` after the `v18.0.3` release [#15489](https://github.com/vitessio/vitess/pull/15489)
+### Testing 
+#### VReplication
+ * [release-18.0] VReplication: Fix vtctldclient SwitchReads related bugs and move the TestBasicV2Workflows e2e test to vtctldclient (#15579) [#15583](https://github.com/vitessio/vitess/pull/15583)
+
diff --git a/changelog/18.0/18.0.4/release_notes.md b/changelog/18.0/18.0.4/release_notes.md
new file mode 100644
index 00000000000..a4b18f5f2fc
--- /dev/null
+++ b/changelog/18.0/18.0.4/release_notes.md
@@ -0,0 +1,7 @@
+# Release of Vitess v18.0.4
+The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/18.0/18.0.4/changelog.md).
+
+The release includes 8 merged Pull Requests.
+
+Thanks to all our contributors: @app/vitess-bot, @frouioui, @shlomi-noach, @systay
+
diff --git a/changelog/18.0/README.md b/changelog/18.0/README.md
index b02ee6b707a..66e4bde68b9 100644
--- a/changelog/18.0/README.md
+++ b/changelog/18.0/README.md
@@ -1,4 +1,8 @@
 ## v18.0
+* **[18.0.4](18.0.4)**
+	* [Changelog](18.0.4/changelog.md)
+	* [Release Notes](18.0.4/release_notes.md)
+
 * **[18.0.3](18.0.3)**
 	* [Changelog](18.0.3/changelog.md)
 	* [Release Notes](18.0.3/release_notes.md)
diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml
index 508dc672b44..f4deab09a2b 100644
--- a/examples/compose/docker-compose.beginners.yml
+++ b/examples/compose/docker-compose.beginners.yml
@@ -58,7 +58,7 @@ services:
       - "3306"
 
   vtctld:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15000:$WEB_PORT"
       - "$GRPC_PORT"
@@ -81,7 +81,7 @@ services:
         condition: service_healthy
 
   vtgate:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15099:$WEB_PORT"
       - "$GRPC_PORT"
@@ -111,7 +111,7 @@ services:
         condition: service_healthy
 
   schemaload:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     command:
     - sh
     - -c
@@ -144,12 +144,12 @@ services:
     environment:
       - KEYSPACES=$KEYSPACE
       - GRPC_PORT=15999
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - .:/script
 
   vttablet100:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15100:$WEB_PORT"
       - "$GRPC_PORT"
@@ -181,7 +181,7 @@ services:
       retries: 15
 
   vttablet101:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15101:$WEB_PORT"
       - "$GRPC_PORT"
@@ -213,7 +213,7 @@ services:
       retries: 15
 
   vttablet102:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15102:$WEB_PORT"
       - "$GRPC_PORT"
@@ -245,7 +245,7 @@ services:
       retries: 15
 
   vttablet103:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15103:$WEB_PORT"
       - "$GRPC_PORT"
@@ -277,7 +277,7 @@ services:
       retries: 15
 
   vtorc:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     command: ["sh", "-c", "/script/vtorc-up.sh"]
     depends_on:
       - vtctld
@@ -307,7 +307,7 @@ services:
       retries: 15
 
   vreplication:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - ".:/script"
     environment:
diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml
index 02960b484b6..a45bcf945a7 100644
--- a/examples/compose/docker-compose.yml
+++ b/examples/compose/docker-compose.yml
@@ -75,7 +75,7 @@ services:
     - SCHEMA_FILES=lookup_keyspace_schema_file.sql
     - POST_LOAD_FILE=
     - EXTERNAL_DB=0
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
     - .:/script
   schemaload_test_keyspace:
@@ -101,7 +101,7 @@ services:
     - SCHEMA_FILES=test_keyspace_schema_file.sql
     - POST_LOAD_FILE=
     - EXTERNAL_DB=0
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
     - .:/script
   set_keyspace_durability_policy:
@@ -115,7 +115,7 @@ services:
     environment:
       - KEYSPACES=test_keyspace lookup_keyspace
       - GRPC_PORT=15999
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - .:/script
   vreplication:
@@ -129,7 +129,7 @@ services:
     - TOPOLOGY_FLAGS=--topo_implementation consul --topo_global_server_address consul1:8500
       --topo_global_root vitess/global
     - EXTERNAL_DB=0
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
     - .:/script
   vtctld:
@@ -143,7 +143,7 @@ services:
     depends_on:
       external_db_host:
         condition: service_healthy
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15000:8080
     - "15999"
@@ -160,7 +160,7 @@ services:
       --normalize_queries=true '
     depends_on:
     - vtctld
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15099:8080
     - "15999"
@@ -182,7 +182,7 @@ services:
     - EXTERNAL_DB=0
     - DB_USER=
     - DB_PASS=
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 13000:8080
     volumes:
@@ -217,7 +217,7 @@ services:
       - CMD-SHELL
       - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15101:8080
     - "15999"
@@ -254,7 +254,7 @@ services:
       - CMD-SHELL
       - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15102:8080
     - "15999"
@@ -291,7 +291,7 @@ services:
       - CMD-SHELL
       - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15201:8080
     - "15999"
@@ -328,7 +328,7 @@ services:
       - CMD-SHELL
       - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15202:8080
     - "15999"
@@ -365,7 +365,7 @@ services:
       - CMD-SHELL
       - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15301:8080
     - "15999"
@@ -402,7 +402,7 @@ services:
       - CMD-SHELL
       - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - 15302:8080
     - "15999"
diff --git a/examples/compose/vtcompose/docker-compose.test.yml b/examples/compose/vtcompose/docker-compose.test.yml
index 892c564a109..458947e22de 100644
--- a/examples/compose/vtcompose/docker-compose.test.yml
+++ b/examples/compose/vtcompose/docker-compose.test.yml
@@ -79,7 +79,7 @@ services:
       - SCHEMA_FILES=test_keyspace_schema_file.sql
       - POST_LOAD_FILE=
       - EXTERNAL_DB=0
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - .:/script
   schemaload_unsharded_keyspace:
@@ -103,7 +103,7 @@ services:
       - SCHEMA_FILES=unsharded_keyspace_schema_file.sql
       - POST_LOAD_FILE=
       - EXTERNAL_DB=0
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - .:/script
   set_keyspace_durability_policy_test_keyspace:
@@ -117,7 +117,7 @@ services:
     environment:
       - GRPC_PORT=15999
       - KEYSPACES=test_keyspace
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - .:/script
   set_keyspace_durability_policy_unsharded_keyspace:
@@ -130,7 +130,7 @@ services:
     environment:
       - GRPC_PORT=15999
       - KEYSPACES=unsharded_keyspace
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - .:/script
   vreplication:
@@ -144,7 +144,7 @@ services:
       - TOPOLOGY_FLAGS=--topo_implementation consul --topo_global_server_address consul1:8500
         --topo_global_root vitess/global
       - EXTERNAL_DB=0
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - .:/script
   vtctld:
@@ -159,7 +159,7 @@ services:
     depends_on:
       external_db_host:
         condition: service_healthy
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 15000:8080
       - "15999"
@@ -176,7 +176,7 @@ services:
       ''grpc-vtgateservice'' --normalize_queries=true '
     depends_on:
       - vtctld
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 15099:8080
       - "15999"
@@ -199,7 +199,7 @@ services:
       - EXTERNAL_DB=0
       - DB_USER=
       - DB_PASS=
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 13000:8080
     volumes:
@@ -234,7 +234,7 @@ services:
         - CMD-SHELL
         - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 15101:8080
       - "15999"
@@ -271,7 +271,7 @@ services:
         - CMD-SHELL
         - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 15102:8080
       - "15999"
@@ -308,7 +308,7 @@ services:
         - CMD-SHELL
         - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 15201:8080
       - "15999"
@@ -345,7 +345,7 @@ services:
         - CMD-SHELL
         - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 15202:8080
       - "15999"
@@ -382,7 +382,7 @@ services:
         - CMD-SHELL
         - curl -s --fail --show-error localhost:8080/debug/health
       timeout: 10s
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - 15301:8080
       - "15999"
diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go
index 2d62c449f2b..6217c33131c 100644
--- a/examples/compose/vtcompose/vtcompose.go
+++ b/examples/compose/vtcompose/vtcompose.go
@@ -533,7 +533,7 @@ func generateDefaultShard(tabAlias int, shard string, keyspaceData keyspaceInfo,
 - op: add
   path: /services/init_shard_primary%[2]d
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     command: ["sh", "-c", "/vt/bin/vtctldclient %[5]s InitShardPrimary --force %[4]s/%[3]s %[6]s-%[2]d "]
     %[1]s
 `, dependsOn, aliases[0], shard, keyspaceData.keyspace, opts.topologyFlags, opts.cell)
@@ -565,7 +565,7 @@ func generateExternalPrimary(
 - op: add
   path: /services/vttablet%[1]d
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15%[1]d:%[3]d"
       - "%[4]d"
@@ -627,7 +627,7 @@ func generateDefaultTablet(tabAlias int, shard, role, keyspace string, dbInfo ex
 - op: add
   path: /services/vttablet%[1]d
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
     - "15%[1]d:%[4]d"
     - "%[5]d"
@@ -665,7 +665,7 @@ func generateVtctld(opts vtOptions) string {
 - op: add
   path: /services/vtctld
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15000:%[1]d"
       - "%[2]d"
@@ -696,7 +696,7 @@ func generateVtgate(opts vtOptions) string {
 - op: add
   path: /services/vtgate
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     ports:
       - "15099:%[1]d"
       - "%[2]d"
@@ -738,7 +738,7 @@ func generateVTOrc(dbInfo externalDbInfo, keyspaceInfoMap map[string]keyspaceInf
 - op: add
   path: /services/vtorc
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - ".:/script"
     environment:
@@ -763,7 +763,7 @@ func generateVreplication(dbInfo externalDbInfo, opts vtOptions) string {
 - op: add
   path: /services/vreplication
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - ".:/script"
     environment:
@@ -791,7 +791,7 @@ func generateSetKeyspaceDurabilityPolicy(
 - op: add
   path: /services/set_keyspace_durability_policy_%[3]s
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - ".:/script"
     environment:
@@ -828,7 +828,7 @@ func generateSchemaload(
 - op: add
   path: /services/schemaload_%[7]s
   value:
-    image: vitess/lite:v18.0.3
+    image: vitess/lite:v18.0.4
     volumes:
       - ".:/script"
     environment:
diff --git a/examples/operator/101_initial_cluster.yaml b/examples/operator/101_initial_cluster.yaml
index 2abe4665491..d7354637c65 100644
--- a/examples/operator/101_initial_cluster.yaml
+++ b/examples/operator/101_initial_cluster.yaml
@@ -8,14 +8,14 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v18.0.3
-    vtadmin: vitess/vtadmin:v18.0.3
-    vtgate: vitess/lite:v18.0.3
-    vttablet: vitess/lite:v18.0.3
-    vtbackup: vitess/lite:v18.0.3
-    vtorc: vitess/lite:v18.0.3
+    vtctld: vitess/lite:v18.0.4
+    vtadmin: vitess/vtadmin:v18.0.4
+    vtgate: vitess/lite:v18.0.4
+    vttablet: vitess/lite:v18.0.4
+    vtbackup: vitess/lite:v18.0.4
+    vtorc: vitess/lite:v18.0.4
     mysqld:
-      mysql80Compatible: vitess/lite:v18.0.3
+      mysql80Compatible: vitess/lite:v18.0.4
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1
diff --git a/examples/operator/201_customer_tablets.yaml b/examples/operator/201_customer_tablets.yaml
index bbce5cbcd41..abd5d902d34 100644
--- a/examples/operator/201_customer_tablets.yaml
+++ b/examples/operator/201_customer_tablets.yaml
@@ -4,14 +4,14 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v18.0.3
-    vtadmin: vitess/vtadmin:v18.0.3
-    vtgate: vitess/lite:v18.0.3
-    vttablet: vitess/lite:v18.0.3
-    vtbackup: vitess/lite:v18.0.3
-    vtorc: vitess/lite:v18.0.3
+    vtctld: vitess/lite:v18.0.4
+    vtadmin: vitess/vtadmin:v18.0.4
+    vtgate: vitess/lite:v18.0.4
+    vttablet: vitess/lite:v18.0.4
+    vtbackup: vitess/lite:v18.0.4
+    vtorc: vitess/lite:v18.0.4
     mysqld:
-      mysql80Compatible: vitess/lite:v18.0.3
+      mysql80Compatible: vitess/lite:v18.0.4
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1
diff --git a/examples/operator/302_new_shards.yaml b/examples/operator/302_new_shards.yaml
index 66154bc1990..ba641b69d72 100644
--- a/examples/operator/302_new_shards.yaml
+++ b/examples/operator/302_new_shards.yaml
@@ -4,14 +4,14 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v18.0.3
-    vtadmin: vitess/vtadmin:v18.0.3
-    vtgate: vitess/lite:v18.0.3
-    vttablet: vitess/lite:v18.0.3
-    vtbackup: vitess/lite:v18.0.3
-    vtorc: vitess/lite:v18.0.3
+    vtctld: vitess/lite:v18.0.4
+    vtadmin: vitess/vtadmin:v18.0.4
+    vtgate: vitess/lite:v18.0.4
+    vttablet: vitess/lite:v18.0.4
+    vtbackup: vitess/lite:v18.0.4
+    vtorc: vitess/lite:v18.0.4
     mysqld:
-      mysql80Compatible: vitess/lite:v18.0.3
+      mysql80Compatible: vitess/lite:v18.0.4
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1
diff --git a/examples/operator/306_down_shard_0.yaml b/examples/operator/306_down_shard_0.yaml
index 8bbb527cd10..2fc7b28b77a 100644
--- a/examples/operator/306_down_shard_0.yaml
+++ b/examples/operator/306_down_shard_0.yaml
@@ -4,14 +4,14 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v18.0.3
-    vtadmin: vitess/vtadmin:v18.0.3
-    vtgate: vitess/lite:v18.0.3
-    vttablet: vitess/lite:v18.0.3
-    vtbackup: vitess/lite:v18.0.3
-    vtorc: vitess/lite:v18.0.3
+    vtctld: vitess/lite:v18.0.4
+    vtadmin: vitess/vtadmin:v18.0.4
+    vtgate: vitess/lite:v18.0.4
+    vttablet: vitess/lite:v18.0.4
+    vtbackup: vitess/lite:v18.0.4
+    vtorc: vitess/lite:v18.0.4
     mysqld:
-      mysql80Compatible: vitess/lite:v18.0.3
+      mysql80Compatible: vitess/lite:v18.0.4
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1
diff --git a/go/vt/servenv/version.go b/go/vt/servenv/version.go
index 6e2528433c3..595f999e06c 100644
--- a/go/vt/servenv/version.go
+++ b/go/vt/servenv/version.go
@@ -19,4 +19,4 @@ package servenv
 // DO NOT EDIT
 // THIS FILE IS AUTO-GENERATED DURING NEW RELEASES BY THE VITESS-RELEASER
 
-const versionName = "18.0.4-SNAPSHOT"
+const versionName = "18.0.4"
diff --git a/java/client/pom.xml b/java/client/pom.xml
index 01ec6b166c8..9bf092df54b 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.vitess</groupId>
     <artifactId>vitess-parent</artifactId>
-    <version>18.0.4-SNAPSHOT</version>
+    <version>18.0.4</version>
   </parent>
   <artifactId>vitess-client</artifactId>
 
diff --git a/java/example/pom.xml b/java/example/pom.xml
index 4469594c27d..569e48f14f9 100644
--- a/java/example/pom.xml
+++ b/java/example/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.vitess</groupId>
     <artifactId>vitess-parent</artifactId>
-    <version>18.0.4-SNAPSHOT</version>
+    <version>18.0.4</version>
   </parent>
   <artifactId>vitess-example</artifactId>
 
diff --git a/java/grpc-client/pom.xml b/java/grpc-client/pom.xml
index 03b0645ea59..47b7fbb6640 100644
--- a/java/grpc-client/pom.xml
+++ b/java/grpc-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.vitess</groupId>
     <artifactId>vitess-parent</artifactId>
-    <version>18.0.4-SNAPSHOT</version>
+    <version>18.0.4</version>
   </parent>
   <artifactId>vitess-grpc-client</artifactId>
 
diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml
index cdf713e9230..92d08af1acd 100644
--- a/java/jdbc/pom.xml
+++ b/java/jdbc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.vitess</groupId>
     <artifactId>vitess-parent</artifactId>
-    <version>18.0.4-SNAPSHOT</version>
+    <version>18.0.4</version>
   </parent>
   <artifactId>vitess-jdbc</artifactId>
 
diff --git a/java/pom.xml b/java/pom.xml
index afddfb57ce0..520508f11b4 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>io.vitess</groupId>
   <artifactId>vitess-parent</artifactId>
-  <version>18.0.4-SNAPSHOT</version>
+  <version>18.0.4</version>
   <packaging>pom</packaging>
 
   <name>Vitess Java Client libraries [Parent]</name>