diff --git a/repository-mapping-name-folder.yml b/repository-mapping-name-folder.yml
index be79d5d..221deb9 100755
--- a/repository-mapping-name-folder.yml
+++ b/repository-mapping-name-folder.yml
@@ -7,26 +7,26 @@
 - { workspace: '{{ ansible_config }}', 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
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-baas }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-microgateway }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-mirror }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-monetization }
 - { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-single-region }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-third-region }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-two-regions }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-aws-management }
 - { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-backup }
 - { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-cassandra-validation }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-expand-region }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-opdk-upgrade }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-postgres-add-remove }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-qpid-add-remove }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-update-message-processor-properties }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-vagrant }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-validate-port-availability }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-samples }
-#- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-cassandra-replication-factor }
+##- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-aio } # moved into apigee-opdk-playbook-installation-single-region
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-baas }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-microgateway }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-mirror }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-monetization }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-third-region }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-installation-two-regions }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-aws-management }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-expand-region }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-opdk-upgrade }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-postgres-add-remove }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-qpid-add-remove }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-update-message-processor-properties }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-vagrant }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-validate-port-availability }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-samples }
+- { workspace: '{{ playbook_workspace }}', repo_name: apigee-opdk-playbook-maintenance-cassandra-replication-factor }
 
 role_repos:
 - { workspace: '{{ role_workspace }}', repo_name: apigee-fetch-files }
@@ -119,6 +119,3 @@
 - { workspace: '{{ role_workspace }}', repo_name: apigee-opdk-yum-packages }
 - { workspace: '{{ role_workspace }}', repo_name: apigee-opdk-setup-mirror-nginx }
 - { workspace: '{{ role_workspace }}', repo_name: apigee-opdk-setup-component-install }
-- { workspace: '{{ role_workspace }}', repo_name: vz-application-netgroup-access }
-- { workspace: '{{ role_workspace }}', repo_name: vz-cyberark-register-ec2 }
-- { workspace: '{{ role_workspace }}', repo_name: vz-firstboot-operations-verification }
diff --git a/update-git-remote-origin.yml b/update-git-remote-origin.yml
new file mode 100644
index 0000000..fed5e33
--- /dev/null
+++ b/update-git-remote-origin.yml
@@ -0,0 +1,27 @@
+---
+- name: Update git remote repos with provided url
+  hosts: localhost
+  connection: local
+  gather_facts: no
+
+  vars_files:
+  - repository-mapping-name-folder.yml
+  - repository-custom-properties.yml
+
+  tasks:
+
+  - name: Remove existing origin repo
+    shell: "git remote remove origin"
+    args:
+      chdir: "{{ item.workspace }}/{{ item.repo_name }}"
+    with_items:
+    - "{{ playbook_repos }}"
+    - "{{ role_repos }}"
+
+  - name: Add updated origin repo
+    shell: "git remote add origin {{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git"
+    args:
+      chdir: "{{ item.workspace }}/{{ item.repo_name }}"
+    with_items:
+    - "{{ playbook_repos }}"
+    - "{{ role_repos }}"