diff --git a/workspace-folders.yml b/workspace-folders.yml
index b87db6f..fdec2f8 100644
--- a/workspace-folders.yml
+++ b/workspace-folders.yml
@@ -1,8 +1,9 @@
 ---
 ansible_config: ~/.ansible
 apigee_config: ~/.apigee
-playbook_workspace: ~/apigee-workspace/apigee-opdk-playbook-workspace
-role_workspace: ~/apigee-workspace/apigee-opdk-role-workspace
+apigee_workspace: ~/apigee-workspace
+playbook_workspace: "{{ apigee_workspace }}/apigee-opdk-playbook-workspace"
+role_workspace: "{{ apigee_workspace }}/apigee-opdk-role-workspace"
 host_repo: git@github.com:carlosfrias
 configuration_folders:
 - '{{ ansible_config }}/configurations'
diff --git a/workspace-github-repos.yml b/workspace-github-repos.yml
index d30d013..7b862e7 100644
--- a/workspace-github-repos.yml
+++ b/workspace-github-repos.yml
@@ -1,6 +1,6 @@
 ---
 repos:
-  - { workspace: '{{ playbook_dir }}/..', repo_name: local-workspace-maintenance }
+  - { workspace: '{{ apigee_workspace }}', repo_name: local-workspace-maintenance }
   - { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-aio }
   - { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-baas }
   - { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-portal }