diff --git a/defaults/main.yml b/defaults/main.yml
index 48d3909..1bae9e4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,33 +1,9 @@
 ---
-# Target Java JDK version
-jdk_version: '1.8'
-
-# System file path to use in JAVA_HOME
-java_home: /usr/lib/jvm/java-openjdk
-
-# OPDK OS user name
-opdk_user_name: 'apigee'
-
-# OPDK OS group name
-opdk_group_name: "{{ opdk_user_name }}"
-
-# OPDK User Email
-opdk_user_email: ''
-
 opdk_smtp_mail_from: '{{ opdk_user_name }}'
 
-# OPDK User Password
-opdk_user_pass: ''
-
 # Home folder of the Apigee user
 opdk_user_home: /home/{{ opdk_user_name }}
 
-# Apigee admin user name
-admin_user: '{{ opdk_user_email }}'
-
-# Apigee admin user password
-admin_pass: '{{ opdk_user_pass }}'
-
 # Default Apigee Edge Private Cloud Version
 opdk_version: '4.17.09'
 
@@ -356,12 +332,3 @@
 bootstrap_filename: bootstrap.sh
 
 enable_system_check: 'n'
-drupal_pg_user: '{{ opdk_user_name }}'
-drupal_pg_pass: '{{ opdk_user_pass }}'
-dp_admin_firstname: "firstname"
-dp_admin_lastname: "lastname"
-dp_admin_username: "{{ opdk_user_name }}"
-dp_admin_pwd: "{{ opdk_user_pass }}"
-dp_admin_email: "{{ opdk_user_email }}"
-dp_devadmin_user: "{{ opdk_user_name }}"
-dp_devadmin_pwd: "{{ opdk_user_pass }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 3352004..cc28c92 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,7 +4,6 @@
   cache:
     key: 'interface_name'
     value: 'ansible_{{ ansible_default_ipv4.interface }}'
-  when: ansible_os_family | lower in ['centos', 'oraclelinux', 'redhat']
 
 - include_tasks: private_address.yml
 
diff --git a/tasks/update_cache.yml b/tasks/update_cache.yml
index 416aa6e..c6dded0 100644
--- a/tasks/update_cache.yml
+++ b/tasks/update_cache.yml
@@ -4,19 +4,12 @@
     key: "{{ item.key }}"
     value: "{{ item.value }}"
   with_items:
-  - { key: "jdk_version", value: "{{ jdk_version }}" }
-  - { key: "apigeerepobasepath", value: "{{ apigeerepobasepath }}" }
-  - { key: 'java_home', value: '{{ java_home }}' }
-  - { key: 'opdk_user_name', value: '{{ opdk_user_name }}' }
-  - { key: 'opdk_group_name', value: '{{ opdk_group_name }}' }
-  - { key: 'opdk_user_email', value: '{{ opdk_user_email }}' }
-  - { key: 'opdk_user_pass', value: '{{ opdk_user_pass }}' }
-  - { key: 'opdk_user_home', value: '{{ opdk_user_home }}' }
-  - { key: 'admin_user', value: '{{ admin_user }}' }
-  - { key: 'opdk_version', value: '{{ opdk_version }}' }
-  - { key: 'apigee_mirror_version', value: '{{ apigee_mirror_version }}' }
   - { key: 'opdk_installer_path', value: '{{ opdk_installer_path }}' }
   - { key: 'apigee_installation_home', value: '{{ apigee_installation_home }}' }
+  - { key: "apigeerepobasepath", value: "{{ apigeerepobasepath }}" }
+
+  - { key: 'opdk_version', value: '{{ opdk_version }}' }
+  - { key: 'apigee_mirror_version', value: '{{ apigee_mirror_version }}' }
   - { key: 'apigee_service', value: '{{ apigee_service }}' }
   - { key: 'nodetool', value: '{{ nodetool }}' }
   - { key: 'cqlsh', value: '{{ cqlsh }}' }
@@ -29,7 +22,6 @@
   - { key: 'local_apigee_secure', value: '{{ local_apigee_secure }}' }
   - { key: 'opdk_license_source_file_name', value: "{{ opdk_license_source_file_name }}" }
 
-
   - { key: 'apigee_data_backup_archive_name', value: '{{ apigee_data_backup_archive_name }}' }
   - { key: 'apigee_archive_storage_folder', value: '{{ apigee_archive_storage_folder }}' }
 
@@ -45,12 +37,9 @@
   - { key: 'copy_archive', value: '{{ copy_archive }}' }
   - { key: 'apigee_archive_name', value: '{{ apigee_archive_name }}' }
 
-  - { key: 'pg_user', value: '{{ pg_user }}' }
-  - { key: 'pg_pass', value: '{{ pg_pass }}' }
   - { key: 'mp_pod', value: '{{ mp_pod }}' }
   - { key: 'opdk_ldap_type', value: '{{ opdk_ldap_type }}'}
   - { key: 'opdk_ldap_remote_host', value: '{{ opdk_ldap_remote_host }}' }
-  - { key: 'opdk_ldap_pass', value: '{{ opdk_ldap_pass }}' }
   - { key: 'opdk_enable_ax', value: '{{ opdk_enable_ax }}' }
   - { key: 'default_mp_pod', value: '{{ default_mp_pod }}' }
   - { key: 'opdk_use_zk_cluster', value: '{{ opdk_use_zk_cluster }}' }
@@ -59,12 +48,8 @@
   - { key: 'opdk_smtp_skip', value: '{{ opdk_smtp_skip }}' }
   - { key: 'opdk_smtp_host', value: '{{ opdk_smtp_host }}' }
   - { key: 'opdk_smtp_port', value: '{{ opdk_smtp_port }}' }
-  - { key: 'opdk_smtp_user', value: '{{ opdk_smtp_user }}'}
-  - { key: 'opdk_smtp_password', value: '{{ opdk_smtp_password }}' }
   - { key: 'opdk_smtp_ssl', value: '{{ opdk_smtp_ssl }}' }
   - { key: 'opdk_cass_auth', value: '{{ opdk_cass_auth }}' }
-  - { key: 'opdk_cass_password', value: '{{ opdk_cass_password }}' }
-  - { key: 'opdk_cass_username', value: '{{ opdk_cass_username }}' }
   - { key: 'consumer_group', value: '{{ consumer_group }}' }
 
   - { key: 'ldap_data_port', value: '{{ ldap_data_port }}' }
@@ -113,13 +98,4 @@
   - { key: 'opdk_smtp_mail_from', value: '{{ opdk_smtp_mail_from }}' }
 
   - { key: 'enable_system_check', value: '{{ enable_system_check }}' }
-  - { key: 'drupal_pg_user', value: '{{ opdk_user_name }}' }
-  - { key: 'drupal_pg_pass', value: '{{ opdk_user_pass }}' }
-  - { key: 'dp_admin_firstname', value: "firstname" }
-  - { key: 'dp_admin_lastname', value: "lastname" }
-  - { key: 'dp_admin_username', value: "dp_admin" }
-  - { key: 'dp_admin_pwd', value: "{{ opdk_user_pass }}" }
-  - { key: 'dp_admin_email', value: "{{ opdk_user_email }}" }
-  - { key: 'dp_devadmin_user', value: "{{ opdk_user_name }}" }
-  - { key: 'dp_devadmin_pwd', value: "{{ opdk_user_pass }}" }
   - { key: 'opdk_portal_db_config_file', value: "{{ opdk_portal_db_config_file }}" }