diff --git a/antora-playbook.yml b/antora-playbook.yml
index f79a989..5eba8fb 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -34,7 +34,7 @@ content:
   # What branch, main or some staging, e.g. cloud-dev?
   sources:
     - url: https://github.com/tigergraph/doc-site.git
-      branches: [main]
+      branches: [cloud-dev]
     #- url: https://github.com/tigergraph/doc-site.git
     #  branches: [staging]
 
@@ -42,8 +42,8 @@ content:
       # What versions (Previews will usually have extra versions).
       start_paths: home
     - url: https://github.com/tigergraph/cloud-docs.git
-      branches: [main]
-      start_paths: [modules/cloud, modules/cloudbeta]
+      branches: [dev]
+      start_paths: [modules/cloud, modules/savanna]
     - url: https://github.com/tigergraph/server-docs.git
       branches: [3.6, 3.9, "3.10", 3.11, 4.1]
     - url: https://github.com/tigergraph/gsql-docs.git
@@ -64,12 +64,12 @@ content:
       branches: [main]
 ui:
   bundle:
-    url: https://github.com/tigergraph/antora-ui/blob/main/build/ui-bundle.zip?raw=true
+    url: https://github.com/tigergraph/antora-ui/blob/cloud-dev/build/ui-bundle.zip?raw=true
     #url: /Users/victorlee/Documents/GitHub1/Docs/antora-ui/build/ui-bundle.zip?raw=true
     snapshot: true
 asciidoc:
   attributes:
-    page-component-order: '!home, tigergraph-server, gsql-ref, cloud, cloudbeta, cloudBeta, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot'
+    page-component-order: '!home, tigergraph-server, gsql-ref, savanna, gui, insights, graph-ml, pytigergraph, ml-workbench, graphql, tg-copilot, cloud'
   extensions:
     - ./libs/tabs-block.js
 urls:
diff --git a/home/modules/ROOT/pages/index.adoc b/home/modules/ROOT/pages/index.adoc
index 17abc3a..035c02d 100644
--- a/home/modules/ROOT/pages/index.adoc
+++ b/home/modules/ROOT/pages/index.adoc
@@ -2,9 +2,9 @@
 :navtitle: home
 :page-role: home
 
+ 
 Click here to see xref:index.adoc#_announcements[Release Notes and Announcements]!
 
-
 == Get to Know TigerGraph Products
 [.home-card,cols="2",grid=none,frame=none, separator=¦]
 |===
@@ -23,9 +23,9 @@ image:cloudIcon-homecard.png[alt=TigerGraphCloud,width=74,height=74]
 
 A fully-managed cloud database built on the fast and highly scalable TigerGraph Enterprise Server engine.
 
-xref:cloud:start:overview.adoc[TigerGraph Cloud] |
-xref:cloud:start:get_started.adoc[Get Started] |
-xref:cloudBeta:overview:index.adoc[TigerGraph Cloud 4.0]
+xref:savanna:overview:index.adoc[TigerGraph Savanna]|
+xref:savanna:get-started:index.adoc[Get Started] |
+xref:cloud:start:overview.adoc[TigerGraph Cloud Classic] 
 
 ¦
 image:tg_suites-homecard.png[alt=TigerGraphSuite,width=74,height=74]
@@ -81,8 +81,7 @@ Recent News and Releases
 * xref:3.10@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_10_2[TigerGraph Server 3.10.2] was released on Oct 18, 2024.
 //* xref:4.1@tigergraph-server:release-notes:index.adoc[TigerGraph Server 4.1.0 Preview] was released on Aug. 30, 2024.
 * xref:tg-copilot:intro:index.adoc[CoPilot 0.9] was released on Aug. 19, 2024.
-* xref:cloudBeta:overview:index.adoc[TigerGraph Cloud 4.0] - TigerGraph Cloud 4.0 beta version was released on Apr. 29, 2024.
-* xref:1.4@ml-workbench:faq:release-notes.adoc[ML Workbench 1.4] was released on May 17, 2023.
+* xref:savanna:overview:index.adoc[TigerGraph Savanna] - TigerGraph Savanna beta version was released on Apr. 29, 2024.
 //* xref:1.6@pytigergraph:release-notes:index.adoc[pyTigerGraph 1.6] was released on Apr. 29, 2024.
 //* xref:tigergraph-server:release-notes:index.adoc[TigerGraph 3.10.0] preview version was released on Mar. 13, 2024.
 //* xref:3.9@tigergraph-server:release-notes:index.adoc#_fixed_and_improved_in_3_9_3_3[TigerGraph 3.9.3-3] was released on Feb. 15, 2024.
diff --git a/netlify.toml b/netlify.toml
index ba2af5c..dd1dc06 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -6,7 +6,7 @@
 [[headers]]
   for = "/*"
   [headers.values]
-    Content-Security-Policy = "default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com; connect-src * 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src *; style-src * 'unsafe-inline';"
+    Content-Security-Policy = "default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com; connect-src * 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src * mailto: ; style-src * 'unsafe-inline';"
     X-Content-Type-Options = "nosniff"
     X-Frame-Options = "DENY"
 
@@ -46,8 +46,19 @@
     to = "/cloud/current/start/get_started"
 
 [[redirects]]
-    from = "/cloudbeta/overview"
-    to = "/cloudbeta/current/overview"
+    from = "/savanna/overview"
+    to = "/savanna/current/overview"
+
+# redirect cloudbeta to cloud4
+[[redirects]]
+    from = "/cloudBeta"
+    to = "/savanna/main/overview"
+
+# redirect cloud4 to savanna
+[[redirects]]
+    from = "/cloud4"
+    to = "/savanna/main/overview"
+
 
 # cloud and cloudbeta- general redirect from "current" to "main"
 [[redirects]]
@@ -55,8 +66,12 @@
     to = "/cloud/main/:splat"
 
 [[redirects]]
-    from = "/cloudbeta/current/*"
-    to = "/cloudbeta/main/:splat"
+    from = "/cloud4/current/*"
+    to = "/cloud4/main/:splat"
+
+[[redirects]]
+    from = "/savanna/current/*"
+    to = "/savanna/main/:splat"
 
 # redirects for language reference
 [[redirects]]