diff --git a/ansible.cfg b/ansible.cfg
index 46e5c8f..1025f15 100755
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,5 +1,5 @@
 [defaults]
-hostfile = ~/.ansible/inventory/vz-edge-1701-aio
+# hostfile = ~/.ansible/inventory/vz-edge-1701-aio
 fact_caching_connection = ~/.ansible/tmp/cache/vz-edge-1701-aio
 log_path = ~/.ansible/tmp/logs/vz-edge-1701-aio.log
 
diff --git a/repository-custom-properties.yml b/repository-custom-properties.yml
index e042344..c31db5d 100644
--- a/repository-custom-properties.yml
+++ b/repository-custom-properties.yml
@@ -5,7 +5,7 @@
 playbook_workspace: "{{ apigee_workspace }}/apigee-opdk-playbook-workspace"
 role_workspace: "{{ apigee_workspace }}/apigee-opdk-role-workspace"
 repository_secure_endpoint_https: https://github.com/carlosfrias
-repository_secure_endpoint_ssh: git@github.com/carlosfrias
+repository_secure_endpoint_ssh: git@github.com:carlosfrias
 configuration_folders:
 - '{{ ansible_config }}/configurations'
 - '{{ ansible_config }}/inventory'
diff --git a/resources/ansible.cfg.j2 b/resources/ansible.cfg.j2
index 465176d..7a810be 100644
--- a/resources/ansible.cfg.j2
+++ b/resources/ansible.cfg.j2
@@ -3,9 +3,8 @@
 fact_caching_connection = {{ ansible_config }}/tmp/cache/
 log_path = {{ ansible_config }}/tmp/logs/
 
-remote_user = {{ username }}
+# remote_user = {{ username }}
 private_key_file = ~/.ssh/id_rsa
-become_method = pbrun
 
 roles_path = {{ ansible_config }}/roles
 local_tmp = {{ ansible_config }}/tmp
diff --git a/setup-base.yml b/setup-base.yml
index 600a597..e1121f8 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -2,7 +2,7 @@
 - hosts: localhost
   connection: local
   vars_files:
-  - bitbucket-workspace-github-repos.yml
+  - repository-mapping-name-folder.yml
   - repository-custom-properties.yml
 
   tasks:
@@ -16,7 +16,7 @@
     become: false
     ignore_errors: yes
     git:
-      repo: '{{ host_repo }}/apigee-opdk-ansible-configuration-samples.git'
+      repo: '{{ repository_secure_endpoint_ssh }}/apigee-opdk-ansible-configuration-samples.git'
       dest: "{{ ansible_config }}/configurations"
       accept_hostkey: yes
 
@@ -24,7 +24,7 @@
     become: false
     ignore_errors: yes
     git:
-      repo: '{{ host_repo }}/apigee-opdk-ansible-inventory-samples.git'
+      repo: '{{ repository_secure_endpoint_ssh }}/apigee-opdk-ansible-inventory-samples.git'
       dest: "{{ ansible_config }}/inventory"
       accept_hostkey: yes
 
@@ -32,7 +32,7 @@
     become: false
     ignore_errors: yes
     git:
-      repo: '{{ host_repo }}/{{ item.repo_name }}.git'
+      repo: '{{ repository_secure_endpoint_ssh }}/{{ item.repo_name }}.git'
       dest: "{{ item.workspace }}/{{ item.repo_name }}"
       accept_hostkey: yes
     with_items: "{{ repo_names }}"