diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1662f74..703909f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,96 +1,6 @@
 Maintainers: Tully Foote <tfoote+buildfarm@osrfoundation.org> (@tfoote)
 GitRepo: https://github.com/osrf/docker_images.git
 
-Tags: ardent-ros-base, ardent-ros-base-xenial, ardent
-Architectures: amd64, arm64v8
-GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117
-Directory: ros/ardent/ubuntu/xenial/ros-base
-
-Tags: ardent-ros-core, ardent-ros-core-xenial
-Architectures: amd64, arm64v8
-GitCommit: 51ba1c72c513b62e8825c3df015ca4d926ac688c
-Directory: ros/ardent/ubuntu/xenial/ros-core
-
-Tags: bouncy-ros-base, bouncy-ros-base-bionic, bouncy
-Architectures: amd64, arm64v8
-GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117
-Directory: ros/bouncy/ubuntu/bionic/ros-base
-
-Tags: bouncy-ros-core, bouncy-ros-core-bionic
-Architectures: amd64, arm64v8
-GitCommit: 51ba1c72c513b62e8825c3df015ca4d926ac688c
-Directory: ros/bouncy/ubuntu/bionic/ros-core
-
-Tags: crystal-ros-base, crystal-ros-base-bionic, crystal
-Architectures: amd64, arm64v8
-GitCommit: 9619e8b2fedc763707c07bd5568f2401bfc5b117
-Directory: ros/crystal/ubuntu/bionic/ros-base
-
-Tags: crystal-ros-core, crystal-ros-core-bionic
-Architectures: amd64, arm64v8
-GitCommit: 51ba1c72c513b62e8825c3df015ca4d926ac688c
-Directory: ros/crystal/ubuntu/bionic/ros-core
-
-Tags: dashing-ros1-bridge, dashing-ros1-bridge-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 87074e54828d12dacf84f15273e95e03eeb17d24
-Directory: ros/dashing/ubuntu/bionic/ros1-bridge
-
-Tags: dashing-ros-base, dashing-ros-base-bionic, dashing
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/dashing/ubuntu/bionic/ros-base
-
-Tags: dashing-ros-core, dashing-ros-core-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
-Directory: ros/dashing/ubuntu/bionic/ros-core
-
-Tags: eloquent-ros1-bridge, eloquent-ros1-bridge-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 3b5cbe2c25b25fa2b5acc9770f5f0b71143f864d
-Directory: ros/eloquent/ubuntu/bionic/ros1-bridge
-
-Tags: eloquent-ros-base, eloquent-ros-base-bionic, eloquent
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: b3e79c3aef3687b56b3c1052ae38aa7010234834
-Directory: ros/eloquent/ubuntu/bionic/ros-base
-
-Tags: eloquent-ros-core, eloquent-ros-core-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 3b5cbe2c25b25fa2b5acc9770f5f0b71143f864d
-Directory: ros/eloquent/ubuntu/bionic/ros-core
-
-Tags: foxy-ros1-bridge, foxy-ros1-bridge-focal
-Architectures: amd64, arm64v8
-GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
-Directory: ros/foxy/ubuntu/focal/ros1-bridge
-
-Tags: foxy-ros-base, foxy-ros-base-focal, foxy
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/foxy/ubuntu/focal/ros-base
-
-Tags: foxy-ros-core, foxy-ros-core-focal
-Architectures: amd64, arm64v8
-GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
-Directory: ros/foxy/ubuntu/focal/ros-core
-
-Tags: galactic-ros1-bridge, galactic-ros1-bridge-focal
-Architectures: amd64, arm64v8
-GitCommit: 87074e54828d12dacf84f15273e95e03eeb17d24
-Directory: ros/galactic/ubuntu/focal/ros1-bridge
-
-Tags: galactic-ros-base, galactic-ros-base-focal, galactic
-Architectures: amd64, arm64v8
-GitCommit: 6511d8fc0754616550b7f5ea31a40084c2462938
-Directory: ros/galactic/ubuntu/focal/ros-base
-
-Tags: galactic-ros-core, galactic-ros-core-focal
-Architectures: amd64, arm64v8
-GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
-Directory: ros/galactic/ubuntu/focal/ros-core
-
 Tags: humble-perception, humble-perception-jammy
 Architectures: amd64, arm64v8
 GitCommit: 20d40c96b426b8956dec203e236abff2ec29b188
