diff --git a/defaults/main.yml b/defaults/main.yml
index aca6161a..fcb3783f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -236,6 +236,8 @@ swift_service_in_ldap: false
 
 # Basic swift configuration for the cluster
 swift: {}
+swift_vars: {}
+swift_proxy_vars: {}
 
 # Example basic swift configuration for the cluster
 # swift:
diff --git a/tasks/main.yml b/tasks/main.yml
index d68751d5..12e00cfd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -31,22 +31,6 @@
   tags:
     - swift-config
 
-# We need swift_vars to exist for the "swift_vars.* is defined check" to work
-- name: "Set swift_vars if undefined"
-  set_fact:
-    swift_vars: "{}"
-  when: swift_vars is not defined
-  tags:
-    - always
-
-# We need swift_proxy_vars to exist for the "swift_proxy_vars.* is defined check" to work
-- name: "Set swift_proxy_vars if undefined"
-  set_fact:
-    swift_proxy_vars: "{}"
-  when: swift_proxy_vars is not defined
-  tags:
-    - always
-
 - include: swift_pre_install.yml
   when:
     - swift_do_setup | bool