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 546844421f4f1..414f9033217b7 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
@@ -1079,7 +1079,7 @@ exports[`render with all access 1`] = `
     </div>
     <div
       class="c7"
-      data-testid="1"
+      data-testid="0"
     >
       <div
         class="c8"
@@ -1104,24 +1104,17 @@ 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="c16"
           >
-            Aurora MySQL/MariaDB
+            AWS CLI/Console Access
           </div>
         </div>
       </div>
     </div>
     <div
       class="c7"
-      data-testid="1"
+      data-testid="4"
     >
       <div
         class="c8"
@@ -1137,7 +1130,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-aws"
+            data-testid="res-icon-linux"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -1151,19 +1144,19 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Amazon Web Services (AWS)
+            Server
           </div>
           <div
             class="c16"
           >
-            Aurora PostgreSQL
+            Debian 11+
           </div>
         </div>
       </div>
     </div>
     <div
       class="c7"
-      data-testid="0"
+      data-testid="4"
     >
       <div
         class="c8"
@@ -1188,17 +1181,24 @@ 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="c16"
           >
-            AWS CLI/Console Access
+            EC2 Auto Enrollment
           </div>
         </div>
       </div>
     </div>
     <div
       class="c7"
-      data-testid="4"
+      data-testid="3"
     >
       <div
         class="c8"
@@ -1214,7 +1214,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-linux"
+            data-testid="res-icon-aws"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -1228,19 +1228,19 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Server
+            Amazon Web Services (AWS)
           </div>
           <div
             class="c16"
           >
-            Debian 11+
+            EKS
           </div>
         </div>
       </div>
     </div>
     <div
       class="c7"
-      data-testid="4"
+      data-testid="3"
     >
       <div
         class="c8"
@@ -1256,7 +1256,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-aws"
+            data-testid="res-icon-kube"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -1270,19 +1270,19 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Amazon Web Services (AWS)
+            Self-Hosted
           </div>
           <div
             class="c16"
           >
-            EC2 Auto Enrollment
+            Kubernetes
           </div>
         </div>
       </div>
     </div>
     <div
       class="c7"
-      data-testid="3"
+      data-testid="1"
     >
       <div
         class="c8"
@@ -1298,7 +1298,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-aws"
+            data-testid="res-icon-selfhosted"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -1312,19 +1312,19 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Amazon Web Services (AWS)
+            Self-Hosted
           </div>
           <div
             class="c16"
           >
-            EKS
+            MySQL/MariaDB
           </div>
         </div>
       </div>
     </div>
     <div
       class="c7"
-      data-testid="3"
+      data-testid="1"
     >
       <div
         class="c8"
@@ -1340,7 +1340,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-kube"
+            data-testid="res-icon-postgres"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -1359,7 +1359,7 @@ exports[`render with all access 1`] = `
           <div
             class="c16"
           >
-            Kubernetes
+            PostgreSQL
           </div>
         </div>
       </div>
@@ -1382,7 +1382,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"
@@ -1396,12 +1396,12 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Self-Hosted
+            Amazon Web Services (AWS)
           </div>
           <div
             class="c16"
           >
-            MySQL/MariaDB
+            RDS Aurora MySQL
           </div>
         </div>
       </div>
@@ -1424,7 +1424,7 @@ exports[`render with all access 1`] = `
         >
           <img
             class="c13"
-            data-testid="res-icon-postgres"
+            data-testid="res-icon-aws"
             height="24px"
             src="file_stub"
             width="23.9px"
@@ -1438,12 +1438,12 @@ exports[`render with all access 1`] = `
             color="text.slightlyMuted"
             font-size="12px"
           >
-            Self-Hosted
+            Amazon Web Services (AWS)
           </div>
           <div
             class="c16"
           >
-            PostgreSQL
+            RDS Aurora PostgreSQL
           </div>
         </div>
       </div>
