diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index eb3de89f1c..31b6cf931f 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -411,6 +411,15 @@ outputs:
                   - cinder_api_cron
                 tripleo_delegate_to: "{{ groups['cinder_api'] | default([]) }}"
       external_deploy_tasks:
+        - name: Clean up legacy Cinder keystone catalog entries
+          become: true
+          os_keystone_service:
+            cloud: {get_param: RootStackName}
+            name: cinderv3
+            service_type: volume
+            state: absent
+          when:
+            - step|int == 4
         - name: Manage Cinder Volume Type
           become: true
           vars:
diff --git a/releasenotes/notes/cinder-v1-cleanup-7154ca07652804cf.yaml b/releasenotes/notes/cinder-v1-cleanup-7154ca07652804cf.yaml
new file mode 100644
index 0000000000..f34232bee7
--- /dev/null
+++ b/releasenotes/notes/cinder-v1-cleanup-7154ca07652804cf.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    Cinder's legacy "volume" service and its associated endpoints are
+    automatically removed from the keystone catalog. The "volume" service is
+    associated with Cinder's v1 API, which was removed in Queens.
+fixes:
+  - |
+    The keystone catalog is automatically updated to remove any entries
+    associated with Cinder's v1 API "volume" service. This fixes bug
+    `1897761 <https://bugs.launchpad.net/tripleo/+bug/1897761>`_.