@@ -106,26 +16,6 @@ Architectures: amd64, arm64v8
 GitCommit: 87074e54828d12dacf84f15273e95e03eeb17d24
 Directory: ros/humble/ubuntu/jammy/ros-core
 
-Tags: indigo-perception, indigo-perception-trusty
-Architectures: amd64, arm32v7
-GitCommit: 20061b005b245d1b7e23626afd0ea2c39de9db49
-Directory: ros/indigo/ubuntu/trusty/perception
-
-Tags: indigo-robot, indigo-robot-trusty
-Architectures: amd64, arm32v7
-GitCommit: 20061b005b245d1b7e23626afd0ea2c39de9db49
-Directory: ros/indigo/ubuntu/trusty/robot
-
-Tags: indigo-ros-base, indigo-ros-base-trusty, indigo
-Architectures: amd64, arm32v7
-GitCommit: 20061b005b245d1b7e23626afd0ea2c39de9db49
-Directory: ros/indigo/ubuntu/trusty/ros-base
-
-Tags: indigo-ros-core, indigo-ros-core-trusty
-Architectures: amd64, arm32v7
-GitCommit: 51ba1c72c513b62e8825c3df015ca4d926ac688c
-Directory: ros/indigo/ubuntu/trusty/ros-core
-
 Tags: iron-perception, iron-perception-jammy
 Architectures: amd64, arm64v8
 GitCommit: bca53bf4c09d771be3ff735da4157203b53ebc2b
@@ -141,142 +31,26 @@ Architectures: amd64, arm64v8
 GitCommit: 87074e54828d12dacf84f15273e95e03eeb17d24
 Directory: ros/iron/ubuntu/jammy/ros-core
 
