diff --git a/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml
index 66bb5f88..829447ea 100644
--- a/tasks/swift_service_setup.yml
+++ b/tasks/swift_service_setup.yml
@@ -163,10 +163,14 @@
     region_name: "{{ swift_service_region }}"
     service_name: "{{ swift_service_name }}"
     service_type: "{{ swift_service_type }}"
-    publicurl: "{{ swift_service_publicurl }}"
-    adminurl: "{{ swift_service_internalurl }}"
-    internalurl: "{{ swift_service_adminurl }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
+    endpoint_list:
+      - url: "{{ swift_service_publicurl }}"
+        interface: "public"
+      - url: "{{ swift_service_internalurl }}"
+        interface: "internal"
+      - url: "{{ swift_service_adminurl }}"
+        interface: "admin"
   register: add_service
   until: add_service|success
   retries: 5