diff --git a/.github/workflows/ros_ci.yaml b/.github/workflows/ros_ci.yaml
index 9c2cb11e0..88727d71c 100644
--- a/.github/workflows/ros_ci.yaml
+++ b/.github/workflows/ros_ci.yaml
@@ -7,19 +7,17 @@ on:
     - '.ci/**'
     - '.github/workflows/ros_ci.yaml'
     - 'ros/rolling/**'
-    - 'ros/jazzy/**'
     - 'ros/kilted/**'
+    - 'ros/jazzy/**'
     - 'ros/humble/**'
-    - 'ros/noetic/**'
   push:
     paths:
     - '.ci/**'
     - '.github/workflows/ros_ci.yaml'
     - 'ros/rolling/**'
-    - 'ros/jazzy/**'
     - 'ros/kilted/**'
+    - 'ros/jazzy/**'
     - 'ros/humble/**'
-    - 'ros/noetic/**'
   schedule:
     # Trigger daily to check for upstream changes
     - cron: '0 0 * * *'
@@ -33,7 +31,6 @@ jobs:
           - {HUB_REPO: ros, HUB_RELEASE: kilted, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
           - {HUB_REPO: ros, HUB_RELEASE: jazzy, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
           - {HUB_REPO: ros, HUB_RELEASE: humble, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: jammy}
-          - {HUB_REPO: ros, HUB_RELEASE: noetic, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: focal}
     runs-on: ubuntu-latest
     env:
       GITHUBEMAIL: ${{ secrets.GITHUBEMAIL }}
diff --git a/ros/manifest.yaml b/ros/manifest.yaml
index 4b8192866..a2e6acc3b 100644
--- a/ros/manifest.yaml
+++ b/ros/manifest.yaml
@@ -339,24 +339,24 @@ release_names:
                             - arm32v7
                             - arm64v8
                         tag_names:
-                            # TEMPORARY until snapshots.ros.org issues are resolved
-                            ros-core:
-                                aliases:
-                                    - "$release_name-ros-core"
-                                    - "$release_name-ros-core-$os_code_name"
-                            ros-base:
-                                aliases:
-                                    - "$release_name-ros-base"
-                                    - "$release_name-ros-base-$os_code_name"
-                                    - "$release_name"
-                            robot:
-                                aliases:
-                                    - "$release_name-robot"
-                                    - "$release_name-robot-$os_code_name"
-                            perception:
-                                aliases:
-                                    - "$release_name-perception"
-                                    - "$release_name-perception-$os_code_name"
+                            # EOL
+                            # ros-core:
+                            #     aliases:
+                            #         - "$release_name-ros-core"
+                            #         - "$release_name-ros-core-$os_code_name"
+                            # ros-base:
+                            #     aliases:
+                            #         - "$release_name-ros-base"
+                            #         - "$release_name-ros-base-$os_code_name"
+                            #         - "$release_name"
+                            # robot:
+                            #     aliases:
+                            #         - "$release_name-robot"
+                            #         - "$release_name-robot-$os_code_name"
+                            # perception:
+                            #     aliases:
+                            #         - "$release_name-perception"
+                            #         - "$release_name-perception-$os_code_name"
             debian:
                 os_code_names:
                     buster:
@@ -511,19 +511,19 @@ release_names:
                             - arm64v8
                         tag_names:
                             # EOL
-                            ros-core:
-                                aliases:
-                                    - "$release_name-ros-core"
-                                    - "$release_name-ros-core-$os_code_name"
-                            ros-base:
-                                aliases:
-                                    - "$release_name-ros-base"
-                                    - "$release_name-ros-base-$os_code_name"
-                                    - "$release_name"
-                            ros1-bridge:
-                                aliases:
-                                    - "$release_name-ros1-bridge"
-                                    - "$release_name-ros1-bridge-$os_code_name"
+                            # ros-core:
+                            #     aliases:
+                            #         - "$release_name-ros-core"
+                            #         - "$release_name-ros-core-$os_code_name"
+                            # ros-base:
+                            #     aliases:
+                            #         - "$release_name-ros-base"
+                            #         - "$release_name-ros-base-$os_code_name"
+                            #         - "$release_name"
+                            # ros1-bridge:
+                            #     aliases:
+                            #         - "$release_name-ros1-bridge"
+                            #         - "$release_name-ros1-bridge-$os_code_name"
     galactic:
         eol: 2022-11
         os_names:
@@ -537,19 +537,19 @@ release_names:
                             - arm64v8
                         tag_names:
                             # EOL
-                            ros-core:
-                                aliases:
-                                    - "$release_name-ros-core"
-                                    - "$release_name-ros-core-$os_code_name"
-                            ros-base:
-                                aliases:
-                                    - "$release_name-ros-base"
-                                    - "$release_name-ros-base-$os_code_name"
-                                    - "$release_name"
-                            ros1-bridge:
-                                aliases:
-                                    - "$release_name-ros1-bridge"
-                                    - "$release_name-ros1-bridge-$os_code_name"
+                            # ros-core:
+                            #     aliases:
+                            #         - "$release_name-ros-core"
+                            #         - "$release_name-ros-core-$os_code_name"
+                            # ros-base:
+                            #     aliases:
+                            #         - "$release_name-ros-base"
+                            #         - "$release_name-ros-base-$os_code_name"
+                            #         - "$release_name"
+                            # ros1-bridge:
+                            #     aliases:
+                            #         - "$release_name-ros1-bridge"
+                            #         - "$release_name-ros1-bridge-$os_code_name"
     humble:
         eol: 2025-05
         os_names:
diff --git a/ros/ros b/ros/ros
index 19c98aaa1..d82c0c2f1 100644
--- a/ros/ros
+++ b/ros/ros
@@ -1,77 +1,6 @@
 Maintainers: Tully Foote <tfoote+buildfarm@osrfoundation.org> (@tfoote)
 GitRepo: https://github.com/osrf/docker_images.git
 
-################################################################################
-# Release: noetic
-
-########################################
-# Distro: ubuntu:focal
-
-Tags: noetic-ros-core, noetic-ros-core-focal
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: f1d91dccd2aa75a52d7beffd93196455043e695c
-Directory: ros/noetic/ubuntu/focal/ros-core
-
-Tags: noetic-ros-base, noetic-ros-base-focal, noetic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/noetic/ubuntu/focal/ros-base
-
-Tags: noetic-robot, noetic-robot-focal
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/noetic/ubuntu/focal/robot
-
-Tags: noetic-perception, noetic-perception-focal
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/noetic/ubuntu/focal/perception
-
-
-################################################################################
-# Release: foxy
-
-########################################
-# Distro: ubuntu:focal
-
-Tags: foxy-ros-core, foxy-ros-core-focal
-Architectures: amd64, arm64v8
-GitCommit: f1d91dccd2aa75a52d7beffd93196455043e695c
-Directory: ros/foxy/ubuntu/focal/ros-core
-
-Tags: foxy-ros-base, foxy-ros-base-focal, foxy
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/foxy/ubuntu/focal/ros-base
-
-Tags: foxy-ros1-bridge, foxy-ros1-bridge-focal
-Architectures: amd64, arm64v8
-GitCommit: 40cfb45357e267ea9aeb714e9b556ae77c859e76
-Directory: ros/foxy/ubuntu/focal/ros1-bridge
-
-
-################################################################################
-# Release: galactic
-
-########################################
-# Distro: ubuntu:focal
-
-Tags: galactic-ros-core, galactic-ros-core-focal
-Architectures: amd64, arm64v8
-GitCommit: f1d91dccd2aa75a52d7beffd93196455043e695c
-Directory: ros/galactic/ubuntu/focal/ros-core
-
-Tags: galactic-ros-base, galactic-ros-base-focal, galactic
-Architectures: amd64, arm64v8
-GitCommit: 6511d8fc0754616550b7f5ea31a40084c2462938
-Directory: ros/galactic/ubuntu/focal/ros-base
-
-Tags: galactic-ros1-bridge, galactic-ros1-bridge-focal
-Architectures: amd64, arm64v8
-GitCommit: 40cfb45357e267ea9aeb714e9b556ae77c859e76
-Directory: ros/galactic/ubuntu/focal/ros1-bridge
-
-
 ################################################################################
 # Release: humble