diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 5a4fa831a8..2dcc78aacc 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -855,6 +855,16 @@ outputs:
             - keystone_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower
           delegate_to: undercloud
           block: *keystone_generate_clouds
+        - name: Clean up legacy Cinder keystone catalog entries
+          delegate_to: undercloud
+          os_keystone_service:
+            cloud: {get_param: RootStackName}
+            name: cinderv3
+            service_type: volume
+            state: absent
+          when:
+            - step|int == 1
+            - keystone_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower
         - name: Run the keystone endpoint creation
           when:
             - step|int == 1