diff --git a/repository-custom-properties.yml b/repository-custom-properties.yml
index 3655d42..fb7d4d4 100644
--- a/repository-custom-properties.yml
+++ b/repository-custom-properties.yml
@@ -12,7 +12,6 @@
 - '{{ ansible_config }}/inventory'
 - '{{ ansible_config }}/tmp/'
 - '{{ apigee_config }}/logs_configs'
-- '{{ apigee_config }}/apigee-opdk-custom-properties'
 - '{{ apigee_security }}'
 - '{{ playbook_workspace }}'
 - '{{ role_workspace }}'
diff --git a/resources/credentials.yml b/resources/credentials.yml
index b720d05..e032815 100644
--- a/resources/credentials.yml
+++ b/resources/credentials.yml
@@ -1,52 +1,68 @@
 ---
-# Basic authorization header used to authenticate with Cyberark service
-# service_account_authorization_token: "Basic BASE64_ENCODED_USERNAME"
-
 # AWS credentials
 # aws_access_key:
 # aws_secret_key:
-# aws_region:
-# security_group:
-# vpc_id:
-# vpc_subnet_id:
-# name_prefix:
-# key_name:
-# owner_contact_info:
-# company_env:
-# department:
-# bag:
-# team_contact_info:
-# env:
-# volume_type:
-# volume_size:
-# delete_on_termination:
-# device_name:
 
-# Apigee credentials
+# Apigee Repo credentials
 # apigee_repo_user:
 # apigee_repo_password:
-# opdk_user_name:
-# opdk_group_name:
+
+# Local Apigee Mirror Credentials
+# apigee_repo_user: admin
+# apigee_repo_password: admin
+
+# Edge Admin User
 # opdk_user_email:
 # opdk_user_pass:
-# grafana_username:
+
+# Edge System User
+# opdk_user_name:
+# opdk_group_name:
+
+# Grafana Credentials
+# grafana_username: admin
 # grafana_password:
+
+# Cassandra Credentials
 # opdk_cass_username:
 # opdk_cass_password:
+
+# Email Credentials
 # opdk_smtp_user:
 # opdk_smtp_password:
 # opdk_ldap_pass:
+
+# Apigee Analytics Postgres credentials
 # pg_user:
 # pg_pass:
 
-# BaaS Credentials
+# Dev Portal Postgres Admin
+# drupal_pg_user: drupal_admin
+# drupal_pg_pass: '{{ opdk_user_pass }}'
+
+# Dev Portal Drupal Admin
+# dp_admin_firstname: "Apigee"
+# dp_admin_lastname: "User"
+# dp_admin_username: "{{ opdk_user_name }}"
+# dp_admin_pwd: "{{ opdk_user_pass }}"
+# dp_admin_email: "{{ opdk_user_email }}"
+
+# Dev Portal Developer Admin
+# dp_devadmin_user: "{{ opdk_user_email }}"
+# dp_devadmin_pwd: "{{ opdk_user_pass }}"
+
+# BaaS Admin Credentials
 # baas_admin_name:
 # baas_admin_email cannot be the same as  baas_superuser_email
 # baas_admin_email:
 # baas_admin_pass:
+
+# BaaS Superuser Credentials
 # baas_superuser_email cannot be the same as baas_admin_email
 # baas_superuser_email:
 # baas_superuser_name:
 # baas_superuser_pass:
+
+# BaaS Email Credentials
 # baas_smtp_user:
 # baas_smtp_user_pass:
diff --git a/resources/custom-properties.yml b/resources/custom-properties.yml
index 4ed7815..6d7626c 100644
--- a/resources/custom-properties.yml
+++ b/resources/custom-properties.yml
@@ -1,5 +1,10 @@
 ---
 opdk_version: 4.17.01
+# apigee_repo_uri: 10.142.0.4:3939
+# apigee_repo_protocol: http
+# apigee_repo_url: "{{ apigee_repo_protocol }}://{{ apigee_repo_uri }}"
+# target_logs_folder: "~/.apigee/logs_configs/"
+
 # pip_index_url: "https://private.repository.com/api/pypi/Pypi-remote/simple"
 # pip_conf_dir: "~/.pip"
 
diff --git a/setup-base.yml b/setup-base.yml
index c2ef187..cbd894b 100644
--- a/setup-base.yml
+++ b/setup-base.yml
@@ -89,8 +89,14 @@
       when: role_repos is defined
     when: checkout_type is defined and checkout_type | trim == 'https'
 
-  - name: Add empty credentials.yml file to .apigee
+  - name: Add empty credentials.yml file to .apigee-secure
     copy:
       src: resources/credentials.yml
       dest: '{{ apigee_security }}/credentials.yml'
       force: no
+
+  - name: Add empty custom-properties.yml file to .apigee
+    copy:
+      src: resources/custom-properties.yml
+      dest: '{{ apigee_config }}/custom-properties.yml'
+      force: no