diff --git a/image-yaml/overcloud-hardened-images-uefi.yaml b/image-yaml/overcloud-hardened-images-uefi.yaml
index 977892a5d..ffc799537 100644
--- a/image-yaml/overcloud-hardened-images-uefi.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi.yaml
@@ -6,7 +6,7 @@ disk_images:
       - dhcp-all-interfaces
       - openvswitch
       - overcloud-agent
-      - overcloud-full
+      - overcloud-base
       - overcloud-controller
       - overcloud-compute
       - overcloud-ceph-storage
@@ -17,7 +17,7 @@ disk_images:
       - dynamic-login
       - iptables
       - enable-packages-install
-      - pip-and-virtualenv-override
+      - override-pip-and-virtualenv
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
diff --git a/image-yaml/overcloud-hardened-images.yaml b/image-yaml/overcloud-hardened-images.yaml
index 3432b3c6b..ae29644f5 100644
--- a/image-yaml/overcloud-hardened-images.yaml
+++ b/image-yaml/overcloud-hardened-images.yaml
@@ -6,7 +6,7 @@ disk_images:
       - dhcp-all-interfaces
       - openvswitch
       - overcloud-agent
-      - overcloud-full
+      - overcloud-base
       - overcloud-controller
       - overcloud-compute
       - overcloud-ceph-storage
@@ -17,7 +17,7 @@ disk_images:
       - dynamic-login
       - iptables
       - enable-packages-install
-      - pip-and-virtualenv-override
+      - override-pip-and-virtualenv
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml
index 6b9974789..6ea80e86c 100644
--- a/image-yaml/overcloud-images.yaml
+++ b/image-yaml/overcloud-images.yaml
@@ -7,7 +7,7 @@ disk_images:
       - dhcp-all-interfaces
       - openvswitch
       - overcloud-agent
-      - overcloud-full
+      - overcloud-base
       - overcloud-controller
       - overcloud-compute
       - overcloud-ceph-storage
@@ -18,7 +18,7 @@ disk_images:
       - dynamic-login
       - iptables
       - enable-packages-install
-      - pip-and-virtualenv-override
+      - override-pip-and-virtualenv
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
@@ -52,7 +52,7 @@ disk_images:
       - element-manifest
       - network-gateway
       - enable-packages-install
-      - pip-and-virtualenv-override
+      - override-pip-and-virtualenv
     packages:
       - python-hardware-detect
     options:
diff --git a/image-yaml/overcloud-realtime-compute.yaml b/image-yaml/overcloud-realtime-compute.yaml
index 1a9539eaf..287cf13e5 100644
--- a/image-yaml/overcloud-realtime-compute.yaml
+++ b/image-yaml/overcloud-realtime-compute.yaml
@@ -15,7 +15,7 @@ disk_images:
       - dynamic-login
       - iptables
       - enable-packages-install
-      - pip-and-virtualenv-override
+      - override-pip-and-virtualenv
       - dracut-regenerate
       - remove-machine-id
       - remove-resolvconf
diff --git a/tripleo_common/image/image_builder.py b/tripleo_common/image/image_builder.py
index 06d7b76ea..2a876534f 100644
--- a/tripleo_common/image/image_builder.py
+++ b/tripleo_common/image/image_builder.py
@@ -81,7 +81,6 @@ class DibImageBuilder(ImageBuilder):
         if elements_path is None:
             env['ELEMENTS_PATH'] = os.pathsep.join([
                 "/usr/share/tripleo-puppet-elements",
-                "/usr/share/instack-undercloud",
                 '/usr/share/tripleo-image-elements',
             ])
             os.environ.update(env)