diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml
index ebc9b1e27b..0345d68387 100644
--- a/etc/openstack_deploy/user_secrets.yml
+++ b/etc/openstack_deploy/user_secrets.yml
@@ -27,15 +27,11 @@ rabbitmq_monitoring_password:
 ## Tokens
 memcached_encryption_key:
 
-## Container default user
-container_openstack_password:
-
 ## Galera Options
 galera_root_password:
 
 ## Keystone Options
 keystone_container_mysql_password:
-keystone_auth_admin_token:
 keystone_auth_admin_password:
 keystone_service_password:
 keystone_rabbitmq_password:
@@ -54,7 +50,6 @@ aodh_rabbitmq_password:
 ## Cinder Options
 cinder_container_mysql_password:
 cinder_service_password:
-cinder_v2_service_password:
 cinder_profiler_hmac_key:
 cinder_rabbitmq_password:
 
@@ -100,11 +95,7 @@ neutron_ha_vrrp_auth_password:
 nova_container_mysql_password:
 nova_api_container_mysql_password:
 nova_metadata_proxy_secret:
-nova_ec2_service_password:
 nova_service_password:
-nova_v3_service_password:
-nova_v21_service_password:
-nova_s3_service_password:
 nova_rabbitmq_password:
 
 # LXD Options for nova compute
@@ -117,7 +108,6 @@ sahara_service_password:
 
 ## Swift Options:
 swift_service_password:
-swift_container_mysql_password:
 swift_dispersion_password:
 ### Once the swift cluster has been setup DO NOT change these hash values!
 swift_hash_path_suffix:
diff --git a/releasenotes/notes/remove-old-secrets-d896f3ff794a1a47.yaml b/releasenotes/notes/remove-old-secrets-d896f3ff794a1a47.yaml
new file mode 100644
index 0000000000..25e6251893
--- /dev/null
+++ b/releasenotes/notes/remove-old-secrets-d896f3ff794a1a47.yaml
@@ -0,0 +1,14 @@
+---
+upgrade:
+ - |
+    The following secrets are no longer used by OpenStack-Ansible
+    and can be removed from user_secrets.yml:
+
+    * container_openstack_password
+    * keystone_auth_admin_token
+    * cinder_v2_service_password
+    * nova_ec2_service_password
+    * nova_v3_service_password
+    * nova_v21_service_password
+    * nova_s3_service_password
+    * swift_container_mysql_password