diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index a5d455af2347..3e313310a309 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -76,7 +76,7 @@ java_test_versions:
   version: 17
 
 metadata:
-  initial_version: 1.16.0-((semver-prerelease-token)).0
+  initial_version: 2.1.0-((semver-prerelease-token)).0
   mass_test_run_iterations: 100
 
 publish_artifacts:
diff --git a/geode-book/config.yml b/geode-book/config.yml
index c156d7e965c2..68c3d58ff07d 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -21,17 +21,17 @@ public_host: localhost
 sections:
 - repository:
     name: geode-docs
-  directory: docs/guide/115
+  directory: docs/guide/21
   subnav_template: geode-subnav
 
 template_variables:
   product_name_long: Apache Geode
   product_name: Geode
   product_name_lowercase: geode
-  product_version: '1.15'
-  product_version_nodot: '115'
-  product_version_old_minor: '1.14'
-  product_version_geode: '1.15'
+  product_version: '2.1'
+  product_version_nodot: '21'
+  product_version_old_minor: '2.0'
+  product_version_geode: '2.1'
   min_java_version: '8'
   min_java_update: '121'
   support_url: http://geode.apache.org/community
diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb
index 54079e7ea54f..74ba185f791f 100644
--- a/geode-book/redirects.rb
+++ b/geode-book/redirects.rb
@@ -14,5 +14,5 @@
 #permissions and limitations under the License.
 
 r301 %r{/releases/latest/javadoc/(.*)}, 'http://geode.apache.org/releases/latest/javadoc/$1'
-rewrite '/', '/docs/guide/116/about_geode.html'
-rewrite '/index.html', '/docs/guide/116/about_geode.html'
+rewrite '/', '/docs/guide/21/about_geode.html'
+rewrite '/index.html', '/docs/guide/21/about_geode.html'
diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
index 935a749a87f9..218edf37b6e5 100644
--- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
+++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java
@@ -48,7 +48,7 @@ public class KnownVersion extends AbstractVersion {
   private final byte patch;
   private final boolean modifiesClientServerProtocol;
 
-  public static final int HIGHEST_VERSION = 160;
+  public static final int HIGHEST_VERSION = 170;
 
   @Immutable
   private static final KnownVersion[] VALUES = new KnownVersion[HIGHEST_VERSION + 1];
@@ -216,6 +216,13 @@ public class KnownVersion extends AbstractVersion {
       new KnownVersion("GEODE", "1.16.0", (byte) 1, (byte) 16, (byte) 0, (byte) 0,
           GEODE_1_16_0_ORDINAL);
 
+  private static final short GEODE_2_1_0_ORDINAL = 170;
+
+  @Immutable
+  public static final KnownVersion GEODE_2_1_0 =
+      new KnownVersion("GEODE", "2.1.0", (byte) 2, (byte) 1, (byte) 0, (byte) 0,
+          GEODE_2_1_0_ORDINAL);
+
   /* NOTE: when adding a new version bump the ordinal by 10. Ordinals can be short ints */
 
   /**
@@ -229,7 +236,7 @@ public class KnownVersion extends AbstractVersion {
    * HIGHEST_VERSION when changing CURRENT !!!
    */
   @Immutable
-  public static final KnownVersion CURRENT = GEODE_1_16_0;
+  public static final KnownVersion CURRENT = GEODE_2_1_0;
 
   /**
    * A lot of versioning code needs access to the current version's ordinal
diff --git a/gradle.properties b/gradle.properties
index 72695f0437e1..22c3554f4129 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@
 #   <blank>   - release
 #
 # The full version string consists of 'versionNumber + releaseQualifier + releaseType'
-version = 1.16.0-build.0
+version = 2.1.0-build.0
 
 # Default Maven targets
 mavenSnapshotUrl = gcs://maven.apachegeode-ci.info/snapshots