diff --git a/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap b/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap
index 16e3d3d587789..c6a3ee1cb71e4 100644
--- a/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap
+++ b/web/packages/teleport/src/Discover/SelectResource/__snapshots__/SelectResource.story.test.tsx.snap
@@ -568,7 +568,7 @@ exports[`render with URL loc state set to "server" 1`] = `
     <a
       class="c23 c14"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/rds-proxy-sqlserver"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/rds-proxy-sqlserver"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -610,7 +610,7 @@ exports[`render with URL loc state set to "server" 1`] = `
     <a
       class="c23 c14"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/redshift-serverless"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/sql-server-ad"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -624,7 +624,7 @@ exports[`render with URL loc state set to "server" 1`] = `
         >
           <img
             class="c19"
-            data-testid="res-icon-redshift"
+            data-testid="res-icon-aws"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -644,7 +644,7 @@ exports[`render with URL loc state set to "server" 1`] = `
             class="c24"
             color="text.main"
           >
-            Redshift Serverless
+            RDS SQL Server
           </div>
         </div>
       </div>
@@ -652,7 +652,7 @@ exports[`render with URL loc state set to "server" 1`] = `
     <a
       class="c23 c14"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/azure-sql-server-ad"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/redshift-serverless"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -666,7 +666,7 @@ exports[`render with URL loc state set to "server" 1`] = `
         >
           <img
             class="c19"
-            data-testid="res-icon-azure"
+            data-testid="res-icon-redshift"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -680,13 +680,13 @@ exports[`render with URL loc state set to "server" 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Azure
+            Amazon Web Services (AWS)
           </div>
           <div
             class="c24"
             color="text.main"
           >
-            SQL Server
+            Redshift Serverless
           </div>
         </div>
       </div>
@@ -694,7 +694,7 @@ exports[`render with URL loc state set to "server" 1`] = `
     <a
       class="c23 c14"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/sql-server-ad"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-sql-server-ad"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -708,7 +708,7 @@ exports[`render with URL loc state set to "server" 1`] = `
         >
           <img
             class="c19"
-            data-testid="res-icon-windows"
+            data-testid="res-icon-azure"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -722,7 +722,7 @@ exports[`render with URL loc state set to "server" 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Microsoft
+            Azure
           </div>
           <div
             class="c24"
@@ -1696,7 +1696,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/azure-redis"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-redis"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -1738,7 +1738,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/cassandra-self-hosted"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-self-hosted-databases/cassandra-self-hosted"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -1780,7 +1780,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/mysql-cloudsql"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-google-cloud-databases/mysql-cloudsql"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -1822,7 +1822,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/postgres-cloudsql"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-google-cloud-databases/postgres-cloudsql"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -1864,7 +1864,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/cockroachdb-self-hosted"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-self-hosted-databases/cockroachdb-self-hosted"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -1906,7 +1906,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/dynamic-registration"
+      href="https://goteleport.com/docs/enroll-resources/database-access/guides/dynamic-registration"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -1948,7 +1948,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/aws-dynamodb"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/aws-dynamodb"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -1990,7 +1990,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/redis-aws"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/redis-aws"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2032,7 +2032,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/elastic"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-self-hosted-databases/elastic"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2074,7 +2074,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/ha"
+      href="https://goteleport.com/docs/enroll-resources/database-access/guides/ha"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2116,7 +2116,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/aws-cassandra-keyspaces"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/aws-cassandra-keyspaces"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2200,7 +2200,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/mongodb-self-hosted"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-self-hosted-databases/mongodb-self-hosted"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2242,7 +2242,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/mongodb-atlas"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-managed-databases/mongodb-atlas"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2277,7 +2277,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/azure-postgres-mysql"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-postgres-mysql"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2319,7 +2319,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/azure-postgres-mysql"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-postgres-mysql"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2361,7 +2361,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/rds-proxy-mysql"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/rds-proxy-mysql"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2403,7 +2403,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/rds-proxy-postgres"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/rds-proxy-postgres"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2445,7 +2445,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/rds-proxy-sqlserver"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/rds-proxy-sqlserver"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2487,7 +2487,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/redis"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/sql-server-ad"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2501,7 +2501,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-selfhosted"
+            data-testid="res-icon-aws"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -2515,13 +2515,13 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Self-Hosted
+            Amazon Web Services (AWS)
           </div>
           <div
             class="c18"
             color="text.main"
           >
-            Redis
+            RDS SQL Server
           </div>
         </div>
       </div>
@@ -2529,7 +2529,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/redis-cluster"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-self-hosted-databases/redis"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2563,7 +2563,7 @@ exports[`render with all access 1`] = `
             class="c18"
             color="text.main"
           >
-            Redis Cluster
+            Redis
           </div>
         </div>
       </div>
@@ -2571,7 +2571,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/postgres-redshift"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-self-hosted-databases/redis-cluster"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2585,7 +2585,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-redshift"
+            data-testid="res-icon-selfhosted"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -2599,13 +2599,13 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Amazon Web Services (AWS)
+            Self-Hosted
           </div>
           <div
             class="c18"
             color="text.main"
           >
-            Redshift PostgreSQL
+            Redis Cluster
           </div>
         </div>
       </div>
@@ -2613,7 +2613,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/redshift-serverless"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/postgres-redshift"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2647,7 +2647,7 @@ exports[`render with all access 1`] = `
             class="c18"
             color="text.main"
           >
-            Redshift Serverless
+            Redshift PostgreSQL
           </div>
         </div>
       </div>
@@ -2655,7 +2655,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/snowflake"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-aws-databases/redshift-serverless"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2669,7 +2669,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-snowflake"
+            data-testid="res-icon-redshift"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -2678,11 +2678,18 @@ exports[`render with all access 1`] = `
         <div
           class="c14"
         >
+          <div
+            class="c15"
+            color="text.slightlyMuted"
+            font-size="12px"
+          >
+            Amazon Web Services (AWS)
+          </div>
           <div
             class="c18"
             color="text.main"
           >
-            Snowflake
+            Redshift Serverless
           </div>
         </div>
       </div>
@@ -2690,7 +2697,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/azure-sql-server-ad"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-managed-databases/snowflake"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2704,7 +2711,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-azure"
+            data-testid="res-icon-snowflake"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -2713,18 +2720,11 @@ exports[`render with all access 1`] = `
         <div
           class="c14"
         >
-          <div
-            class="c15"
-            color="text.slightlyMuted"
-            font-size="12px"
-          >
-            Azure
-          </div>
           <div
             class="c18"
             color="text.main"
           >
-            SQL Server
+            Snowflake
           </div>
         </div>
       </div>
@@ -2732,7 +2732,7 @@ exports[`render with all access 1`] = `
     <a
       class="c17 c7"
       data-testid="1"
-      href="https://goteleport.com/docs/database-access/guides/sql-server-ad"
+      href="https://goteleport.com/docs/enroll-resources/database-access/enroll-azure-databases/azure-sql-server-ad"
       rel="noreferrer"
       style="text-decoration: none;"
       target="_blank"
@@ -2746,7 +2746,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-windows"
+            data-testid="res-icon-azure"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -2760,7 +2760,7 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Microsoft
+            Azure
           </div>
           <div
             class="c18"
@@ -4578,7 +4578,7 @@ exports[`render with no access 1`] = `
         >
           <img
             class="c15"
-            data-testid="res-icon-selfhosted"
+            data-testid="res-icon-aws"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -4592,13 +4592,13 @@ exports[`render with no access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Self-Hosted
+            Amazon Web Services (AWS)
           </div>
           <div
             class="c18"
             color="text.main"
           >
-            Redis
+            RDS SQL Server
           </div>
         </div>
       </div>
@@ -4645,7 +4645,7 @@ exports[`render with no access 1`] = `
             class="c18"
             color="text.main"
           >
-            Redis Cluster
+            Redis
           </div>
         </div>
       </div>
@@ -4672,7 +4672,7 @@ exports[`render with no access 1`] = `
         >
           <img
             class="c15"
-            data-testid="res-icon-redshift"
+            data-testid="res-icon-selfhosted"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -4686,13 +4686,13 @@ exports[`render with no access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Amazon Web Services (AWS)
+            Self-Hosted
           </div>
           <div
             class="c18"
             color="text.main"
           >
-            Redshift PostgreSQL
+            Redis Cluster
           </div>
         </div>
       </div>
@@ -4739,14 +4739,17 @@ exports[`render with no access 1`] = `
             class="c18"
             color="text.main"
           >
-            Redshift Serverless
+            Redshift PostgreSQL
           </div>
         </div>
       </div>
     </a>
-    <div
-      class="c8"
-      data-testid="4"
+    <a
+      class="c7 c8"
+      data-testid="1"
+      rel="noreferrer"
+      style="text-decoration: none;"
+      target="_blank"
     >
       <div
         class="c9 c10"
@@ -4763,7 +4766,7 @@ exports[`render with no access 1`] = `
         >
           <img
             class="c15"
-            data-testid="res-icon-linux"
+            data-testid="res-icon-redshift"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -4777,22 +4780,20 @@ exports[`render with no access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Server
+            Amazon Web Services (AWS)
           </div>
           <div
-            class="c19"
+            class="c18"
+            color="text.main"
           >
-            RHEL/CentOS 7+
+            Redshift Serverless
           </div>
         </div>
       </div>
-    </div>
-    <a
-      class="c7 c8"
-      data-testid="1"
-      rel="noreferrer"
-      style="text-decoration: none;"
-      target="_blank"
+    </a>
+    <div
+      class="c8"
+      data-testid="4"
     >
       <div
         class="c9 c10"
@@ -4809,7 +4810,7 @@ exports[`render with no access 1`] = `
         >
           <img
             class="c15"
-            data-testid="res-icon-snowflake"
+            data-testid="res-icon-linux"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -4819,14 +4820,20 @@ exports[`render with no access 1`] = `
           class="c16"
         >
           <div
-            class="c18"
-            color="text.main"
+            class="c17"
+            color="text.slightlyMuted"
+            font-size="12px"
           >
-            Snowflake
+            Server
+          </div>
+          <div
+            class="c19"
+          >
+            RHEL/CentOS 7+
           </div>
         </div>
       </div>
-    </a>
+    </div>
     <a
       class="c7 c8"
       data-testid="1"
@@ -4849,7 +4856,7 @@ exports[`render with no access 1`] = `
         >
           <img
             class="c15"
-            data-testid="res-icon-azure"
+            data-testid="res-icon-snowflake"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -4858,18 +4865,11 @@ exports[`render with no access 1`] = `
         <div
           class="c16"
         >
-          <div
-            class="c17"
-            color="text.slightlyMuted"
-            font-size="12px"
-          >
-            Azure
-          </div>
           <div
             class="c18"
             color="text.main"
           >
-            SQL Server
+            Snowflake
           </div>
         </div>
       </div>
@@ -4896,7 +4896,7 @@ exports[`render with no access 1`] = `
         >
           <img
             class="c15"
-            data-testid="res-icon-windows"
+            data-testid="res-icon-azure"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -4910,7 +4910,7 @@ exports[`render with no access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Microsoft
+            Azure
           </div>
           <div
             class="c18"
@@ -6866,7 +6866,7 @@ exports[`render with partial access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-selfhosted"
+            data-testid="res-icon-aws"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -6880,13 +6880,13 @@ exports[`render with partial access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Self-Hosted
+            Amazon Web Services (AWS)
           </div>
           <div
             class="c18"
             color="text.main"
           >
-            Redis
+            RDS SQL Server
           </div>
         </div>
       </div>
@@ -6933,7 +6933,7 @@ exports[`render with partial access 1`] = `
             class="c18"
             color="text.main"
           >
-            Redis Cluster
+            Redis
           </div>
         </div>
       </div>
@@ -6960,7 +6960,7 @@ exports[`render with partial access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-redshift"
+            data-testid="res-icon-selfhosted"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -6974,13 +6974,13 @@ exports[`render with partial access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Amazon Web Services (AWS)
+            Self-Hosted
           </div>
           <div
             class="c18"
             color="text.main"
           >
-            Redshift PostgreSQL
+            Redis Cluster
           </div>
         </div>
       </div>
@@ -7027,7 +7027,7 @@ exports[`render with partial access 1`] = `
             class="c18"
             color="text.main"
           >
-            Redshift Serverless
+            Redshift PostgreSQL
           </div>
         </div>
       </div>
@@ -7054,7 +7054,7 @@ exports[`render with partial access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-snowflake"
+            data-testid="res-icon-redshift"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -7063,11 +7063,18 @@ exports[`render with partial access 1`] = `
         <div
           class="c14"
         >
+          <div
+            class="c15"
+            color="text.slightlyMuted"
+            font-size="12px"
+          >
+            Amazon Web Services (AWS)
+          </div>
           <div
             class="c18"
             color="text.main"
           >
-            Snowflake
+            Redshift Serverless
           </div>
         </div>
       </div>
@@ -7094,7 +7101,7 @@ exports[`render with partial access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-azure"
+            data-testid="res-icon-snowflake"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -7103,18 +7110,11 @@ exports[`render with partial access 1`] = `
         <div
           class="c14"
         >
-          <div
-            class="c15"
-            color="text.slightlyMuted"
-            font-size="12px"
-          >
-            Azure
-          </div>
           <div
             class="c18"
             color="text.main"
           >
-            SQL Server
+            Snowflake
           </div>
         </div>
       </div>
@@ -7141,7 +7141,7 @@ exports[`render with partial access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-windows"
+            data-testid="res-icon-azure"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -7155,7 +7155,7 @@ exports[`render with partial access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Microsoft
+            Azure
           </div>
           <div
             class="c18"
diff --git a/web/packages/teleport/src/Discover/SelectResource/databases.tsx b/web/packages/teleport/src/Discover/SelectResource/databases.tsx
index aaf4bc8190e34..1d648e91380b6 100644
--- a/web/packages/teleport/src/Discover/SelectResource/databases.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/databases.tsx
@@ -26,14 +26,23 @@ import { ResourceKind } from '../Shared/ResourceKind';
 
 import { ResourceSpec, DatabaseLocation, DatabaseEngine } from './types';
 
+enum DatabaseGuideSection {
+  Aws = 'enroll-aws-databases',
+  Azure = 'enroll-azure-databases',
+  Gcp = 'enroll-google-cloud-databases',
+  Managed = 'enroll-managed-databases',
+  SelfHosted = 'enroll-self-hosted-databases',
+  Guides = 'guides',
+}
+
 const baseDatabaseKeywords = 'db database databases';
 const awsKeywords = baseDatabaseKeywords + 'aws amazon web services';
 const gcpKeywords = baseDatabaseKeywords + 'gcp google cloud provider';
 const selfhostedKeywords = baseDatabaseKeywords + 'self hosted self-hosted';
 const azureKeywords = baseDatabaseKeywords + 'microsoft azure';
 
-function getDbAccessDocLink(guide: string) {
-  return `https://goteleport.com/docs/database-access/guides/${guide}`;
+function getDbAccessDocLink(subsection: DatabaseGuideSection, guide: string) {
+  return `https://goteleport.com/docs/enroll-resources/database-access/${subsection}/${guide}`;
 }
 
 // DATABASES_UNGUIDED_DOC are documentations that is not specific
@@ -45,7 +54,10 @@ export const DATABASES_UNGUIDED_DOC: ResourceSpec[] = [
     keywords: awsKeywords + 'rds proxy postgresql',
     kind: ResourceKind.Database,
     icon: 'aws',
-    unguidedLink: getDbAccessDocLink('rds-proxy-postgres'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Aws,
+      'rds-proxy-postgres'
+    ),
     // TODO(lisa): add a new usage event
     event: DiscoverEventResource.DatabaseDocRdsProxy,
   },
@@ -55,7 +67,10 @@ export const DATABASES_UNGUIDED_DOC: ResourceSpec[] = [
     keywords: awsKeywords + 'rds proxy sql server sqlserver',
     kind: ResourceKind.Database,
     icon: 'aws',
-    unguidedLink: getDbAccessDocLink('rds-proxy-sqlserver'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Aws,
+      'rds-proxy-sqlserver'
+    ),
     // TODO(lisa): add a new usage event
     event: DiscoverEventResource.DatabaseDocRdsProxy,
   },
@@ -65,7 +80,10 @@ export const DATABASES_UNGUIDED_DOC: ResourceSpec[] = [
     keywords: awsKeywords + 'rds proxy mariadb mysql',
     kind: ResourceKind.Database,
     icon: 'aws',
-    unguidedLink: getDbAccessDocLink('rds-proxy-mysql'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Aws,
+      'rds-proxy-mysql'
+    ),
     // TODO(lisa): add a new usage event
     event: DiscoverEventResource.DatabaseDocRdsProxy,
   },
@@ -75,7 +93,7 @@ export const DATABASES_UNGUIDED_DOC: ResourceSpec[] = [
     keywords: baseDatabaseKeywords + 'high availability ha',
     kind: ResourceKind.Database,
     icon: 'database',
-    unguidedLink: getDbAccessDocLink('ha'),
+    unguidedLink: getDbAccessDocLink(DatabaseGuideSection.Guides, 'ha'),
     event: DiscoverEventResource.DatabaseDocHighAvailability,
   },
   {
@@ -84,7 +102,10 @@ export const DATABASES_UNGUIDED_DOC: ResourceSpec[] = [
     keywords: baseDatabaseKeywords + 'dynamic registration',
     kind: ResourceKind.Database,
     icon: 'database',
-    unguidedLink: getDbAccessDocLink('dynamic-registration'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Guides,
+      'dynamic-registration'
+    ),
     event: DiscoverEventResource.DatabaseDocDynamicRegistration,
   },
 ];
@@ -96,7 +117,7 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: awsKeywords + 'dynamodb',
     kind: ResourceKind.Database,
     icon: 'dynamo',
-    unguidedLink: getDbAccessDocLink('aws-dynamodb'),
+    unguidedLink: getDbAccessDocLink(DatabaseGuideSection.Aws, 'aws-dynamodb'),
     event: DiscoverEventResource.DatabaseDynamoDb,
   },
   {
@@ -105,7 +126,7 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: awsKeywords + 'elasticache memorydb redis',
     kind: ResourceKind.Database,
     icon: 'aws',
-    unguidedLink: getDbAccessDocLink('redis-aws'),
+    unguidedLink: getDbAccessDocLink(DatabaseGuideSection.Aws, 'redis-aws'),
     event: DiscoverEventResource.DatabaseRedisElasticache,
   },
   {
@@ -117,7 +138,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: awsKeywords + 'keyspaces apache cassandra',
     kind: ResourceKind.Database,
     icon: 'aws',
-    unguidedLink: getDbAccessDocLink('aws-cassandra-keyspaces'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Aws,
+      'aws-cassandra-keyspaces'
+    ),
     event: DiscoverEventResource.DatabaseCassandraKeyspaces,
   },
   {
@@ -126,7 +150,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: awsKeywords + 'redshift postgresql',
     kind: ResourceKind.Database,
     icon: 'redshift',
-    unguidedLink: getDbAccessDocLink('postgres-redshift'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Aws,
+      'postgres-redshift'
+    ),
     event: DiscoverEventResource.DatabasePostgresRedshift,
   },
   {
@@ -135,7 +162,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: awsKeywords + 'redshift serverless postgresql',
     kind: ResourceKind.Database,
     icon: 'redshift',
-    unguidedLink: getDbAccessDocLink('redshift-serverless'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Aws,
+      'redshift-serverless'
+    ),
     event: DiscoverEventResource.DatabasePostgresRedshiftServerless,
   },
   {
@@ -144,7 +174,7 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: azureKeywords + 'cache redis',
     kind: ResourceKind.Database,
     icon: 'azure',
-    unguidedLink: getDbAccessDocLink('azure-redis'),
+    unguidedLink: getDbAccessDocLink(DatabaseGuideSection.Azure, 'azure-redis'),
     event: DiscoverEventResource.DatabaseRedisAzureCache,
   },
   {
@@ -156,7 +186,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: azureKeywords + 'postgresql',
     kind: ResourceKind.Database,
     icon: 'azure',
-    unguidedLink: getDbAccessDocLink('azure-postgres-mysql'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Azure,
+      'azure-postgres-mysql'
+    ),
     event: DiscoverEventResource.DatabasePostgresAzure,
   },
   {
@@ -165,7 +198,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: azureKeywords + 'mysql',
     kind: ResourceKind.Database,
     icon: 'azure',
-    unguidedLink: getDbAccessDocLink('azure-postgres-mysql'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Azure,
+      'azure-postgres-mysql'
+    ),
     event: DiscoverEventResource.DatabaseMysqlAzure,
   },
   {
@@ -178,22 +214,25 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
       azureKeywords + 'active directory ad sql server sqlserver preview',
     kind: ResourceKind.Database,
     icon: 'azure',
-    unguidedLink: getDbAccessDocLink('azure-sql-server-ad'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Azure,
+      'azure-sql-server-ad'
+    ),
     event: DiscoverEventResource.DatabaseSqlServerAzure,
     platform: Platform.Windows,
   },
   {
     dbMeta: {
-      location: DatabaseLocation.Microsoft,
+      location: DatabaseLocation.Aws,
       engine: DatabaseEngine.SqlServer,
     },
-    name: 'SQL Server',
+    name: 'RDS SQL Server',
     keywords:
-      baseDatabaseKeywords +
-      'microsoft active directory ad sql server sqlserver preview',
+      awsKeywords +
+      'rds microsoft active directory ad sql server sqlserver preview',
     kind: ResourceKind.Database,
-    icon: 'windows',
-    unguidedLink: getDbAccessDocLink('sql-server-ad'),
+    icon: 'aws',
+    unguidedLink: getDbAccessDocLink(DatabaseGuideSection.Aws, 'sql-server-ad'),
     event: DiscoverEventResource.DatabaseSqlServerMicrosoft,
     platform: Platform.Windows,
   },
@@ -203,7 +242,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: gcpKeywords + 'mysql',
     kind: ResourceKind.Database,
     icon: 'googlecloud',
-    unguidedLink: getDbAccessDocLink('mysql-cloudsql'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Gcp,
+      'mysql-cloudsql'
+    ),
     event: DiscoverEventResource.DatabaseMysqlGcp,
   },
   {
@@ -212,7 +254,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: gcpKeywords + 'postgresql',
     kind: ResourceKind.Database,
     icon: 'googlecloud',
-    unguidedLink: getDbAccessDocLink('postgres-cloudsql'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Gcp,
+      'postgres-cloudsql'
+    ),
     event: DiscoverEventResource.DatabasePostgresGcp,
   },
   {
@@ -224,7 +269,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: baseDatabaseKeywords + 'mongodb atlas',
     kind: ResourceKind.Database,
     icon: 'mongo',
-    unguidedLink: getDbAccessDocLink('mongodb-atlas'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.Managed,
+      'mongodb-atlas'
+    ),
     event: DiscoverEventResource.DatabaseMongodbAtlas,
   },
   {
@@ -236,7 +284,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: selfhostedKeywords + 'cassandra scylladb',
     kind: ResourceKind.Database,
     icon: 'selfhosted',
-    unguidedLink: getDbAccessDocLink('cassandra-self-hosted'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.SelfHosted,
+      'cassandra-self-hosted'
+    ),
     event: DiscoverEventResource.DatabaseCassandraSelfHosted,
   },
   {
@@ -248,7 +299,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: selfhostedKeywords + 'cockroachdb',
     kind: ResourceKind.Database,
     icon: 'cockroach',
-    unguidedLink: getDbAccessDocLink('cockroachdb-self-hosted'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.SelfHosted,
+      'cockroachdb-self-hosted'
+    ),
     event: DiscoverEventResource.DatabaseCockroachDbSelfHosted,
   },
   {
@@ -260,7 +314,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: selfhostedKeywords + 'elasticsearch',
     kind: ResourceKind.Database,
     icon: 'selfhosted',
-    unguidedLink: getDbAccessDocLink('elastic'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.SelfHosted,
+      'elastic'
+    ),
     event: DiscoverEventResource.DatabaseElasticSearchSelfHosted,
   },
   {
@@ -272,7 +329,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: selfhostedKeywords + 'mongodb',
     kind: ResourceKind.Database,
     icon: 'mongo',
-    unguidedLink: getDbAccessDocLink('mongodb-self-hosted'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.SelfHosted,
+      'mongodb-self-hosted'
+    ),
     event: DiscoverEventResource.DatabaseMongodbSelfHosted,
   },
   {
@@ -284,7 +344,7 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: selfhostedKeywords + 'redis',
     kind: ResourceKind.Database,
     icon: 'selfhosted',
-    unguidedLink: getDbAccessDocLink('redis'),
+    unguidedLink: getDbAccessDocLink(DatabaseGuideSection.SelfHosted, 'redis'),
     event: DiscoverEventResource.DatabaseRedisSelfHosted,
   },
   {
@@ -296,7 +356,10 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: selfhostedKeywords + 'redis cluster',
     kind: ResourceKind.Database,
     icon: 'selfhosted',
-    unguidedLink: getDbAccessDocLink('redis-cluster'),
+    unguidedLink: getDbAccessDocLink(
+      DatabaseGuideSection.SelfHosted,
+      'redis-cluster'
+    ),
     event: DiscoverEventResource.DatabaseRedisClusterSelfHosted,
   },
   {
@@ -308,7 +371,7 @@ export const DATABASES_UNGUIDED: ResourceSpec[] = [
     keywords: baseDatabaseKeywords + 'snowflake preview',
     kind: ResourceKind.Database,
     icon: 'snowflake',
-    unguidedLink: getDbAccessDocLink('snowflake'),
+    unguidedLink: getDbAccessDocLink(DatabaseGuideSection.Managed, 'snowflake'),
     event: DiscoverEventResource.DatabaseSnowflake,
   },
 ];