diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
index e84900e138..bcc4c711c8 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
@@ -11,38 +11,43 @@ namespace AWSCore
 {
     static constexpr const char NewToAWSUrl[] = "https://docs.o3de.org/docs/user-guide/gems/reference/aws/";
 
-    static constexpr const char AWSAndScriptCanvasUrl[] = "https://docs.o3de.org/docs/user-guide/components/reference/aws/";
-    static constexpr const char AWSAndComponentsUrl[] = "https://docs.o3de.org/docs/user-guide/components/reference/aws/";
-    static constexpr const char CallAWSResourcesUrl[] = "https://docs.o3de.org/docs/user-guide/components/reference/aws/";
+    static constexpr const char AWSAndGettingStartedUrl[] =
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/getting-started/";
+    static constexpr const char AWSAndResourceMappingsUrl[] =
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/resource-mapping-files/";
+    static constexpr const char AWSAndResourceMappingToolUrl[] =
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/resource-mapping-tool/";
+    static constexpr const char AWSAndScriptingUrl[] =
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/scripting/";
 
     static constexpr const char AWSCredentialConfigurationUrl[] =
         "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/configuring-credentials/";
 
     static constexpr const char AWSClientAuthGemOverviewUrl[] =
         "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+    static constexpr const char AWSClientAuthGemSetupUrl[] =
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/setup/";
     static constexpr const char AWSClientAuthCDKAndResourcesUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/setup/#3-deploy-the-cdk-application";
     static constexpr const char AWSClientAuthScriptCanvasAndLuaUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/scripting/";
     static constexpr const char AWSClientAuth3rdPartyAuthProviderUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/authentication-providers/";
     static constexpr const char AWSClientAuthCustomAuthProviderUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
-    static constexpr const char AWSClientAuthPlatformSpecificUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/authentication-providers/#using-a-custom-provider";
     static constexpr const char AWSClientAuthAPIReferenceUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/cpp-api/";
 
     static constexpr const char AWSMetricsGemOverviewUrl[] =
         "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
     static constexpr const char AWSMetricsSetupGemUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/setup/";
     static constexpr const char AWSMetricsScriptingUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/scripting/";
     static constexpr const char AWSMetricsAPIReferenceUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/cpp-api/";
     static constexpr const char AWSMetricsAdvancedTopicsUrl[] =
-        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+        "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/advanced-topics/";
     static constexpr const char AWSMetricsSettingsUrl[] =
         "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
 } // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
index 5bc47964f4..3cb45ad521 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
@@ -11,29 +11,30 @@ namespace AWSCore
 {
     static constexpr const char NewToAWSActionText[] = "Getting started with AWS?";
 
-    static constexpr const char AWSAndO3DEGlobalDocsText[] = "AWS & O3DE global docs";
-    static constexpr const char AWSAndScriptCanvasActionText[] = "AWS && ScriptCanvas";
-    static constexpr const char AWSAndComponentsActionText[] = "AWS & Components";
-    static constexpr const char CallAWSResourcesActionText[] = "Call AWS resources";
+    static constexpr const char AWSAndO3DEGlobalDocsText[] = "AWS && O3DE";
+    static constexpr const char AWSAndO3DEGettingStartedActionText[] = "Getting started";
+    static constexpr const char AWSAndO3DEMappingsFileActionText[] = "Use AWS resources in O3DE";
+    static constexpr const char AWSAndO3DEResourceToolActionText[] = "Building a resource mappings file";
+    static constexpr const char AWSAndO3DEScriptingActionText[] = "Scripting reference";
 
     static constexpr const char AWSCredentialConfigurationActionText[] = "AWS credential configuration";
 
     static constexpr const char AWSResourceMappingToolActionText[] = "AWS Resource Mapping Tool...";
 
-    static constexpr const char AWSClientAuthActionText[] = "Client Auth";
-    static constexpr const char AWSClientAuthGemOverviewActionText[] = "Gem Overview";
-    static constexpr const char AWSClientAuthCDKAndResourcesActionText[] = "CDK Application and Resource Mappings";
-    static constexpr const char AWSClientAuthScriptCanvasAndLuaActionText[] = "Script Canvas and Lua";
-    static constexpr const char AWSClientAuth3rdPartyAuthProviderActionText[] = "3rd Party developer Authentication Provider support";
-    static constexpr const char AWSClientAuthCustomAuthProviderActionText[] = "Custom developer Authentication Provider support";
-    static constexpr const char AWSClientAuthPlatformSpecificActionText[] = "Platform specific Callouts";
-    static constexpr const char AWSClientAuthAPIReferenceActionText[] = "API Reference";
+    static constexpr const char AWSClientAuthActionText[] = "Client Auth Gem";
+    static constexpr const char AWSClientAuthGemOverviewActionText[] = "Client Auth Gem overview";
+    static constexpr const char AWSClientAuthGemSetupActionText[] = "Setup Client Auth Gem";
+    static constexpr const char AWSClientAuthCDKAndResourcesActionText[] = "CDK application and resource mappings";
+    static constexpr const char AWSClientAuthScriptCanvasAndLuaActionText[] = "Scripting reference";
+    static constexpr const char AWSClientAuth3rdPartyAuthProviderActionText[] = "3rd Party developer authentication provider support";
+    static constexpr const char AWSClientAuthCustomAuthProviderActionText[] = "Custom developer authentication provider support";
+    static constexpr const char AWSClientAuthAPIReferenceActionText[] = "API reference";
 
-    static constexpr const char AWSMetricsActionText[] = "Metrics";
-    static constexpr const char AWSMetricsGemOverviewActionText[] = "Metrics Overview";
+    static constexpr const char AWSMetricsActionText[] = "Metrics Gem";
+    static constexpr const char AWSMetricsGemOverviewActionText[] = "Metrics Gem overview";
     static constexpr const char AWSMetricsSetupGemActionText[] = "Setup Metrics Gem";
-    static constexpr const char AWSMetricsScriptingActionText[] = "Scripting with AWS Metrics";
-    static constexpr const char AWSMetricsAPIReferenceActionText[] = "C++ API with AWS Metrics Gem";
+    static constexpr const char AWSMetricsScriptingActionText[] = "Scripting reference";
+    static constexpr const char AWSMetricsAPIReferenceActionText[] = "API reference";
     static constexpr const char AWSMetricsAdvancedTopicsActionText[] = "Advanced topics";
-    static constexpr const char AWSMetricsSettingsActionText[] = "Metrics Settings";
+    static constexpr const char AWSMetricsSettingsActionText[] = "Metrics settings";
 } // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
