diff --git a/repository-custom-properties.yml b/repository-custom-properties.yml
index 8f3797c..d76917d 100644
--- a/repository-custom-properties.yml
+++ b/repository-custom-properties.yml
@@ -11,8 +11,6 @@
 repository_secure_endpoint_ssh: "git@github.com:carlosfrias"
 
 configuration_folders:
-- '{{ ansible_config }}/configurations'
-- '{{ ansible_config }}/inventory'
 - '{{ ansible_config }}/logs/'
 - '{{ ansible_config }}/cache/'
 - '{{ apigee_config }}/planet_resources'
diff --git a/setup-base.yml b/setup-base.yml
index 7e96190..0eee6d8 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -2,8 +2,8 @@
 - hosts: localhost
   connection: local
   vars_files:
-  - repository-mapping-name-folder.yml
   - repository-custom-properties.yml
+  - repository-mapping-name-folder.yml
 
   tasks:
   - name: Ensure ansible configuration folders exist
diff --git a/setup.yml b/setup.yml
index 867efb8..fd6f459 100644
--- a/setup.yml
+++ b/setup.yml
@@ -3,6 +3,6 @@
 
 #- include: control-server.yml
 
-- include: setup-base.yml
+- import_playbook: setup-base.yml
 
 #- include: setup-ec2.yml