diff --git a/playbooks/multinode-undercloud-upgrade.yml b/playbooks/multinode-undercloud-upgrade.yml
index b072a0ffe..eacce6b1d 100644
--- a/playbooks/multinode-undercloud-upgrade.yml
+++ b/playbooks/multinode-undercloud-upgrade.yml
@@ -46,7 +46,6 @@
   roles:
     - role: container-update
       when:
-        - containerized_undercloud|bool
         - containerized_undercloud_upgrade|default(false)|bool
 
 - name: Run tripleo-upgrade role to upgrade undercloud
diff --git a/roles/container-update/tasks/main.yml b/roles/container-update/tasks/main.yml
index 3012e01e1..4f0173022 100644
--- a/roles/container-update/tasks/main.yml
+++ b/roles/container-update/tasks/main.yml
@@ -8,8 +8,6 @@
   include_role:
     name: undercloud_deploy
     tasks_from: create-scripts.yml
-  vars:
-    containerized_undercloud: "{{ containerized_undercloud_upgrade }}"
   when: not stat_cont_file.stat.exists
 
 - name: "Substitute containers registry to {{ docker_registry_host|default('nothing') }}/{{ docker_registry_namespace_used|default('nothing') }}"
diff --git a/roles/extras-common/README.md b/roles/extras-common/README.md
index 6ccdbb9c0..c8cbb316a 100644
--- a/roles/extras-common/README.md
+++ b/roles/extras-common/README.md
@@ -25,8 +25,6 @@ Role Variables
 - `timestamper_cmd`: beginning with the shell pipe character, this command
   prepends a timestamp to the deployment and test commands throughout the
   roles. Can be disabled by specifying this command as an empty string.
-- `enable_libvirt_tripleo_ui`: <false> -- update the triple-ui javascript config
-  for libvirt environments.
 - `local_docker_registry_host`: <"{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"> -- host of the local (undercloud) docker registry
 - `docker_registry_host`: <'docker.io'> -- host of the primary docker registry
 - `docker_registry_namespace`: <'tripleomaster'> -- namespace of
diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml
index 1e9c565c4..dc2a2e337 100644
--- a/roles/extras-common/defaults/main.yml
+++ b/roles/extras-common/defaults/main.yml
@@ -127,11 +127,6 @@ undercloud_undercloud_nameservers:
   - 8.8.8.8
 timestamper_cmd: >-
     | awk '{ print strftime("%Y-%m-%d %H:%M:%S |"), $0; fflush(); }'
-# if virtbmc is enabled we can assume a libvirt setup and the libvirt
-# tripleo ui steps will also execute.
-# enable_libvirt_tripleo_ui is a switch to force the steps to run with or
-# without virtbmc
-enable_libvirt_tripleo_ui: false
 composable_scenario: ""
 upgrade_composable_scenario: ""
 artcl_collect_dir: "{{ local_working_dir }}/collected_files"
diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md
index e25257ccf..9f2f98724 100644
--- a/roles/undercloud-deploy/README.md
+++ b/roles/undercloud-deploy/README.md
@@ -37,8 +37,6 @@ https://docs.openstack.org/tripleo-quickstart/latest/accessing-libvirt.html
   option in undercloud.conf.
 - `undercloud_enable_tempest`: <'true'> -- sets up the 'enable_tempest' option
   in undercloud.conf.
-- `undercloud_enable_ui`: <'true'> -- sets up the 'enable_ui' option in
-  undercloud.conf.
 - `undercloud_enable_validations`: <'true'> -- sets up the 'enable_validations'
   option in undercloud.conf.
 - `undercloud_enable_novajoin`: <'true'> -- sets up the 'enable_novajoin'
@@ -63,8 +61,6 @@ https://docs.openstack.org/tripleo-quickstart/latest/accessing-libvirt.html
   `cloud-names.yaml` template used by the `overcloud-deploy` role.
 - `undercloud_cloud_domain`: The domain configured for use by containerized
   undercloud via the tripleo client's `--local-domain` option. It is unset by default.
