diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml
index ef9480f576..0ac10f9573 100644
--- a/etc/openstack_deploy/user_secrets.yml
+++ b/etc/openstack_deploy/user_secrets.yml
@@ -141,7 +141,6 @@ nova_oslomsg_rpc_password:
 # Please also wire the appropriate userid in
 # your user variables.
 #nova_oslomsg_notify_password:
-nova_placement_service_password:
 
 # LXD Options for nova compute
 lxd_trust_password:
@@ -287,8 +286,5 @@ manila_profiler_hmac_key:
 manila_service_password:
 
 # Placement Options
-# TODO(logan): Replace nova_placement_service_password with
-# this var and add an upgrade playbook cleaning up the old
-# var from user_secrets before releasing Train
-# placement_service_password:
+placement_service_password:
 placement_galera_password:
diff --git a/inventory/group_vars/placement_all.yml b/inventory/group_vars/placement_all.yml
index 4d7a8fcfd2..61cbf4b4ec 100644
--- a/inventory/group_vars/placement_all.yml
+++ b/inventory/group_vars/placement_all.yml
@@ -22,8 +22,3 @@ placement_service_internalurl: "{{ placement_service_internaluri_proto }}://{{ i
 placement_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(placement_service_proto) }}"
 placement_service_adminurl: "{{ placement_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ placement_service_port }}"
 placement_service_region: "{{ service_region }}"
-
-# TODO(logan): Remove this before releasing Train after adding
-# placement_service_password to user_secrets and cleaning up the old
-# secret in an upgrade playbook
-placement_service_password: "{{ nova_placement_service_password }}"