diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml
index 1fd6981fc5..40c757a856 100644
--- a/ansible/roles/swift/tasks/config.yml
+++ b/ansible/roles/swift/tasks/config.yml
@@ -62,8 +62,8 @@
       - "{{ role_path }}/templates/swift.conf.j2"
       - "{{ node_custom_config }}/global.conf"
       - "{{ node_custom_config }}/swift.conf"
-      - "{{ node_custom_config }}/swift/{{ item }}.conf"
-      - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}.conf"
+      - "{{ node_custom_config }}/swift/{{ item }}/swift.conf"
+      - "{{ node_custom_config }}/swift/{{ inventory_hostname }}/{{ item }}/swift.conf"
     dest: "{{ node_config_directory }}/swift-{{ item }}/swift.conf"
     mode: "0660"
   become: true
diff --git a/releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml b/releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml
new file mode 100644
index 0000000000..b383ef8555
--- /dev/null
+++ b/releasenotes/notes/fix-swift-conf-collision-ee98d09a91c270bd.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Modifies the path for custom configuration of ``swift.conf`` from
+    ``/etc/kolla/config/swift/<service>.conf`` to
+    ``/etc/kolla/config/swift/<service>/swift.conf``, to avoid a collision with
+    custom configuration for ``<service>.conf``. Here, ``<service>`` may be
+    ``proxy-server``, ``account-*``, ``container-*`` or ``object-*``.