-- `tripleo_ui_secure_access`: Defaults to false due to the self signed certificate and
-  usability issues. See the tripleo-quickstart documentation `accessing the undercloud` for details.
 - `local_docker_registry_host`: <`docker_registry_host`> -- registry host/port
   for containerized undercloud services. Defaults to the value provided for overcloud.
   You may want to diverge it, if building locally, or fetching from remote registries
@@ -104,8 +100,7 @@ instead.
 up the 'undercloud_public_host' parameter from undercloud.conf. It is also used by overcloud
 nodes to access the undercloud node via a VIP/hostname that resolves to a routable IP address.
 - `undercloud_undercloud_admin_host`: <a 3rd host of the `undercloud_network_cidr`> -- Sets
-up the 'undercloud_admin_host' from undercloud.conf.  Note, use the `undercloud_admin_vip`
-instead for Mitaka/Newton releases.
+up the 'undercloud_admin_host' from undercloud.conf.
 - `undercloud_dhcp_start`: <a 5th host of the `undercloud_network_cidr`> -- Sets
 up the 'undercloud_dhcp_start' from undercloud.conf.
 - `undercloud_dhcp_end`: <a 30th host of the `undercloud_network_cidr`> -- Sets
@@ -114,7 +109,6 @@ up the 'undercloud_dhcp_end' from undercloud.conf.
 from undercloud.conf. May be a string or a sequence. Only the last item goes for
 the undercloud deploy command.
 - `undercloud_undercloud_hostname`: Sets up the 'undercloud_hostname' value from undercloud.conf.
-Note, use the `undercloud_public_vip` instead for Mitaka/Newton releases.
 - `undercloud_heat_public_endpoints`: <'false'> -- when the ctlplane network is not routable
 from overcloud nodes, for example pre-provisioned
 [deployed servers](https://docs.openstack.org/developer/tripleo-docs/advanced_deployment/deployed_server.html#undercloud),
diff --git a/roles/undercloud-deploy/defaults/main.yml b/roles/undercloud-deploy/defaults/main.yml
index 2288e1bf3..b239f1d5c 100644
--- a/roles/undercloud-deploy/defaults/main.yml
+++ b/roles/undercloud-deploy/defaults/main.yml
@@ -12,12 +12,6 @@ hieradata_override_file_t_h_t_undercloud: hieradata-overrides-t-h-t-undercloud.y
 step_introspect: false
 step_install_undercloud: true
 
-# The TripleO-UI is available on the undercloud
-# ssl or non-ssl access can be configured
-# Due to self signed certificates a user must grant permission to
-# https://<virthost>/keystone/v3/auth/tokens for ssl access to work.
-tripleo_ui_secure_access: false
-
 # Which libvirt session should we use?  Using `qemu://session` does
 # not require privileged access (but does require the setup performed by the
 # `environment/setup` role).
@@ -49,7 +43,6 @@ undercloud_enable_ironic_inspector: true
 undercloud_enable_monitoring: false
 undercloud_enable_telemetry: false
 undercloud_enable_tempest: false
-undercloud_enable_ui: true
 undercloud_enable_validations: true
 undercloud_ipxe_deploy: true
 undercloud_enable_swift_encryption: false
@@ -85,12 +78,7 @@ undercloud_selinux_enabled: >-
    false
    {%- endif -%}
 
-undercloud_container_cli: >-
-   {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
-   podman
-   {% else %}
-   docker
-   {% endif %}
+undercloud_container_cli: podman
 
 # Define a custom t-h-t installation for UC
 undercloud_custom_tht_script: custom-tht-script.sh.j2
diff --git a/roles/undercloud-deploy/tasks/create-scripts.yml b/roles/undercloud-deploy/tasks/create-scripts.yml
index b2cc6ed86..8b58bcf88 100644
--- a/roles/undercloud-deploy/tasks/create-scripts.yml
+++ b/roles/undercloud-deploy/tasks/create-scripts.yml
@@ -138,7 +138,6 @@
   when:
     - job.add_repos is defined
     - job.add_repos != []
-    - containerized_undercloud|bool or containerized_overcloud|bool
   block:
     - name: Create string of repos to update
       set_fact:
@@ -173,9 +172,7 @@
       when: add_repos_update|length > 0
 
 - name: Create containers-prepare-parameter.yaml
-  when: containerized_undercloud|bool or containerized_overcloud|bool
   block:
-
     - name: Write containers-prepare-parameter.yaml
       template:
         src: containers-prepare-parameter.yaml.j2
diff --git a/roles/undercloud-deploy/tasks/main.yml b/roles/undercloud-deploy/tasks/main.yml
index 9bec25878..a4efc74f0 100644
--- a/roles/undercloud-deploy/tasks/main.yml
+++ b/roles/undercloud-deploy/tasks/main.yml
@@ -47,36 +47,6 @@
       vars:
         tripleo_undercloud_install_debug: "{{ undercloud_undercloud_debug }}"
 
-# Ironic defaults to using `qemu:///system`.  When running libvirtd
-# unprivileged we need to use `qemu:///session`.  This allows us to pass
-# the value of libvirt_uri into /etc/ironic/ironic.conf.
-- name: Configure Ironic pxe_ssh driver
-  when: release in ['mitaka', 'liberty']
-  delegate_to: undercloud
-  ini_file:
-    dest: /etc/ironic/ironic.conf
-    section: ssh
-    option: libvirt_uri
-    value: '{{ libvirt_uri }}'
-  become: true
-  tags:
-    - undercloud-install
-
-- name: restart ironic conductor after changing configuration
-  when: release in ['mitaka', 'liberty']
-  become: true
-  service:
-    name: openstack-ironic-conductor
-    enabled: true
-    state: restarted
-  tags:
-    - undercloud-install
-
 - include: post-install.yml
   tags:
     - undercloud-post-install
-
-- include: tripleo-ui.yml
-  tags:
-    - undercloud-post-install
-  when: (enable_vbmc|bool and undercloud_enable_ui|bool) or enable_libvirt_tripleo_ui|bool
diff --git a/roles/undercloud-deploy/tasks/post-install.yml b/roles/undercloud-deploy/tasks/post-install.yml
index e59af42bd..6d0fc6ac1 100644
--- a/roles/undercloud-deploy/tasks/post-install.yml
+++ b/roles/undercloud-deploy/tasks/post-install.yml
@@ -1,33 +1,4 @@
 ---
-# Extract the undercloud admin password from
-# `undercloud-passwords.conf`.
-- when: not containerized_undercloud|bool
-  block:
-    - name: Get undercloud admin password
-      command: >
-        awk -F= '$1 == "undercloud_admin_password" {print $2}'
-        {{ working_dir }}/undercloud-passwords.conf
-      register: undercloud_admin_password
-      changed_when: false
-
-    - name: Copy stackrc to ansible host
-      tags:
-        - undercloud-post-install
-      fetch:
-        flat: true
-        src: stackrc
-        dest: "{{ local_working_dir }}/stackrc"
-
-    # We need this (and the previous task) in order to replace the
-    # `sudo hiera admin_password` with an actual password in the `stackrc`
-    # file.
-    - name: Update admin password in local credentials file
-      delegate_to: localhost
-      lineinfile:
-        dest: "{{ local_working_dir }}/stackrc"
-        line: "export OS_PASSWORD={{ undercloud_admin_password.stdout }}"
-        regexp: "OS_PASSWORD"
-
 - name: Copy stackrc created at the UC user $HOME to the working dir
   tags:
     - undercloud-post-install
@@ -38,4 +9,3 @@
     remote_src: true
     mode: 0640
   become: true
-  when: containerized_undercloud|bool
diff --git a/roles/undercloud-deploy/tasks/tripleo-ui.yml b/roles/undercloud-deploy/tasks/tripleo-ui.yml
deleted file mode 100644
index 107632570..000000000
--- a/roles/undercloud-deploy/tasks/tripleo-ui.yml
+++ /dev/null
@@ -1,125 +0,0 @@
----
-
-- name: ensure the tripleo_ui_config.js file exists
-  stat:
-    path: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-  register: ooo_ui_config_file
-
-- when:
-    - enable_port_forward_for_tripleo_ui|bool
-    - hostvars[groups['virthost'][0]].ansible_host is defined
-    - tripleo_ui_secure_access|bool
-    - ooo_ui_config_file.stat.exists
-  block:
-    - name: get the heat public url
-      shell: |
-        source {{ working_dir }}/stackrc
-        openstack catalog show heat --format value | grep public | awk -F '/' '{print $5}'
-      register: heat_public_url
-
-    - name: get the swift public url
-      shell: |
-        source {{ working_dir }}/stackrc
-        openstack catalog show swift --format value | grep public | awk -F '/' '{print $5}'
-      register: swift_public_url
-
-    - name: update the keystone config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'keystone':"
-        line: "  'keystone': 'https://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/keystone/v3/',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-      when: release not in ['newton', 'ocata']
-
-    - name: update the keystone config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'keystone':"
-        line: "  'keystone': 'https://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/keystone/v2/',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-      when: release in ['newton', 'ocata']
-
-    - name: update the heat config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'heat':"
-        line: "  'heat': 'https://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/heat/v1/{{ heat_public_url.stdout }}',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-
-    - name: update the ironic config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'ironic':"
-        line: "  'ironic': 'https://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/ironic',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-
-    - name: update the ironic-inspector config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'ironic-inspector':"
-        line: "  'ironic-inspector': 'https://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/ironic-inspector',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-
-    - name: update the mistral config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'mistral':"
-        line: "  'mistral': 'https://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/mistral/v2',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-
-    - name: update the swift config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'swift':"
-        line: "  'swift': 'https://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/swift/v1/{{ swift_public_url.stdout }}',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-
-    - name: update the zaqar-websocket config in tripleo_ui_config.js, connect via virthost ip
-      lineinfile:
-        regexp: "'zaqar-websocket':"
-        line: "  'zaqar-websocket': 'wss://{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}/zaqar',"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-
-    - name: restart the httpd service
-      service:
-        name: httpd
-        state: restarted
-      become: true
-
-- when:
-    - enable_port_forward_for_tripleo_ui|bool
-    - hostvars[groups['virthost'][0]].ansible_host is defined
-    - not (tripleo_ui_secure_access|bool)
-    - ooo_ui_config_file.stat.exists
-  block:
-    - name: update config in tripleo_ui_config.js, connect via virthost ip with ssl
-      replace:
-        regexp: \d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}
-        replace: "{{ hostvars[groups['virthost'][0]].ansible_default_ipv4.address }}"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-
-    - name: update config in tripleo_ui_config.js, for keystone v3
-      replace:
-        regexp: keystone\/v2.0
-        replace: "keystone/v3"
-        dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: true
-      become: true
-      when: release in ['master', 'queens', 'pike']
-
-    - name: restart the httpd service
-      service:
-        name: httpd
-        state: restarted
-      become: true
diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
index 865801745..c6936234a 100644
--- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
+++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
@@ -24,22 +24,15 @@ parameter_defaults:
    and not build_container_images|default(false)|bool %}
     modify_role: tripleo-modify-image
     modify_append_tag: "{{ update_containers_append_tag }}"
-{% if release in ['stein'] %}
-    modify_only_with_labels:
-    - kolla_version
-{% else %}
     modify_only_with_source:
     - kolla
     - tripleo
-{% endif %}
     modify_vars:
       tasks_from: yum_update.yml
       yum_repos_dir_path: /etc/yum.repos.d
       yum_cache: /var/tmp/tripleo-container-image-prepare-cache
       update_repo: "{{ update_containers_repo }}"
-{% if  release not in ['newton', 'ocata', 'pike', 'queens'] %}
       container_build_tool: buildah
-{% endif %}
 {% endif %}
     set:
       tag: "{{ container_build_id }}"
diff --git a/roles/undercloud-deploy/templates/undercloud.conf.j2 b/roles/undercloud-deploy/templates/undercloud.conf.j2
index 6508031cf..ff5e358fc 100644
--- a/roles/undercloud-deploy/templates/undercloud.conf.j2
+++ b/roles/undercloud-deploy/templates/undercloud.conf.j2
@@ -24,13 +24,6 @@ undercloud_hostname = {{undercloud_undercloud_hostname}}
 #undercloud_hostname = <None>
 {% endif %}
 
-{% if release in ['mitaka', 'newton', 'ocata', 'pike'] %}
-# Network CIDR for the Neutron-managed network for Overcloud
-# instances. This should be the subnet used for PXE booting. (string
-# value)
-network_cidr = {{undercloud_network_cidr}}
-{% endif %}
-
 # IP information for the interface on the Undercloud that will be
 # handling the PXE boots and DHCP for Overcloud instances.  The IP
 # portion of the value will be assigned to the network interface
