diff --git a/setup-base.yml b/setup-base.yml
index e6767fa..8b233a6 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -4,8 +4,7 @@
   vars:
     ansible_config: ~/.ansible
     apigee_config: ~/.apigee
-    workspaces: 
-    - ~/apigee-workspace/opdk-workspace
+    workspaces: ~/apigee-workspace/opdk-workspace
 
   tasks:
   - name: Create ansible configuration folders
@@ -44,8 +43,8 @@
     ignore_errors: yes
     git:
       repo: https://github.com/carlosfrias/apigee-opdk-playbook-samples.git
-      dest: "{{ item }}/apigee-opdk-playbook-samples"
-    with_items: "{{ workspaces }}"
+      dest: "{{ workspace }}/{{ item }}"
+    with_items: "{{ repos }}"
 
   - name: Add empty credentials.yml file to .apigee
     copy: