diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index b6d93d0101..464dd53071 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -445,28 +445,25 @@ outputs:
             src: /var/log/swift
             dest: /var/log/containers/swift
             state: link
+        - name: Set fact for SwiftRawDisks
+          set_fact:
+            swift_raw_disks: {get_param: SwiftRawDisks}
         - name: Format SwiftRawDisks
           filesystem:
             fstype: xfs
-            dev: /dev/{{ item }}
+            dev: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
             opts: -f -i size=1024
-          with_items:
-            - repeat:
-                template: 'DEVICE'
-                for_each:
-                  DEVICE: {get_param: SwiftRawDisks}
+          with_items: "{{ swift_raw_disks }}"
+          when: swift_raw_disks
         - name: Mount devices defined in SwiftRawDisks
           mount:
             name: /srv/node/{{ item }}
-            src: /dev/{{ item }}
+            src: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
             fstype: xfs
             opts: noatime
             state: mounted
-          with_items:
-            - repeat:
-                template: 'DEVICE'
-                for_each:
-                  DEVICE: {get_param: SwiftRawDisks}
+          with_items: "{{ swift_raw_disks }}"
+          when: swift_raw_disks
       upgrade_tasks:
         - name: Check if swift storage services are deployed
           command: systemctl is-enabled --quiet "{{ item }}"