@@ -40,33 +33,12 @@ local_ip = {{undercloud_local_ip|default(
     '%s/%s' % (undercloud_network_cidr|nthhost(1),
     undercloud_network_cidr.split('/').1))}}
 
-{% if release in ['mitaka', 'newton', 'ocata', 'pike'] %}
-# Network gateway for the Neutron-managed network for Overcloud
-# instances. This should match the local_ip above when using
-# masquerading. (string value)
-network_gateway = {{undercloud_network_gateway|default(
-    undercloud_network_cidr|nthhost(1))}}
-{% endif %}
-
 # MTU, set neutron on the undercloud to match mtu of the nics
 # (string value)
 {% if undercloud_local_mtu is defined %}
 local_mtu = {{ undercloud_local_mtu }}
 {% endif %}
 
-{% if release in ['mitaka', 'newton'] %}
-# Virtual IP address to use for the public endpoints of Undercloud
-# services.  Only used if undercloud_service_certficate is set.
-# (string value)
-undercloud_public_vip = {{undercloud_undercloud_public_vip|default(
-    undercloud_network_cidr|nthhost(2))}}
-
-# Virtual IP address to use for the admin endpoints of Undercloud
-# services.  Only used if undercloud_service_certficate is set.
-# (string value)
-undercloud_admin_vip = {{undercloud_undercloud_admin_vip|default(
-    undercloud_network_cidr|nthhost(3))}}
-{% else %}
 # Virtual IP or DNS address to use for the public endpoints of
 # Undercloud services. Only used with SSL. (string value)
 # Deprecated group/name - [DEFAULT]/undercloud_public_vip
