diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 88bcd07f96..b3a28a6665 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -803,10 +803,7 @@ gnocchi_metric_datadir_volume: "gnocchi"
 cinder_backend_ceph: "{{ enable_ceph }}"
 cinder_backend_vmwarevc_vmdk: "no"
 cinder_volume_group: "cinder-volumes"
-# DEPRECATED: Use 'cinder_target_helper' instead. This option will be removed
-# in the Train release.
-cinder_iscsi_helper: "tgtadm"
-cinder_target_helper: "{{ cinder_iscsi_helper }}"
+cinder_target_helper: "tgtadm"
 
 # Valid options are [ nfs, swift, ceph ]
 cinder_backup_driver: "ceph"
diff --git a/ansible/roles/vitrage/tasks/upgrade.yml b/ansible/roles/vitrage/tasks/upgrade.yml
index 3aaf80c99d..20ccddc8f1 100644
--- a/ansible/roles/vitrage/tasks/upgrade.yml
+++ b/ansible/roles/vitrage/tasks/upgrade.yml
@@ -3,14 +3,5 @@
 
 - include_tasks: bootstrap_service.yml
 
-# NOTE(kiennt): vitrage-collector are removed in Stein cycle.
-#               Upgrade to Stein should remove vitrage-collector
-#               container. This task should be removed in
-#               T cycle.
-- name: Remove vitrage-collector container
-  kolla_docker:
-    name: vitrage_collector
-    action: remove_container
-
 - name: Flush handlers
   meta: flush_handlers
diff --git a/releasenotes/notes/remove-cinder-iscsi-helper-8143e5eeb0368d68.yaml b/releasenotes/notes/remove-cinder-iscsi-helper-8143e5eeb0368d68.yaml
new file mode 100644
index 0000000000..e0ec429041
--- /dev/null
+++ b/releasenotes/notes/remove-cinder-iscsi-helper-8143e5eeb0368d68.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Removes the ``cinder_iscsi_helper`` variable which was deprecated in the
+    Stein cycle in favour of ``cinder_target_helper``.
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 5a2a3c753d..be11b6045d 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -11,9 +11,6 @@ keepalived_virtual_router_id: "{{ 250 | random(1) }}"
 {% if enable_core_openstack | bool %}
 kolla_internal_vip_address: "{{ api_interface_address if hostvars | length > 2 else '169.254.169.10' }}"
 enable_haproxy: "{{ 'no' if hostvars | length > 2 else 'yes' }}"
-# TODO(mgoddard): Remove this in the Train cycle when heat is enabled in the
-# initial deployment.
-enable_heat: "{{ scenario != 'upgrade' or previous_release != 'rocky' }}"
 neutron_external_interface: "fake_interface"
 openstack_logging_debug: "True"
 openstack_service_workers: "1"