diff --git a/bitbucket-repo-user-list.yml b/bitbucket-repo-user-list.yml
deleted file mode 100644
index 680aeaf..0000000
--- a/bitbucket-repo-user-list.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-repo_users:
-- friasca
-- v636401
-- v532218
-- v412810
-- v674375
-- v682557
\ No newline at end of file
diff --git a/bitbucket-workspace-folders.yml b/bitbucket-workspace-folders.yml
deleted file mode 100644
index ec6fd3f..0000000
--- a/bitbucket-workspace-folders.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-ansible_config: ~/.ansible
-apigee_config: ~/.apigee
-apigee_workspace: ~/apigee-workspace
-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_host: "onestash.verizon.com"
-repository_port: "7999"
-repository_secure_endpoint_ssh: "ssh://git@{{ repository_host }}:{{ repository_port }}/celvw"
-repository_secure_endpoint_https: "https://{{ repository_host }}/rest/api/1.0/projects/CELVW"
-configuration_folders:
-- '{{ ansible_config }}/configurations'
-- '{{ ansible_config }}/inventory'
-- '{{ ansible_config }}/tmp/logs'
-- '{{ apigee_config }}'
-- '{{ playbook_workspace }}'
-- '{{ role_workspace }}'
diff --git a/bitbucket-create-update-repos.yml b/private-repository-create-update.yml
similarity index 92%
rename from bitbucket-create-update-repos.yml
rename to private-repository-create-update.yml
index c813471..383994e 100644
--- a/bitbucket-create-update-repos.yml
+++ b/private-repository-create-update.yml
@@ -3,9 +3,9 @@
   hosts: localhost
   connection: local
   vars_files:
-  - bitbucket-workspace-github-repos.yml
-  - bitbucket-workspace-folders.yml
-  - bitbucket-repo-user-list.yml
+  - repository-mapping-name-folder.yml
+  - repository-custom-properties.yml
+  - private-repository-user-list.yml
   tasks:
   - name: Create repositories if necessary
     uri:
diff --git a/bitbucket-remove-repos.yml b/private-repository-remove.yml
similarity index 89%
rename from bitbucket-remove-repos.yml
rename to private-repository-remove.yml
index d95a786..cf91a19 100644
--- a/bitbucket-remove-repos.yml
+++ b/private-repository-remove.yml
@@ -3,7 +3,7 @@
   hosts: localhost
   connection: local
   vars_files:
-  - bitbucket-workspace-folders.yml
+  - repository-custom-properties.yml
   tasks:
   - name: Remove repo
     uri:
diff --git a/private-repository-user-list.yml b/private-repository-user-list.yml
new file mode 100644
index 0000000..b503e3c
--- /dev/null
+++ b/private-repository-user-list.yml
@@ -0,0 +1,3 @@
+---
+repo_users:
+- friasca
diff --git a/repository-custom-properties.yml b/repository-custom-properties.yml
new file mode 100644
index 0000000..e042344
--- /dev/null
+++ b/repository-custom-properties.yml
@@ -0,0 +1,15 @@
+---
+ansible_config: ~/.ansible
+apigee_config: ~/.apigee
+apigee_workspace: ~/apigee-workspace
+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
+configuration_folders:
+- '{{ ansible_config }}/configurations'
+- '{{ ansible_config }}/inventory'
+- '{{ ansible_config }}/tmp/logs'
+- '{{ apigee_config }}'
+- '{{ playbook_workspace }}'
+- '{{ role_workspace }}'
diff --git a/bitbucket-workspace-github-repos.yml b/repository-mapping-name-folder.yml
similarity index 100%
rename from bitbucket-workspace-github-repos.yml
rename to repository-mapping-name-folder.yml
diff --git a/resources/ansible.cfg.j2 b/resources/ansible.cfg.j2
index 96432e6..465176d 100644
--- a/resources/ansible.cfg.j2
+++ b/resources/ansible.cfg.j2
@@ -1,7 +1,7 @@
 [defaults]
-hostfile = {{ ansible_config }}/inventory/vz-edge-1701-aio
-fact_caching_connection = {{ ansible_config }}/tmp/cache/vz-edge-1701-aio
-log_path = {{ ansible_config }}/tmp/logs/vz-edge-1701-aio.log
+hostfile = {{ ansible_config }}/inventory/
+fact_caching_connection = {{ ansible_config }}/tmp/cache/
+log_path = {{ ansible_config }}/tmp/logs/
 
 remote_user = {{ username }}
 private_key_file = ~/.ssh/id_rsa
diff --git a/setup-ansible-config.yml b/setup-ansible-config.yml
index 14e6b1e..906f845 100644
--- a/setup-ansible-config.yml
+++ b/setup-ansible-config.yml
@@ -2,7 +2,7 @@
 - hosts: localhost
   connection: local
   vars_files:
-  - bitbucket-workspace-folders.yml
+  - repository-custom-properties.yml
   vars_prompt:
     - name: username
       prompt: "Enter your username ID"
diff --git a/setup-apigee-license.yml b/setup-apigee-license.yml
index e0eb4d7..89e635c 100644
--- a/setup-apigee-license.yml
+++ b/setup-apigee-license.yml
@@ -2,7 +2,7 @@
 - hosts: localhost
   connection: local
   vars_files:
-  - bitbucket-workspace-folders.yml
+  - repository-custom-properties.yml
   vars_prompt:
     - name: license_path
       prompt: "Enter path to license file"
diff --git a/setup-base.yml b/setup-base.yml
index 3ac213f..600a597 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -3,7 +3,7 @@
   connection: local
   vars_files:
   - bitbucket-workspace-github-repos.yml
-  - bitbucket-workspace-folders.yml
+  - repository-custom-properties.yml
 
   tasks:
   - name: Create ansible configuration folders