diff --git a/repository-mapping-name-folder.yml b/repository-mapping-name-folder.yml
index aad1157..55cd257 100755
--- a/repository-mapping-name-folder.yml
+++ b/repository-mapping-name-folder.yml
@@ -1,8 +1,10 @@
 ---
 config_repos:
-- { workspace: '{{ playbook_dir }}/..', repo_name: apigee-opdk-playbook-setup-ansible }
-- { workspace: '{{ apigee_config }}', repo_name: apigee-opdk-custom-properties }
+- { workspace: '{{ apigee_workspace }}/..', repo_name: apigee-opdk-playbook-setup-ansible }
+#- { workspace: '{{ apigee_config }}', repo_name: apigee-opdk-custom-properties }
 - { workspace: '{{ playbook_dir }}/..', repo_name: local-workspace-maintenance }
+- { workspace: '{{ repository_secure_endpoint_ssh }}/..', repo_name: apigee-opdk-ansible-configuration-samples }
+- { workspace: '{{ repository_secure_endpoint_ssh }}/..', repo_name: apigee-opdk-ansible-inventory-samples }
 
 playbook_repos:
 - { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-aio } # moved into apigee-opdk-playbook-installation-single-region
diff --git a/setup-base.yml b/setup-base.yml
index 480af36..3ac5fdb 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -13,33 +13,6 @@
     with_items: '{{ configuration_folders }}'
     tags: ['config']
 
-  - name: Git checkout of sample configurations
-    tags: ['config']
-    become: false
-    ignore_errors: yes
-    git:
-      repo: '{{ repository_secure_endpoint_ssh }}/apigee-opdk-ansible-configuration-samples.git'
-      dest: "{{ ansible_config }}/configurations"
-      accept_hostkey: yes
-
-#  - name: Git checkout of custom properties
-#    tags: ['config']
-#    become: false
-#    ignore_errors: yes
-#    git:
-#      repo: '{{ repository_secure_endpoint_ssh }}/apigee-opdk-custom-properties.git'
-#      dest: "{{ apigee_config }}/apigee-opdk-custom-properties"
-#      accept_hostkey: yes
-
-  - name: Git checkout of sample inventories
-    tags: ['inventory']
-    become: false
-    ignore_errors: yes
-    git:
-      repo: '{{ repository_secure_endpoint_ssh }}/apigee-opdk-ansible-inventory-samples.git'
-      dest: "{{ ansible_config }}/inventory"
-      accept_hostkey: yes
-
   - name: Git checkout of configuration repositories
     tags: ['config']
     become: false