-Tags: jade-perception, jade-perception-trusty
-Architectures: amd64, arm32v7
-GitCommit: dbda2abfbee89ebab4b33bdb1cfaec6dc36a3822
-Directory: ros/jade/ubuntu/trusty/perception
-
-Tags: jade-robot, jade-robot-trusty
-Architectures: amd64, arm32v7
-GitCommit: dbda2abfbee89ebab4b33bdb1cfaec6dc36a3822
-Directory: ros/jade/ubuntu/trusty/robot
-
-Tags: jade-ros-base, jade-ros-base-trusty, jade
-Architectures: amd64, arm32v7
-GitCommit: dbda2abfbee89ebab4b33bdb1cfaec6dc36a3822
-Directory: ros/jade/ubuntu/trusty/ros-base
-
-Tags: jade-ros-core, jade-ros-core-trusty
-Architectures: amd64, arm32v7
-GitCommit: 51ba1c72c513b62e8825c3df015ca4d926ac688c
-Directory: ros/jade/ubuntu/trusty/ros-core
-
-Tags: kinetic-perception, kinetic-perception-xenial
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/kinetic/ubuntu/xenial/perception
-
-Tags: kinetic-robot, kinetic-robot-xenial
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/kinetic/ubuntu/xenial/robot
-
-Tags: kinetic-ros-base, kinetic-ros-base-xenial, kinetic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/kinetic/ubuntu/xenial/ros-base
-
-Tags: kinetic-ros-core, kinetic-ros-core-xenial
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
-Directory: ros/kinetic/ubuntu/xenial/ros-core
-
-Tags: lunar-perception, lunar-perception-xenial
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: d81c0004d43383a6cd0f7b5a9b3020300f3cb1ca
-Directory: ros/lunar/ubuntu/xenial/perception
-
-Tags: lunar-perception-zesty
-GitCommit: 4cfa1c7fd7e4f6ec638d1615f12133edbc100731
-Directory: ros/lunar/ubuntu/zesty/perception
-
-Tags: lunar-robot, lunar-robot-xenial
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: d81c0004d43383a6cd0f7b5a9b3020300f3cb1ca
-Directory: ros/lunar/ubuntu/xenial/robot
-
-Tags: lunar-robot-zesty
-GitCommit: 4cfa1c7fd7e4f6ec638d1615f12133edbc100731
-Directory: ros/lunar/ubuntu/zesty/robot
-
-Tags: lunar-ros-base, lunar-ros-base-xenial, lunar
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: d81c0004d43383a6cd0f7b5a9b3020300f3cb1ca
-Directory: ros/lunar/ubuntu/xenial/ros-base
-
-Tags: lunar-ros-base-zesty
-GitCommit: 4cfa1c7fd7e4f6ec638d1615f12133edbc100731
-Directory: ros/lunar/ubuntu/zesty/ros-base
-
-Tags: lunar-ros-core, lunar-ros-core-xenial
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 51ba1c72c513b62e8825c3df015ca4d926ac688c
-Directory: ros/lunar/ubuntu/xenial/ros-core
-
-Tags: lunar-ros-core-zesty
-GitCommit: 51ba1c72c513b62e8825c3df015ca4d926ac688c
-Directory: ros/lunar/ubuntu/zesty/ros-core
-
-Tags: melodic-perception, melodic-perception-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/melodic/ubuntu/bionic/perception
-
-Tags: melodic-robot, melodic-robot-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/melodic/ubuntu/bionic/robot
-
-Tags: melodic-ros-base, melodic-ros-base-bionic, melodic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/melodic/ubuntu/bionic/ros-base
-
-Tags: melodic-ros-core, melodic-ros-core-bionic
-Architectures: amd64, arm32v7, arm64v8
-GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
-Directory: ros/melodic/ubuntu/bionic/ros-core
-
 Tags: noetic-perception, noetic-perception-focal
 Architectures: amd64, arm32v7, arm64v8
 GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
 Directory: ros/noetic/ubuntu/focal/perception
 
-Tags: noetic-perception-buster
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/noetic/debian/buster/perception
-
 Tags: noetic-robot, noetic-robot-focal
 Architectures: amd64, arm32v7, arm64v8
 GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
 Directory: ros/noetic/ubuntu/focal/robot
 
-Tags: noetic-robot-buster
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/noetic/debian/buster/robot
-
 Tags: noetic-ros-base, noetic-ros-base-focal, noetic
 Architectures: amd64, arm32v7, arm64v8
 GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
 Directory: ros/noetic/ubuntu/focal/ros-base
 
-Tags: noetic-ros-base-buster
-Architectures: amd64, arm64v8
-GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35
-Directory: ros/noetic/debian/buster/ros-base
-
 Tags: noetic-ros-core, noetic-ros-core-focal
 Architectures: amd64, arm32v7, arm64v8
 GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
 Directory: ros/noetic/ubuntu/focal/ros-core
 
-Tags: noetic-ros-core-buster
-Architectures: amd64, arm64v8
-GitCommit: 9ab23751d41735b448da8cfa1580958279ae5101
-Directory: ros/noetic/debian/buster/ros-core
-
 Tags: rolling-perception, rolling-perception-jammy
 Architectures: amd64, arm64v8
 GitCommit: 73c1bf4c30e97d5d3d7c2aaddc8137cae2411409