index 52a4ce2f16..8c61fa722d 100644
--- a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
@@ -131,9 +131,14 @@ namespace AWSCore
     {
         QMenu* globalDocsMenu = this->addMenu(QObject::tr(AWSAndO3DEGlobalDocsText));
 
-        globalDocsMenu->addAction(AddExternalLinkAction(AWSAndScriptCanvasActionText, AWSAndScriptCanvasUrl, ":/Notifications/link.svg"));
-        globalDocsMenu->addAction(AddExternalLinkAction(AWSAndComponentsActionText, AWSAndComponentsUrl, ":/Notifications/link.svg"));
-        globalDocsMenu->addAction(AddExternalLinkAction(CallAWSResourcesActionText, CallAWSResourcesUrl, ":/Notifications/link.svg"));
+        globalDocsMenu->addAction(
+            AddExternalLinkAction(AWSAndO3DEGettingStartedActionText, AWSAndGettingStartedUrl, ":/Notifications/link.svg"));
+        globalDocsMenu->addAction(
+            AddExternalLinkAction(AWSAndO3DEMappingsFileActionText, AWSAndResourceMappingsUrl, ":/Notifications/link.svg"));
+        globalDocsMenu->addAction(
+            AddExternalLinkAction(AWSAndO3DEResourceToolActionText, AWSAndResourceMappingToolUrl, ":/Notifications/link.svg"));
+        globalDocsMenu->addAction(
+            AddExternalLinkAction(AWSAndO3DEScriptingActionText, AWSAndScriptingUrl, ":/Notifications/link.svg"));
 
         AddSpaceForIcon(globalDocsMenu);
     }
@@ -158,6 +163,8 @@ namespace AWSCore
 
         subMenu->addAction(AddExternalLinkAction(
             AWSClientAuthGemOverviewActionText, AWSClientAuthGemOverviewUrl, ":/Notifications/link.svg"));
+        subMenu->addAction(AddExternalLinkAction(
+            AWSClientAuthGemSetupActionText, AWSClientAuthGemSetupUrl, ":/Notifications/link.svg"));
         subMenu->addAction(AddExternalLinkAction(
             AWSClientAuthCDKAndResourcesActionText, AWSClientAuthCDKAndResourcesUrl, ":/Notifications/link.svg"));
         subMenu->addAction(AddExternalLinkAction(
@@ -166,8 +173,6 @@ namespace AWSCore
             AWSClientAuth3rdPartyAuthProviderActionText, AWSClientAuth3rdPartyAuthProviderUrl, ":/Notifications/link.svg"));
         subMenu->addAction(AddExternalLinkAction(
             AWSClientAuthCustomAuthProviderActionText, AWSClientAuthCustomAuthProviderUrl, ":/Notifications/link.svg"));
-        subMenu->addAction(AddExternalLinkAction(
-            AWSClientAuthPlatformSpecificActionText, AWSClientAuthPlatformSpecificUrl, ":/Notifications/link.svg"));
         subMenu->addAction(AddExternalLinkAction(
             AWSClientAuthAPIReferenceActionText, AWSClientAuthAPIReferenceUrl, ":/Notifications/link.svg"));