@@ -3125,92 +3125,6 @@ exports[`render with no access 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="c8"
-      data-testid="1"
-    >
-      <div
-        class="c9 c10"
-        data-testid="tooltip"
-      >
-        Lacking Permissions
-      </div>
-      <div
-        class="c11 c12"
-      >
-        <div
-          class="c13 c14"
-          width="24px"
-        >
-          <img
-            class="c15"
-            data-testid="res-icon-aws"
-            height="24px"
-            src="file_stub"
-            width="23.9px"
-          />
-        </div>
-        <div
-          class="c16"
-        >
-          <div
-            class="c17"
-            color="text.slightlyMuted"
-            font-size="12px"
-          >
-            Amazon Web Services (AWS)
-          </div>
-          <div
-            class="c19"
-          >
-            Aurora MySQL/MariaDB
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="c8"
-      data-testid="1"
-    >
-      <div
-        class="c9 c10"
-        data-testid="tooltip"
-      >
-        Lacking Permissions
-      </div>
-      <div
-        class="c11 c12"
-      >
-        <div
-          class="c13 c14"
-          width="24px"
-        >
-          <img
-            class="c15"
-            data-testid="res-icon-aws"
-            height="24px"
-            src="file_stub"
-            width="23.9px"
-          />
-        </div>
-        <div
-          class="c16"
-        >
-          <div
-            class="c17"
-            color="text.slightlyMuted"
-            font-size="12px"
-          >
-            Amazon Web Services (AWS)
-          </div>
-          <div
-            class="c19"
-          >
-            Aurora PostgreSQL
-          </div>
-        </div>
-      </div>
-    </div>
     <div
       class="c8"
       data-testid="0"
@@ -4329,6 +4243,92 @@ exports[`render with no access 1`] = `
         </div>
       </div>
     </a>
+    <div
+      class="c8"
+      data-testid="1"
+    >
+      <div
+        class="c9 c10"
+        data-testid="tooltip"
+      >
+        Lacking Permissions
+      </div>
+      <div
+        class="c11 c12"
+      >
+        <div
+          class="c13 c14"
+          width="24px"
+        >
+          <img
+            class="c15"
+            data-testid="res-icon-aws"
+            height="24px"
+            src="file_stub"
+            width="23.9px"
+          />
+        </div>
+        <div
+          class="c16"
+        >
+          <div
+            class="c17"
+            color="text.slightlyMuted"
+            font-size="12px"
+          >
+            Amazon Web Services (AWS)
+          </div>
+          <div
+            class="c19"
+          >
+            RDS Aurora MySQL
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="c8"
+      data-testid="1"
+    >
+      <div
+        class="c9 c10"
+        data-testid="tooltip"
+      >
+        Lacking Permissions
+      </div>
+      <div
+        class="c11 c12"
+      >
+        <div
+          class="c13 c14"
+          width="24px"
+        >
+          <img
+            class="c15"
+            data-testid="res-icon-aws"
+            height="24px"
+            src="file_stub"
+            width="23.9px"
+          />
+        </div>
+        <div
+          class="c16"
+        >
+          <div
+            class="c17"
+            color="text.slightlyMuted"
+            font-size="12px"
+          >
+            Amazon Web Services (AWS)
+          </div>
+          <div
+            class="c19"
+          >
+            RDS Aurora PostgreSQL
+          </div>
+        </div>
+      </div>
+    </div>
     <div
       class="c8"
       data-testid="1"
@@ -5747,92 +5747,6 @@ exports[`render with partial access 1`] = `
         </div>
       </div>
     </a>
-    <div
-      class="c19"
-      data-testid="1"
-    >
-      <div
-        class="c20 c21"
-        data-testid="tooltip"
-      >
-        Lacking Permissions
-      </div>
-      <div
-        class="c9 c10"
-      >
-        <div
-          class="c11 c12"
-          width="24px"
-        >
-          <img
-            class="c13"
-            data-testid="res-icon-aws"
-            height="24px"
-            src="file_stub"
-            width="23.9px"
-          />
-        </div>
-        <div
-          class="c14"
-        >
-          <div
-            class="c15"
-            color="text.slightlyMuted"
-            font-size="12px"
-          >
-            Amazon Web Services (AWS)
-          </div>
-          <div
-            class="c16"
-          >
-            Aurora MySQL/MariaDB
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="c19"
-      data-testid="1"
-    >
-      <div
-        class="c20 c21"
-        data-testid="tooltip"
-      >
-        Lacking Permissions
-      </div>
-      <div
-        class="c9 c10"
-      >
-        <div
-          class="c11 c12"
-          width="24px"
-        >
-          <img
-            class="c13"
-            data-testid="res-icon-aws"
-            height="24px"
-            src="file_stub"
-            width="23.9px"
-          />
-        </div>
-        <div
-          class="c14"
-        >
-          <div
-            class="c15"
-            color="text.slightlyMuted"
-            font-size="12px"
-          >
-            Amazon Web Services (AWS)
-          </div>
-          <div
-            class="c16"
-          >
-            Aurora PostgreSQL
-          </div>
-        </div>
-      </div>
-    </div>
     <a
       class="c17 c19"
       data-testid="1"
@@ -6617,6 +6531,92 @@ exports[`render with partial access 1`] = `
         </div>
       </div>
     </a>
+    <div
+      class="c19"
+      data-testid="1"
+    >
+      <div
+        class="c20 c21"
+        data-testid="tooltip"
+      >
+        Lacking Permissions
+      </div>
+      <div
+        class="c9 c10"
+      >
+        <div
+          class="c11 c12"
+          width="24px"
+        >
+          <img
+            class="c13"
+            data-testid="res-icon-aws"
+            height="24px"
+            src="file_stub"
+            width="23.9px"
+          />
+        </div>
+        <div
+          class="c14"
+        >
+          <div
+            class="c15"
+            color="text.slightlyMuted"
+            font-size="12px"
+          >
+            Amazon Web Services (AWS)
+          </div>
+          <div
+            class="c16"
+          >
+            RDS Aurora MySQL
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="c19"
+      data-testid="1"
+    >
+      <div
+        class="c20 c21"
+        data-testid="tooltip"
+      >
+        Lacking Permissions
+      </div>
+      <div
+        class="c9 c10"
+      >
+        <div
+          class="c11 c12"
+          width="24px"
+        >
+          <img
+            class="c13"
+            data-testid="res-icon-aws"
+            height="24px"
+            src="file_stub"
+            width="23.9px"
+          />
+        </div>
+        <div
+          class="c14"
+        >
+          <div
+            class="c15"
+            color="text.slightlyMuted"
+            font-size="12px"
+          >
+            Amazon Web Services (AWS)
+          </div>
+          <div
+            class="c16"
+          >
+            RDS Aurora PostgreSQL
+          </div>
+        </div>
+      </div>
+    </div>
     <div
       class="c19"
       data-testid="1"
diff --git a/web/packages/teleport/src/Discover/SelectResource/databases.tsx b/web/packages/teleport/src/Discover/SelectResource/databases.tsx
index 1d648e91380b6..b4b742c766cc0 100644
--- a/web/packages/teleport/src/Discover/SelectResource/databases.tsx
+++ b/web/packages/teleport/src/Discover/SelectResource/databases.tsx
@@ -393,8 +393,8 @@ export const DATABASES: ResourceSpec[] = [
       location: DatabaseLocation.Aws,
       engine: DatabaseEngine.AuroraPostgres,
     },
-    name: 'Aurora PostgreSQL',
-    keywords: awsKeywords + 'aurora postgresql',
+    name: 'RDS Aurora PostgreSQL',
+    keywords: awsKeywords + 'rds aurora postgresql',
     kind: ResourceKind.Database,
     icon: 'aws',
     event: DiscoverEventResource.DatabasePostgresRds,
@@ -412,8 +412,8 @@ export const DATABASES: ResourceSpec[] = [
       location: DatabaseLocation.Aws,
       engine: DatabaseEngine.AuroraMysql,
     },
-    name: 'Aurora MySQL/MariaDB',
-    keywords: awsKeywords + 'aurora mysql mariadb',
+    name: 'RDS Aurora MySQL',
+    keywords: awsKeywords + 'rds aurora mysql',
     kind: ResourceKind.Database,
     icon: 'aws',
     event: DiscoverEventResource.DatabaseMysqlRds,