@@ -80,7 +52,6 @@ undercloud_public_host = {{undercloud_undercloud_public_host|default(
 #undercloud_admin_host = 192.168.24.3
 undercloud_admin_host = {{undercloud_undercloud_admin_host|default(
     undercloud_network_cidr|nthhost(3))}}
-{% endif %}
 
 # Nameserver for the Undercloud node.
 # (string value)
@@ -156,25 +127,6 @@ local_interface = {{undercloud_local_interface}}
 #local_interface = eth1
 {% endif %}
 
-{% if release in ['mitaka', 'newton', 'ocata', 'pike'] %}
-# Network that will be masqueraded for external access, if required.
-# This should be the subnet used for PXE booting. (string value)
-masquerade_network = {{undercloud_masquerade_network|default(
-    undercloud_network_cidr)}}
-{% endif %}
-
-{% if release in ['mitaka', 'newton', 'ocata', 'pike'] %}
-# Start of DHCP allocation range for PXE and DHCP of Overcloud
-# instances. (string value)
-dhcp_start = {{undercloud_dhcp_start|default(
-    undercloud_network_cidr|nthhost(5))}}
-
-# End of DHCP allocation range for PXE and DHCP of Overcloud
-# instances. (string value)
-dhcp_end = {{undercloud_dhcp_end|default(
-    undercloud_network_cidr|nthhost(30))}}
-{% endif %}
-
 # Path to hieradata override file. If set, the file will be copied
 # under /etc/puppet/hieradata and set as the first file in the hiera
 # hierarchy. This can be used to to custom configure services beyond
@@ -190,16 +142,6 @@ inspection_interface = {{undercloud_inspection_interface}}
 #inspection_interface = br-ctlplane
 {% endif %}
 
-{% if release in ['mitaka', 'newton', 'ocata', 'pike'] %}
-# Temporary IP range that will be given to nodes during the inspection
-# process.  Should not overlap with the range defined by dhcp_start
-# and dhcp_end, but should be in the same network. (string value)
-# Deprecated group/name - [DEFAULT]/discovery_iprange
-inspection_iprange = {{undercloud_inspection_iprange|default(
-    '%s,%s' % (undercloud_network_cidr|nthhost(100),
-    undercloud_network_cidr|nthhost(120)))}}
-{% endif %}
-
 # Whether to enable extra hardware collection during the inspection
 # process.
 {% if undercloud_inspection_extras is defined %}
@@ -218,11 +160,9 @@ inspection_runbench = {{undercloud_inspection_runbench}}
 # services. (boolean value)
 undercloud_debug = {{undercloud_undercloud_debug}}
 
-{% if containerized_undercloud|bool %}
 # Container CLI used for deployment;
 # Can be docker or podman. (string value)
 container_cli = {{undercloud_container_cli}}
-{% endif %}
 
 # Enable or disable SELinux during the deployment. (boolean value)
 {% if undercloud_selinux_enabled is defined %}
@@ -249,9 +189,6 @@ enable_telemetry = {{undercloud_enable_telemetry}}
 # (boolean value)
 enable_validations = {{undercloud_enable_validations}}
 
-# Whether to install the TripleO UI. (boolean value)
-enable_ui = {{undercloud_enable_ui}}
-
 # Whether to install Mistral in the Undercloud. (boolean value)
 enable_mistral = {{undercloud_enable_mistral}}
 
@@ -345,12 +282,10 @@ docker_insecure_registries= {{undercloud_docker_insecure_registries}}
 
 # additional env files for undercloud, used with containers
 
-{% if undercloud_container_images_file is defined and containerized_undercloud|bool %}
+{% if undercloud_container_images_file is defined%}
 container_images_file = {{ undercloud_container_images_file }}
-{% elif containerized_undercloud|bool %}
-container_images_file = {{ working_dir }}/containers-prepare-parameter.yaml
 {% else %}
-#container_images_file = <None>
+container_images_file = {{ working_dir }}/containers-prepare-parameter.yaml
 {% endif %}
 
 {% if build_container_images|default(false)|bool %}
@@ -417,192 +352,6 @@ roles_file = {{undercloud_roles_data}}
 clean_nodes = {{undercloud_clean_nodes}}
 {% endif %}
 
-
-{% if release in ['mitaka', 'newton', 'ocata', 'pike'] %}
-[auth]
-
-#
-# From instack-undercloud
-#
-
-# Password used for MySQL databases. If left unset, one will be
-# automatically generated. (string value)
-{% if undercloud_undercloud_db_password is defined %}
-undercloud_db_password = {{undercloud_undercloud_db_password}}
-{% else %}
-#undercloud_db_password = <None>
-{% endif %}
-
-# Keystone admin token. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_admin_token is defined %}
-undercloud_admin_token = {{undercloud_undercloud_admin_token}}
-{% else %}
-#undercloud_admin_token = <None>
-{% endif %}
-
-# Keystone admin password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_admin_password is defined %}
-undercloud_admin_password = {{undercloud_undercloud_admin_password}}
-{% else %}
-#undercloud_admin_password = <None>
-{% endif %}
-
-# Glance service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_glance_password is defined %}
-undercloud_glance_password = {{undercloud_undercloud_glance_password}}
-{% else %}
-#undercloud_glance_password = <None>
-{% endif %}
-
-# Heat db encryption key(must be 16, 24, or 32 characters. If left
-# unset, one will be automatically generated. (string value)
-{% if undercloud_undercloud_heat_encryption_key is defined %}
-undercloud_heat_encryption_key = {{undercloud_undercloud_heat_encryption_key}}
-{% else %}
-#undercloud_heat_encryption_key = <None>
-{% endif %}
-
-# Heat service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_heat_password is defined %}
-undercloud_heat_password = {{undercloud_undercloud_heat_password}}
-{% else %}
-#undercloud_heat_password = <None>
-{% endif %}
-
-# Neutron service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_neutron_password is defined %}
-undercloud_neutron_password = {{undercloud_undercloud_neutron_password}}
-{% else %}
-#undercloud_neutron_password = <None>
-{% endif %}
-
-# Nova service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_nova_password is defined %}
-undercloud_nova_password = {{undercloud_undercloud_nova_password}}
-{% else %}
-#undercloud_nova_password = <None>
-{% endif %}
-
-# Ironic service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_ironic_password is defined %}
-undercloud_ironic_password = {{undercloud_undercloud_ironic_password}}
-{% else %}
-#undercloud_ironic_password = <None>
-{% endif %}
-
-# Ceilometer service password. If left unset, one will be
-# automatically generated. (string value)
-{% if undercloud_undercloud_ceilometer_password is defined %}
-undercloud_ceilometer_password = {{undercloud_undercloud_ceilometer_password}}
-{% else %}
-#undercloud_ceilometer_password = <None>
-{% endif %}
-
-# Aodh service password. If left unset, one will be
-# automatically generated. (string value)
-{% if undercloud_undercloud_aodh_password is defined %}
-undercloud_aodh_password = {{undercloud_undercloud_aodh_password}}
-{% else %}
-#undercloud_aodh_password = <None>
-{% endif %}
-
-# Sensu service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_sensu_password is defined %}
-undercloud_sensu_password = {{undercloud_undercloud_sensu_password}}
-{% else %}
-#undercloud_sensu_password = <None>
-{% endif %}
-
-# Ceilometer metering secret. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_ceilometer_metering_secret is defined %}
-undercloud_ceilometer_metering_secret = {{undercloud_undercloud_ceilometer_metering_secret}}
-{% else %}
-#undercloud_ceilometer_metering_secret = <None>
-{% endif %}
-
-# Ceilometer snmpd user. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_ceilometer_snmpd_user is defined %}
-undercloud_ceilometer_snmpd_user = {{undercloud_undercloud_ceilometer_snmpd_user}}
-{% else %}
-#undercloud_ceilometer_snmpd_user = <None>
-{% endif %}
-
-# Ceilometer snmpd password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_ceilometer_snmpd_password is defined %}
-undercloud_ceilometer_snmpd_password = {{undercloud_undercloud_ceilometer_snmpd_password}}
-{% else %}
-#undercloud_ceilometer_snmpd_password = <None>
-{% endif %}
-
-# Swift service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_swift_password is defined %}
-undercloud_swift_password = {{undercloud_undercloud_swift_password}}
-{% else %}
-#undercloud_swift_password = <None>
-{% endif %}
-
-# Mistral service password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_mistral_password is defined %}
-undercloud_mistral_password = {{undercloud_undercloud_mistral_password}}
-{% else %}
-#undercloud_mistral_password = <None>
-{% endif %}
-
-# Rabbitmq cookie. If left unset, one will be automatically generated.
-# (string value)
-{% if undercloud_undercloud_rabbit_cookie is defined %}
-undercloud_rabbit_cookie = {{undercloud_undercloud_rabbit_cookie}}
-{% else %}
-#undercloud_rabbit_cookie = <None>
-{% endif %}
-
-# Rabbitmq password. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_rabbit_password is defined %}
-undercloud_rabbit_password = {{undercloud_undercloud_rabbit_password}}
-{% else %}
-#undercloud_rabbit_password = <None>
-{% endif %}
-
-# Rabbitmq username. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_rabbit_username is defined %}
-undercloud_rabbit_username = {{undercloud_undercloud_rabbit_username}}
-{% else %}
-#undercloud_rabbit_username = <None>
-{% endif %}
-
-# Heat stack domain admin password. If left unset, one will be
-# automatically generated. (string value)
-{% if undercloud_undercloud_heat_stack_domain_admin_password is defined %}
-undercloud_heat_stack_domain_admin_password = {{undercloud_undercloud_heat_stack_domain_admin_password}}
-{% else %}
-#undercloud_heat_stack_domain_admin_password = <None>
-{% endif %}
-
-# Swift hash suffix. If left unset, one will be automatically
-# generated. (string value)
-{% if undercloud_undercloud_swift_hash_suffix is defined %}
-undercloud_swift_hash_suffix = {{undercloud_undercloud_swift_hash_suffix}}
-{% else %}
-#undercloud_swift_hash_suffix = <None>
-{% endif %}
-{% endif %}
-
-{% if release not in ['mitaka', 'newton', 'ocata', 'pike'] %}
 # List of routed network subnets for provisioning and introspection.
 # Comma separated list of names/tags. For each network a section/group
 # needs to be added to the configuration file with these parameters
@@ -637,7 +386,6 @@ dhcp_start = {{undercloud_dhcp_start|default(
 dhcp_end = {{undercloud_dhcp_end|default(
     undercloud_network_cidr|nthhost(30))}}
 
-{% if release not in ['queens', 'stein'] %}
 # DNS nameservers for the Neutron-managed subnet for the Overcloud
 # instances on this network. If no nameservers are defined for the
 # subnet, the nameservers defined for undercloud_nameservers will be
@@ -647,7 +395,6 @@ dns_nameservers = {{ undercloud_ctlplane_dns_nameservers }}
 {% else %}
 #dns_nameservers =
 {% endif %}
-{% endif %}
 
 # Network gateway for the Neutron-managed network for Overcloud
 # instances on this network. (string value)
@@ -666,4 +413,3 @@ inspection_iprange = {{undercloud_inspection_iprange|default(
 
 # The network will be masqueraded for external access. (boolean value)
 masquerade={{ ctlplane_masquerade|default(false) }}
-{% endif %}
diff --git a/roles/undercloud-setup/tasks/hostname.yml b/roles/undercloud-setup/tasks/hostname.yml
index e36492537..67d5cb509 100644
--- a/roles/undercloud-setup/tasks/hostname.yml
+++ b/roles/undercloud-setup/tasks/hostname.yml
@@ -1,21 +1,4 @@
 ---
-# for instack-undercloud only, retain the existing behavior.
-# FIXME(bogdando): only check for releases once instack removed from Rocky CI fully
-- name: Override undercloud CI hostname ad-hock
-  when: release in ['newton','ocata','pike','queens'] or not containerized_undercloud|bool
-  block:
-    - name: Install hostname correcting script
-      template:
-        src: hostname.sh.j2
-        dest: "{{ working_dir }}/hostname.sh"
-        mode: 0755
-
-    - name: Run the hostname correcting script
-      shell: >
-        set -o pipefail &&
-        {{ working_dir }}/hostname.sh 2>&1 {{ timestamper_cmd }} > {{ working_dir }}/hostname.sh.log
-      become: true
-
 # https://launchpad.net/bugs/1763776
 - name: Add a unique hostname to /etc/hosts resolved to the first IPv4 available
   become: true
@@ -26,11 +9,8 @@
     line: "{{ ansible_all_ipv4_addresses | first }} {{ ansible_hostname }}-unique"
   when: tripleo_set_unique_hostname|default(false)|bool
 
-# for undercloud containers only, starting from Rocky.
 - name: Override containerized undercloud CI hostname for tripleo client
   when:
-    - not release in ['newton','ocata','pike','queens']
-    - containerized_undercloud|bool
     - undercloud_undercloud_hostname is not defined
   block:
     - name: set fact for undercloud_fqdn override when undercloud_cloud_domain was provided