diff --git a/_bashbrew-list b/_bashbrew-list
index 48d0eaf..0cd63db 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,46 +1,3 @@
-ros:ardent
-ros:ardent-ros-base
-ros:ardent-ros-base-xenial
-ros:ardent-ros-core
-ros:ardent-ros-core-xenial
-ros:bouncy
-ros:bouncy-ros-base
-ros:bouncy-ros-base-bionic
-ros:bouncy-ros-core
-ros:bouncy-ros-core-bionic
-ros:crystal
-ros:crystal-ros-base
-ros:crystal-ros-base-bionic
-ros:crystal-ros-core
-ros:crystal-ros-core-bionic
-ros:dashing
-ros:dashing-ros1-bridge
-ros:dashing-ros1-bridge-bionic
-ros:dashing-ros-base
-ros:dashing-ros-base-bionic
-ros:dashing-ros-core
-ros:dashing-ros-core-bionic
-ros:eloquent
-ros:eloquent-ros1-bridge
-ros:eloquent-ros1-bridge-bionic
-ros:eloquent-ros-base
-ros:eloquent-ros-base-bionic
-ros:eloquent-ros-core
-ros:eloquent-ros-core-bionic
-ros:foxy
-ros:foxy-ros1-bridge
-ros:foxy-ros1-bridge-focal
-ros:foxy-ros-base
-ros:foxy-ros-base-focal
-ros:foxy-ros-core
-ros:foxy-ros-core-focal
-ros:galactic
-ros:galactic-ros1-bridge
-ros:galactic-ros1-bridge-focal
-ros:galactic-ros-base
-ros:galactic-ros-base-focal
-ros:galactic-ros-core
-ros:galactic-ros-core-focal
 ros:humble
 ros:humble-perception
 ros:humble-perception-jammy
@@ -48,15 +5,6 @@ ros:humble-ros-base
 ros:humble-ros-base-jammy
 ros:humble-ros-core
 ros:humble-ros-core-jammy
-ros:indigo
-ros:indigo-perception
-ros:indigo-perception-trusty
-ros:indigo-robot
-ros:indigo-robot-trusty
-ros:indigo-ros-base
-ros:indigo-ros-base-trusty
-ros:indigo-ros-core
-ros:indigo-ros-core-trusty
 ros:iron
 ros:iron-perception
 ros:iron-perception-jammy
@@ -64,59 +12,15 @@ ros:iron-ros-base
 ros:iron-ros-base-jammy
 ros:iron-ros-core
 ros:iron-ros-core-jammy
-ros:jade
-ros:jade-perception
-ros:jade-perception-trusty
-ros:jade-robot
-ros:jade-robot-trusty
-ros:jade-ros-base
-ros:jade-ros-base-trusty
-ros:jade-ros-core
-ros:jade-ros-core-trusty
-ros:kinetic
-ros:kinetic-perception
-ros:kinetic-perception-xenial
-ros:kinetic-robot
-ros:kinetic-robot-xenial
-ros:kinetic-ros-base
-ros:kinetic-ros-base-xenial
-ros:kinetic-ros-core
-ros:kinetic-ros-core-xenial
 ros:latest
-ros:lunar
-ros:lunar-perception
-ros:lunar-perception-xenial
-ros:lunar-perception-zesty
-ros:lunar-robot
-ros:lunar-robot-xenial
-ros:lunar-robot-zesty
-ros:lunar-ros-base
-ros:lunar-ros-base-xenial
-ros:lunar-ros-base-zesty
-ros:lunar-ros-core
-ros:lunar-ros-core-xenial
-ros:lunar-ros-core-zesty
-ros:melodic
-ros:melodic-perception
-ros:melodic-perception-bionic
-ros:melodic-robot
-ros:melodic-robot-bionic
-ros:melodic-ros-base
-ros:melodic-ros-base-bionic
-ros:melodic-ros-core
-ros:melodic-ros-core-bionic
 ros:noetic
 ros:noetic-perception
-ros:noetic-perception-buster
 ros:noetic-perception-focal
 ros:noetic-robot
-ros:noetic-robot-buster
 ros:noetic-robot-focal
 ros:noetic-ros-base
-ros:noetic-ros-base-buster
 ros:noetic-ros-base-focal
 ros:noetic-ros-core
-ros:noetic-ros-core-buster
 ros:noetic-ros-core-focal
 ros:rolling
 ros:rolling-perception
diff --git a/ros_ardent-ros-core-xenial/Dockerfile b/ros_ardent-ros-core-xenial/Dockerfile
deleted file mode 100644
index 3910c34..0000000
diff --git a/ros_ardent-ros-core-xenial/ros_entrypoint.sh b/ros_ardent-ros-core-xenial/ros_entrypoint.sh
deleted file mode 100755
index 80f3ce3..0000000
diff --git a/ros_ardent/Dockerfile b/ros_ardent/Dockerfile
deleted file mode 100644
index be76aba..0000000
diff --git a/ros_bouncy-ros-core-bionic/Dockerfile b/ros_bouncy-ros-core-bionic/Dockerfile
deleted file mode 100644
index 5154ed6..0000000
diff --git a/ros_bouncy-ros-core-bionic/ros_entrypoint.sh b/ros_bouncy-ros-core-bionic/ros_entrypoint.sh
deleted file mode 100755
index 80f3ce3..0000000
diff --git a/ros_bouncy/Dockerfile b/ros_bouncy/Dockerfile
deleted file mode 100644
index d1b945f..0000000
diff --git a/ros_crystal-ros-core-bionic/Dockerfile b/ros_crystal-ros-core-bionic/Dockerfile
deleted file mode 100644
index cd87f4f..0000000
diff --git a/ros_crystal-ros-core-bionic/ros_entrypoint.sh b/ros_crystal-ros-core-bionic/ros_entrypoint.sh
deleted file mode 100755
index 80f3ce3..0000000
diff --git a/ros_crystal/Dockerfile b/ros_crystal/Dockerfile
deleted file mode 100644
index 84a4db5..0000000
diff --git a/ros_dashing-ros-core-bionic/Dockerfile b/ros_dashing-ros-core-bionic/Dockerfile
deleted file mode 100644
index 14b1ace..0000000
diff --git a/ros_dashing-ros-core-bionic/ros_entrypoint.sh b/ros_dashing-ros-core-bionic/ros_entrypoint.sh
deleted file mode 100755
index 80f3ce3..0000000
diff --git a/ros_dashing-ros1-bridge-bionic/Dockerfile b/ros_dashing-ros1-bridge-bionic/Dockerfile
deleted file mode 100644
index 091674f..0000000
diff --git a/ros_dashing-ros1-bridge-bionic/ros_entrypoint.sh b/ros_dashing-ros1-bridge-bionic/ros_entrypoint.sh
deleted file mode 100755
index 662a9e7..0000000
diff --git a/ros_dashing/Dockerfile b/ros_dashing/Dockerfile
deleted file mode 100644
index 54d49c5..0000000
diff --git a/ros_eloquent-ros-core-bionic/Dockerfile b/ros_eloquent-ros-core-bionic/Dockerfile
deleted file mode 100644
index acc11fc..0000000
diff --git a/ros_eloquent-ros-core-bionic/ros_entrypoint.sh b/ros_eloquent-ros-core-bionic/ros_entrypoint.sh
deleted file mode 100755
index 80f3ce3..0000000
diff --git a/ros_eloquent-ros1-bridge-bionic/Dockerfile b/ros_eloquent-ros1-bridge-bionic/Dockerfile
deleted file mode 100644
index 53e75d3..0000000
diff --git a/ros_eloquent-ros1-bridge-bionic/ros_entrypoint.sh b/ros_eloquent-ros1-bridge-bionic/ros_entrypoint.sh
deleted file mode 100755
index 662a9e7..0000000
diff --git a/ros_eloquent/Dockerfile b/ros_eloquent/Dockerfile
deleted file mode 100644
index 6b4958b..0000000
diff --git a/ros_foxy-ros-core-focal/Dockerfile b/ros_foxy-ros-core-focal/Dockerfile
deleted file mode 100644
index 1af2cfc..0000000
diff --git a/ros_foxy-ros-core-focal/ros_entrypoint.sh b/ros_foxy-ros-core-focal/ros_entrypoint.sh
deleted file mode 100755
index 28bc65a..0000000
diff --git a/ros_foxy-ros1-bridge-focal/Dockerfile b/ros_foxy-ros1-bridge-focal/Dockerfile
deleted file mode 100644
index e4c2f83..0000000
diff --git a/ros_foxy-ros1-bridge-focal/ros_entrypoint.sh b/ros_foxy-ros1-bridge-focal/ros_entrypoint.sh
deleted file mode 100755
index 9251c81..0000000
diff --git a/ros_foxy/Dockerfile b/ros_foxy/Dockerfile
deleted file mode 100644
index 1dee5eb..0000000
diff --git a/ros_galactic-ros-core-focal/Dockerfile b/ros_galactic-ros-core-focal/Dockerfile
deleted file mode 100644
index fd507ad..0000000
diff --git a/ros_galactic-ros-core-focal/ros_entrypoint.sh b/ros_galactic-ros-core-focal/ros_entrypoint.sh
deleted file mode 100755
index 28bc65a..0000000
diff --git a/ros_galactic-ros1-bridge-focal/Dockerfile b/ros_galactic-ros1-bridge-focal/Dockerfile
deleted file mode 100644
index 80b5290..0000000
diff --git a/ros_galactic-ros1-bridge-focal/ros_entrypoint.sh b/ros_galactic-ros1-bridge-focal/ros_entrypoint.sh
deleted file mode 100755
index 9251c81..0000000
diff --git a/ros_galactic/Dockerfile b/ros_galactic/Dockerfile
deleted file mode 100644
index dc6ec3c..0000000
diff --git a/ros_indigo-perception-trusty/Dockerfile b/ros_indigo-perception-trusty/Dockerfile
deleted file mode 100644
index ce356ff..0000000
diff --git a/ros_indigo-robot-trusty/Dockerfile b/ros_indigo-robot-trusty/Dockerfile
deleted file mode 100644
index a1c59ed..0000000
diff --git a/ros_indigo-ros-core-trusty/Dockerfile b/ros_indigo-ros-core-trusty/Dockerfile
deleted file mode 100644
index afaf098..0000000
diff --git a/ros_indigo-ros-core-trusty/ros_entrypoint.sh b/ros_indigo-ros-core-trusty/ros_entrypoint.sh
deleted file mode 100755
index f481977..0000000
diff --git a/ros_indigo/Dockerfile b/ros_indigo/Dockerfile
deleted file mode 100644
index b1fb646..0000000
diff --git a/ros_jade-perception-trusty/Dockerfile b/ros_jade-perception-trusty/Dockerfile
deleted file mode 100644
index f3081f4..0000000
diff --git a/ros_jade-robot-trusty/Dockerfile b/ros_jade-robot-trusty/Dockerfile
deleted file mode 100644
index 88435bf..0000000
diff --git a/ros_jade-ros-core-trusty/Dockerfile b/ros_jade-ros-core-trusty/Dockerfile
deleted file mode 100644
index 643e6b3..0000000
diff --git a/ros_jade-ros-core-trusty/ros_entrypoint.sh b/ros_jade-ros-core-trusty/ros_entrypoint.sh
deleted file mode 100755
index f481977..0000000
diff --git a/ros_jade/Dockerfile b/ros_jade/Dockerfile
deleted file mode 100644
index eb7d74a..0000000
diff --git a/ros_kinetic-perception-xenial/Dockerfile b/ros_kinetic-perception-xenial/Dockerfile
deleted file mode 100644
index 9508d49..0000000
diff --git a/ros_kinetic-robot-xenial/Dockerfile b/ros_kinetic-robot-xenial/Dockerfile
deleted file mode 100644
index c25faef..0000000
diff --git a/ros_kinetic-ros-core-xenial/Dockerfile b/ros_kinetic-ros-core-xenial/Dockerfile
deleted file mode 100644
index bdb5a0c..0000000
diff --git a/ros_kinetic-ros-core-xenial/ros_entrypoint.sh b/ros_kinetic-ros-core-xenial/ros_entrypoint.sh
deleted file mode 100755
index f481977..0000000
diff --git a/ros_kinetic/Dockerfile b/ros_kinetic/Dockerfile
deleted file mode 100644
index 4836712..0000000
diff --git a/ros_lunar-perception-xenial/Dockerfile b/ros_lunar-perception-xenial/Dockerfile
deleted file mode 100644
index 9f5ee53..0000000
diff --git a/ros_lunar-perception-zesty/Dockerfile b/ros_lunar-perception-zesty/Dockerfile
deleted file mode 100644
index 2c963cf..0000000
diff --git a/ros_lunar-robot-xenial/Dockerfile b/ros_lunar-robot-xenial/Dockerfile
deleted file mode 100644
index 7c72a0e..0000000
diff --git a/ros_lunar-robot-zesty/Dockerfile b/ros_lunar-robot-zesty/Dockerfile
deleted file mode 100644
index 119a419..0000000
diff --git a/ros_lunar-ros-base-zesty/Dockerfile b/ros_lunar-ros-base-zesty/Dockerfile
deleted file mode 100644
index a987a3f..0000000
diff --git a/ros_lunar-ros-core-xenial/Dockerfile b/ros_lunar-ros-core-xenial/Dockerfile
deleted file mode 100644
index 147ff4b..0000000
diff --git a/ros_lunar-ros-core-xenial/ros_entrypoint.sh b/ros_lunar-ros-core-xenial/ros_entrypoint.sh
deleted file mode 100755
index f481977..0000000
diff --git a/ros_lunar-ros-core-zesty/Dockerfile b/ros_lunar-ros-core-zesty/Dockerfile
deleted file mode 100644
index dd6b3f5..0000000
diff --git a/ros_lunar-ros-core-zesty/ros_entrypoint.sh b/ros_lunar-ros-core-zesty/ros_entrypoint.sh
deleted file mode 100755
index f481977..0000000
diff --git a/ros_lunar/Dockerfile b/ros_lunar/Dockerfile
deleted file mode 100644
index 6d904ac..0000000
diff --git a/ros_melodic-perception-bionic/Dockerfile b/ros_melodic-perception-bionic/Dockerfile
deleted file mode 100644
index 5fc0a66..0000000
diff --git a/ros_melodic-robot-bionic/Dockerfile b/ros_melodic-robot-bionic/Dockerfile
deleted file mode 100644
index 273b7db..0000000
diff --git a/ros_melodic-ros-core-bionic/Dockerfile b/ros_melodic-ros-core-bionic/Dockerfile
deleted file mode 100644
index 89688d7..0000000
diff --git a/ros_melodic-ros-core-bionic/ros_entrypoint.sh b/ros_melodic-ros-core-bionic/ros_entrypoint.sh
deleted file mode 100755
index 6339274..0000000
diff --git a/ros_melodic/Dockerfile b/ros_melodic/Dockerfile
deleted file mode 100644
index e8a911e..0000000
diff --git a/ros_noetic-perception-buster/Dockerfile b/ros_noetic-perception-buster/Dockerfile
deleted file mode 100644
index 1a32080..0000000
diff --git a/ros_noetic-robot-buster/Dockerfile b/ros_noetic-robot-buster/Dockerfile
deleted file mode 100644
index af6f24b..0000000
diff --git a/ros_noetic-ros-base-buster/Dockerfile b/ros_noetic-ros-base-buster/Dockerfile
deleted file mode 100644
index badb3df..0000000
diff --git a/ros_noetic-ros-core-buster/Dockerfile b/ros_noetic-ros-core-buster/Dockerfile
deleted file mode 100644
index c9f6c1f..0000000
diff --git a/ros_noetic-ros-core-buster/ros_entrypoint.sh b/ros_noetic-ros-core-buster/ros_entrypoint.sh
deleted file mode 100755
index 6339274..0000000