diff --git a/container-images/tcib/base/os/gnocchi-base/gnocchi-api/gnocchi-api.yaml b/container-images/tcib/base/os/gnocchi-base/gnocchi-api/gnocchi-api.yaml
index 69df14925..00f4874cc 100644
--- a/container-images/tcib/base/os/gnocchi-base/gnocchi-api/gnocchi-api.yaml
+++ b/container-images/tcib/base/os/gnocchi-base/gnocchi-api/gnocchi-api.yaml
@@ -5,9 +5,3 @@ tcib_actions:
 tcib_packages:
   common:
   - gnocchi-api
-  - httpd
-  - mod_ssl
-  - python3-boto3
-  - python3-cradox
-  - python3-ldappool
-  - python3-mod_wsgi
diff --git a/container-images/tcib/base/os/gnocchi-base/gnocchi-base.yaml b/container-images/tcib/base/os/gnocchi-base/gnocchi-base.yaml
index 43271799e..9beabf398 100644
--- a/container-images/tcib/base/os/gnocchi-base/gnocchi-base.yaml
+++ b/container-images/tcib/base/os/gnocchi-base/gnocchi-base.yaml
@@ -4,3 +4,10 @@ tcib_actions:
 tcib_packages:
   common:
   - gnocchi-common
+  - python3-cradox
+  - python3-eventlet
+  - httpd
+  - mod_ssl
+  - python3-boto3
+  - python3-ldappool
+  - python3-mod_wsgi
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 1699a64ec..c6b2d0c84 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -37,6 +37,18 @@
               - scripts/.*$
         - tripleo-ci-centos-8-scenario001-standalone:
             dependencies: *deps_unit_lint
+            vars:
+              build_container_images: true
+            files:
+              - ^container-images/tcib/base/collectd.*$
+              - ^container-images/tcib/base/os/aodh.*$
+              - ^container-images/tcib/base/os/ceilometer.*$
+              - ^container-images/tcib/base/os/cinder.*$
+              - ^container-images/tcib/base/os/gnocchi.*$
+              - ^container-images/tcib/base/os/heat.*$
+              - ^container-images/tcib/base/qdrouterd.*$
+              - ^container-images/tcib/base/rabbitmq.*$
+              - ^container-images/tcib/base/redis.*$
         - tripleo-ci-centos-8-scenario002-standalone:
             dependencies: *deps_unit_lint
         - tripleo-ci-centos-8-scenario003-standalone: