diff --git a/4.0-rc/alpine/10-defaults.conf b/4.0/alpine/10-defaults.conf
similarity index 100%
rename from 4.0-rc/alpine/10-defaults.conf
rename to 4.0/alpine/10-defaults.conf
diff --git a/4.0-rc/alpine/20-management_agent.disable_metrics_collector.conf b/4.0/alpine/20-management_agent.disable_metrics_collector.conf
similarity index 100%
rename from 4.0-rc/alpine/20-management_agent.disable_metrics_collector.conf
rename to 4.0/alpine/20-management_agent.disable_metrics_collector.conf
diff --git a/4.0-rc/alpine/Dockerfile b/4.0/alpine/Dockerfile
similarity index 99%
rename from 4.0-rc/alpine/Dockerfile
rename to 4.0/alpine/Dockerfile
index 35c79a49..dd309268 100644
--- a/4.0-rc/alpine/Dockerfile
+++ b/4.0/alpine/Dockerfile
@@ -23,7 +23,7 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true
 # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally
 ARG PGP_KEYSERVER=keyserver.ubuntu.com
 # If you are building this image locally and are getting `gpg: keyserver receive failed: No data` errors,
-# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.0-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0-rc/ubuntu
+# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.0 --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0/ubuntu
 # For context, see https://github.com/docker-library/official-images/issues/4252
 
 ENV OPENSSL_VERSION 3.3.2
@@ -249,7 +249,7 @@ RUN set -eux; \
 		tzdata
 
 # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 4.0.0-rc.2
+ENV RABBITMQ_VERSION 4.0.0
 # https://www.rabbitmq.com/signatures.html#importing-gpg
 ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
 ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/4.0-rc/alpine/docker-entrypoint.sh b/4.0/alpine/docker-entrypoint.sh
similarity index 100%
rename from 4.0-rc/alpine/docker-entrypoint.sh
rename to 4.0/alpine/docker-entrypoint.sh
diff --git a/4.0-rc/alpine/management/Dockerfile b/4.0/alpine/management/Dockerfile
similarity index 96%
rename from 4.0-rc/alpine/management/Dockerfile
rename to 4.0/alpine/management/Dockerfile
index d03a9775..a7f01de5 100644
--- a/4.0-rc/alpine/management/Dockerfile
+++ b/4.0/alpine/management/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM rabbitmq:4.0-rc-alpine
+FROM rabbitmq:4.0-alpine
 
 RUN set eux; \
 	rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/4.0-rc/ubuntu/10-defaults.conf b/4.0/ubuntu/10-defaults.conf
similarity index 100%
rename from 4.0-rc/ubuntu/10-defaults.conf
rename to 4.0/ubuntu/10-defaults.conf
diff --git a/4.0-rc/ubuntu/20-management_agent.disable_metrics_collector.conf b/4.0/ubuntu/20-management_agent.disable_metrics_collector.conf
similarity index 100%
rename from 4.0-rc/ubuntu/20-management_agent.disable_metrics_collector.conf
rename to 4.0/ubuntu/20-management_agent.disable_metrics_collector.conf
diff --git a/4.0-rc/ubuntu/Dockerfile b/4.0/ubuntu/Dockerfile
similarity index 99%
rename from 4.0-rc/ubuntu/Dockerfile
rename to 4.0/ubuntu/Dockerfile
index 132f5481..85ccc621 100644
--- a/4.0-rc/ubuntu/Dockerfile
+++ b/4.0/ubuntu/Dockerfile
@@ -26,7 +26,7 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true
 # Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally
 ARG PGP_KEYSERVER=keyserver.ubuntu.com
 # If you are building this image locally and are getting `gpg: keyserver receive failed: No data` errors,
-# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.0-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0-rc/ubuntu
+# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.0 --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0/ubuntu
 # For context, see https://github.com/docker-library/official-images/issues/4252
 
 ENV OPENSSL_VERSION 3.3.2
@@ -236,7 +236,7 @@ RUN set -eux; \
 	ln -sf "$RABBITMQ_DATA_DIR/.erlang.cookie" /root/.erlang.cookie
 
 # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 4.0.0-rc.2
+ENV RABBITMQ_VERSION 4.0.0
 # https://www.rabbitmq.com/signatures.html#importing-gpg
 ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
 ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/4.0-rc/ubuntu/docker-entrypoint.sh b/4.0/ubuntu/docker-entrypoint.sh
similarity index 100%
rename from 4.0-rc/ubuntu/docker-entrypoint.sh
rename to 4.0/ubuntu/docker-entrypoint.sh
diff --git a/4.0-rc/ubuntu/management/Dockerfile b/4.0/ubuntu/management/Dockerfile
similarity index 97%
rename from 4.0-rc/ubuntu/management/Dockerfile
rename to 4.0/ubuntu/management/Dockerfile
index 23148791..d7d8540f 100644
--- a/4.0-rc/ubuntu/management/Dockerfile
+++ b/4.0/ubuntu/management/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM rabbitmq:4.0-rc
+FROM rabbitmq:4.0
 
 RUN set eux; \
 	rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 2fa5bd91..b31bb52a 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,7 +2,8 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[3.13]='3 latest'
+	[4.0]='4 latest'
+	[3.13]='3'
 )
 defaultVariant='ubuntu'
 
diff --git a/versions.json b/versions.json
index 9affbbc1..46b2147f 100644
--- a/versions.json
+++ b/versions.json
@@ -35,7 +35,7 @@
     "version": "3.13.7"
   },
   "3.13-rc": null,
-  "4.0-rc": {
+  "4.0": {
     "alpine": {
       "version": "3.20"
     },
@@ -50,6 +50,7 @@
     "ubuntu": {
       "version": "24.04"
     },
-    "version": "4.0.0-rc.2"
-  }
+    "version": "4.0.0"
+  },
+  "4.0-rc": null
 }