diff --git a/manifest/3.3.xml b/manifest/3.3.xml
index ae9c479d15..d2669b6360 100644
--- a/manifest/3.3.xml
+++ b/manifest/3.3.xml
@@ -18,13 +18,13 @@ licenses/APL2.txt.
     <!-- Build Scripts (required on CI servers) -->
     <project name="product-texts" path="product-texts" remote="couchbase"/>
     <project name="build" path="cbbuild" remote="couchbase" revision="b1dc2359603ab411ce0788854ea879ce804c9055">
-        <annotation name="VERSION" value="3.3.2.1" keep="true"/>
+        <annotation name="VERSION" value="3.3.2.2" keep="true"/>
         <annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
         <annotation name="RELEASE" value="@RELEASE@" keep="true"/>
     </project>
 
 
     <!-- Sync Gateway -->
-    <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="release/3.3.2.1"/>
+    <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="release/3.3.2.2"/>
 
 </manifest>
diff --git a/manifest/3.3/3.3.2.1.xml b/manifest/3.3/3.3.2.1.xml
new file mode 100644
index 0000000000..d5a1af4618
--- /dev/null
+++ b/manifest/3.3/3.3.2.1.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2016-Present Couchbase, Inc.
+
+Use of this software is governed by the Business Source License included in
+the file licenses/BSL-Couchbase.txt.  As of the Change Date specified in that
+file, in accordance with the Business Source License, use of this software will
+be governed by the Apache License, Version 2.0, included in the file
+licenses/APL2.txt.
+-->
+
+<manifest>
+
+    <remote fetch="https://github.com/couchbase/" name="couchbase"/>
+    <default remote="couchbase" revision="master"/>
+
+    <!-- Build Scripts (required on CI servers) -->
+    <project name="product-texts" path="product-texts" remote="couchbase"/>
+    <project name="build" path="cbbuild" remote="couchbase" revision="b1dc2359603ab411ce0788854ea879ce804c9055">
+        <annotation name="VERSION" value="3.3.2.1" keep="true"/>
+        <annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
+        <annotation name="RELEASE" value="@RELEASE@" keep="true"/>
+    </project>
+
+
+    <!-- Sync Gateway -->
+    <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="e938d87150d6d928d37c684fb2d695f0f5cab75a"/>
+
+</manifest>
diff --git a/manifest/4.0.xml b/manifest/4.0.xml
index 2670019246..3f78a164ca 100644
--- a/manifest/4.0.xml
+++ b/manifest/4.0.xml
@@ -18,13 +18,13 @@ licenses/APL2.txt.
     <!-- Build Scripts (required on CI servers) -->
     <project name="product-texts" path="product-texts" remote="couchbase"/>
     <project name="build" path="cbbuild" remote="couchbase" revision="b1dc2359603ab411ce0788854ea879ce804c9055">
-        <annotation name="VERSION" value="4.0.2" keep="true"/>
+        <annotation name="VERSION" value="4.0.2.1" keep="true"/>
         <annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
         <annotation name="RELEASE" value="@RELEASE@" keep="true"/>
     </project>
 
 
     <!-- Sync Gateway -->
-    <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="release/4.0.2"/>
+    <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="release/4.0.2.1"/>
 
 </manifest>
diff --git a/manifest/4.0/4.0.2.xml b/manifest/4.0/4.0.2.xml
new file mode 100644
index 0000000000..f329d9e91f
--- /dev/null
+++ b/manifest/4.0/4.0.2.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2016-Present Couchbase, Inc.
+
+Use of this software is governed by the Business Source License included in
+the file licenses/BSL-Couchbase.txt.  As of the Change Date specified in that
+file, in accordance with the Business Source License, use of this software will
+be governed by the Apache License, Version 2.0, included in the file
+licenses/APL2.txt.
+-->
+
+<manifest>
+
+    <remote fetch="https://github.com/couchbase/" name="couchbase"/>
+    <default remote="couchbase" revision="master"/>
+
+    <!-- Build Scripts (required on CI servers) -->
+    <project name="product-texts" path="product-texts" remote="couchbase"/>
+    <project name="build" path="cbbuild" remote="couchbase" revision="b1dc2359603ab411ce0788854ea879ce804c9055">
+        <annotation name="VERSION" value="4.0.2" keep="true"/>
+        <annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
+        <annotation name="RELEASE" value="@RELEASE@" keep="true"/>
+    </project>
+
+
+    <!-- Sync Gateway -->
+    <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="90703a2968004a400de4e06842c4334a1b484fdd"/>
+
+</manifest>
diff --git a/manifest/product-config.json b/manifest/product-config.json
index f41a7cf8fa..8b45b207b6 100644
--- a/manifest/product-config.json
+++ b/manifest/product-config.json
@@ -722,8 +722,8 @@
             "go_version": "1.24.4",
             "interval": 120,
             "production": true,
-            "release": "3.3.2.1",
-            "release_name": "Couchbase Sync Gateway 3.3.2.1",
+            "release": "3.3.2.2",
+            "release_name": "Couchbase Sync Gateway 3.3.2.2",
             "start_build": 1,
             "trigger_blackduck": true
         },
@@ -767,6 +767,16 @@
             "start_build": 3,
             "trigger_blackduck": true
         },
+        "manifest/3.3/3.3.2.1.xml": {
+            "do-build": false,
+            "go_version": "1.24.4",
+            "interval": 1440,
+            "production": true,
+            "release": "3.3.2.1",
+            "release_name": "Couchbase Sync Gateway 3.3.2.1",
+            "start_build": 2,
+            "trigger_blackduck": true
+        },
         "manifest/3.3/3.3.2.xml": {
             "do-build": false,
             "go_version": "1.24.4",
@@ -781,8 +791,8 @@
             "go_version": "1.24.4",
             "interval": 120,
             "production": true,
-            "release": "4.0.2",
-            "release_name": "Couchbase Sync Gateway 4.0.2",
+            "release": "4.0.2.1",
+            "release_name": "Couchbase Sync Gateway 4.0.2.1",
             "start_build": 1,
             "trigger_blackduck": true
         },
@@ -826,6 +836,16 @@
             "start_build": 2,
             "trigger_blackduck": true
         },
+        "manifest/4.0/4.0.2.xml": {
+            "do-build": false,
+            "go_version": "1.24.4",
+            "interval": 1440,
+            "production": true,
+            "release": "4.0.2",
+            "release_name": "Couchbase Sync Gateway 4.0.2",
+            "start_build": 4,
+            "trigger_blackduck": true
+        },
         "manifest/default.xml": {
             "go_version": "1.25.5",
             "interval": 30,