diff --git a/debian_iso_image.inc b/debian_iso_image.inc
index 9afdf33a..6e67650d 100644
--- a/debian_iso_image.inc
+++ b/debian_iso_image.inc
@@ -13,59 +13,23 @@ keystone-doc
 keystone
 python3-keystone
 
-#openstack-ras
-openstack-resource-agents
-
-#python-aodhclient
-python-aodhclient-doc
-python3-aodhclient
-
 #python-barbicanclient
 python3-barbicanclient
 
-#python-cinderclient
-python3-cinderclient
-
-#python-glanceclient
-python-glanceclient-doc
-python3-glanceclient
-
-#python-gnocchiclient
-python-gnocchiclient-doc
-python3-gnocchiclient
-
-#python-heatclient
-python3-heatclient
-
 #python-horizon
 horizon-doc
 openstack-dashboard-apache
 openstack-dashboard
 python3-django-horizon
 
-#python-ironicclient
-python-ironicclient-doc
-python3-ironicclient
-
 #python-keystoneclient
 python-keystoneclient-doc
 python3-keystoneclient
 
-#python-neutronclient
-python3-neutronclient
-
-#python-novaclient
-python-novaclient-doc
-python3-novaclient
-
 #python-openstackclient
 python-openstackclient-doc
 python3-openstackclient
 
-#python-openstacksdk
-python-openstacksdk-doc
-python3-openstacksdk
-
 #python-osc-lib
 python-osc-lib-doc
 python3-osc-lib
@@ -79,6 +43,3 @@ python3-pankoclient
 
 #python-wsme
 python3-wsme
-
-#rabbitmq-server
-rabbitmq-server
diff --git a/debian_pkg_dirs b/debian_pkg_dirs
index df3926dd..388da021 100644
--- a/debian_pkg_dirs
+++ b/debian_pkg_dirs
@@ -2,19 +2,10 @@ openstack/barbican
 openstack/keystone
 openstack/openstack-pkg-tools
 openstack/openstack-ras
-openstack/python-aodhclient
 openstack/python-barbicanclient
-openstack/python-cinderclient
-openstack/python-glanceclient
-openstack/python-gnocchiclient
-openstack/python-heatclient
 openstack/python-horizon
-openstack/python-ironicclient
 openstack/python-keystoneclient
-openstack/python-neutronclient
-openstack/python-novaclient
 openstack/python-openstackclient
-openstack/python-openstacksdk
 openstack/python-osc-lib
 openstack/python-oslo-messaging
 openstack/python-pankoclient
diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc
index b20fbf1d..bfbc922e 100644
--- a/debian_stable_docker_images.inc
+++ b/debian_stable_docker_images.inc
@@ -1,15 +1 @@
-openstack/openstack-aodh
-openstack/openstack-ironic
-openstack/python-barbican
-openstack/python-ceilometer
-openstack/python-cinder
-openstack/python-glance
-openstack/python-gnocchi
-openstack/python-heat/openstack-heat
-openstack/python-horizon
-openstack/python-keystone
-openstack/python-neutron
-openstack/python-nova
-openstack/python-openstackclient
-openstack/python-placement
 openstack/python-platformclients