diff --git a/6.0/Dockerfile b/6.0/Dockerfile
index 800e41c22..9b72c6faa 100644
--- a/6.0/Dockerfile
+++ b/6.0/Dockerfile
@@ -87,8 +87,8 @@ ENV MONGO_MAJOR 6.0
 RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu jammy/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 
 # https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.17
-# 08/13/2024, https://github.com/mongodb/mongo/tree/1b0ca02043c6d35d5cfdc91e21fc00a05d901539
+ENV MONGO_VERSION 6.0.18
+# 09/12/2024, https://github.com/mongodb/mongo/tree/2a2b949da51fa5d7402ffe31280067baf21bbbdd
 
 RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/6.0/windows/nanoserver-1809/Dockerfile b/6.0/windows/nanoserver-1809/Dockerfile
index a5bf646ac..6483d574e 100644
--- a/6.0/windows/nanoserver-1809/Dockerfile
+++ b/6.0/windows/nanoserver-1809/Dockerfile
@@ -14,7 +14,7 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:6.0.17-windowsservercore-1809 \
+COPY --from=mongo:6.0.18-windowsservercore-1809 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\msvcp140_1.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
@@ -22,10 +22,10 @@ COPY --from=mongo:6.0.17-windowsservercore-1809 \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.17
-# 08/13/2024, https://github.com/mongodb/mongo/tree/1b0ca02043c6d35d5cfdc91e21fc00a05d901539
+ENV MONGO_VERSION 6.0.18
+# 09/12/2024, https://github.com/mongodb/mongo/tree/2a2b949da51fa5d7402ffe31280067baf21bbbdd
 
-COPY --from=mongo:6.0.17-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:6.0.18-windowsservercore-1809 C:\\mongodb C:\\mongodb
 RUN mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/6.0/windows/nanoserver-ltsc2022/Dockerfile b/6.0/windows/nanoserver-ltsc2022/Dockerfile
index 337bbd45a..1540dbe1a 100644
--- a/6.0/windows/nanoserver-ltsc2022/Dockerfile
+++ b/6.0/windows/nanoserver-ltsc2022/Dockerfile
@@ -14,7 +14,7 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:6.0.17-windowsservercore-ltsc2022 \
+COPY --from=mongo:6.0.18-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\msvcp140_1.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
@@ -22,10 +22,10 @@ COPY --from=mongo:6.0.17-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.17
-# 08/13/2024, https://github.com/mongodb/mongo/tree/1b0ca02043c6d35d5cfdc91e21fc00a05d901539
+ENV MONGO_VERSION 6.0.18
+# 09/12/2024, https://github.com/mongodb/mongo/tree/2a2b949da51fa5d7402ffe31280067baf21bbbdd
 
-COPY --from=mongo:6.0.17-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:6.0.18-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
 RUN mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/6.0/windows/windowsservercore-1809/Dockerfile b/6.0/windows/windowsservercore-1809/Dockerfile
index a6f724318..5199e9916 100644
--- a/6.0/windows/windowsservercore-1809/Dockerfile
+++ b/6.0/windows/windowsservercore-1809/Dockerfile
@@ -9,11 +9,11 @@ FROM mcr.microsoft.com/windows/servercore:1809
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 # https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.17
-# 08/13/2024, https://github.com/mongodb/mongo/tree/1b0ca02043c6d35d5cfdc91e21fc00a05d901539
+ENV MONGO_VERSION 6.0.18
+# 09/12/2024, https://github.com/mongodb/mongo/tree/2a2b949da51fa5d7402ffe31280067baf21bbbdd
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.17-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=90c6014610d9351763c59985460c915bb87227ecea619cb2d93e962787b87cc1
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.18-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=5aa85635f0b1f2f4e0a1d22410d507c8f4f1d9de0fa640fea1bcb5d8e4a6dee5
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/6.0/windows/windowsservercore-ltsc2022/Dockerfile b/6.0/windows/windowsservercore-ltsc2022/Dockerfile
index fd475f6c9..dc068d79b 100644
--- a/6.0/windows/windowsservercore-ltsc2022/Dockerfile
+++ b/6.0/windows/windowsservercore-ltsc2022/Dockerfile
@@ -9,11 +9,11 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 # https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.17
-# 08/13/2024, https://github.com/mongodb/mongo/tree/1b0ca02043c6d35d5cfdc91e21fc00a05d901539
+ENV MONGO_VERSION 6.0.18
+# 09/12/2024, https://github.com/mongodb/mongo/tree/2a2b949da51fa5d7402ffe31280067baf21bbbdd
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.17-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=90c6014610d9351763c59985460c915bb87227ecea619cb2d93e962787b87cc1
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.18-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=5aa85635f0b1f2f4e0a1d22410d507c8f4f1d9de0fa640fea1bcb5d8e4a6dee5
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/versions.json b/versions.json
index 9fdeb7980..8d416efd6 100644
--- a/versions.json
+++ b/versions.json
@@ -60,9 +60,9 @@
   },
   "5.0-rc": null,
   "6.0": {
-    "changes": "https://jira.mongodb.org/issues/?jql=project%20%3D%20SERVER%20AND%20fixVersion%20%3D%20%226.0.17%22%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC",
-    "date": "08/13/2024",
-    "githash": "1b0ca02043c6d35d5cfdc91e21fc00a05d901539",
+    "changes": "https://jira.mongodb.org/issues/?jql=project%20%3D%20SERVER%20AND%20fixVersion%20%3D%20%226.0.18%22%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC",
+    "date": "09/12/2024",
+    "githash": "2a2b949da51fa5d7402ffe31280067baf21bbbdd",
     "linux": "ubuntu2204",
     "notes": "https://docs.mongodb.org/master/release-notes/6.0/",
     "pgp": [
@@ -113,8 +113,8 @@
           "Router",
           "ServerNoService"
         ],
-        "msi": "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.17-signed.msi",
-        "sha256": "90c6014610d9351763c59985460c915bb87227ecea619cb2d93e962787b87cc1",
+        "msi": "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.18-signed.msi",
+        "sha256": "5aa85635f0b1f2f4e0a1d22410d507c8f4f1d9de0fa640fea1bcb5d8e4a6dee5",
         "variants": [
           "windowsservercore-ltsc2022",
           "windowsservercore-1809",
@@ -123,7 +123,7 @@
         ]
       }
     },
-    "version": "6.0.17"
+    "version": "6.0.18"
   },
   "6.0-rc": {
     "changes": "https://jira.mongodb.org/issues/?jql=project%20%3D%20SERVER%20AND%20fixVersion%20%3D%20%226.0.18%22%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC",