diff --git a/debian_build_layer.cfg b/debian_build_layer.cfg
index c581999f..91705c06 100644
--- a/debian_build_layer.cfg
+++ b/debian_build_layer.cfg
@@ -1 +1 @@
-flock
+openstack
diff --git a/debian_pkg_dirs b/debian_pkg_dirs
index 27da060e..838c12f8 100644
--- a/debian_pkg_dirs
+++ b/debian_pkg_dirs
@@ -2,15 +2,15 @@ openstack-helm
 openstack-helm-infra
 python3-k8sapp-openstack
 stx-openstack-helm-fluxcd
-#upstream/openstack/openstack-pkg-tools
-#upstream/openstack/python-aodhclient
-#upstream/openstack/python-barbicanclient
-#upstream/openstack/python-cinderclient
-#upstream/openstack/python-glanceclient
-#upstream/openstack/python-heatclient
-#upstream/openstack/python-ironicclient
-#upstream/openstack/python-keystoneclient
-#upstream/openstack/python-neutronclient
-#upstream/openstack/python-novaclient
-#upstream/openstack/python-openstackclient
-#upstream/openstack/python-openstacksdk
\ No newline at end of file
+upstream/openstack/openstack-pkg-tools
+upstream/openstack/python-aodhclient
+upstream/openstack/python-barbicanclient
+upstream/openstack/python-cinderclient
+upstream/openstack/python-glanceclient
+upstream/openstack/python-heatclient
+upstream/openstack/python-ironicclient
+upstream/openstack/python-keystoneclient
+upstream/openstack/python-neutronclient
+upstream/openstack/python-novaclient
+upstream/openstack/python-openstackclient
+upstream/openstack/python-openstacksdk
diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc
index d4bb0526..3f6261da 100644
--- a/debian_stable_docker_images.inc
+++ b/debian_stable_docker_images.inc
@@ -1,13 +1,14 @@
-#upstream/openstack/openstack-aodh
-#upstream/openstack/openstack-ironic
-#upstream/openstack/python-barbican
-#upstream/openstack/python-ceilometer
-#upstream/openstack/python-cinder
-#upstream/openstack/python-glance
-#upstream/openstack/python-heat/openstack-heat
-#upstream/openstack/python-horizon
-#upstream/openstack/python-keystone
-#upstream/openstack/python-neutron
-#upstream/openstack/python-nova
-#upstream/openstack/python-openstackclient
-#upstream/openstack/python-placement
+upstream/openstack/openstack-aodh
+upstream/openstack/openstack-ironic
+upstream/openstack/python-barbican
+upstream/openstack/python-ceilometer
+upstream/openstack/python-cinder
+upstream/openstack/python-glance
+upstream/openstack/python-heat/openstack-heat
+upstream/openstack/python-horizon
+upstream/openstack/python-keystone
+upstream/openstack/python-neutron
+upstream/openstack/python-nova
+upstream/openstack/python-openstackclient
+upstream/openstack/python-placement
+