diff --git a/defaults/main.yml b/defaults/main.yml
index 05ad7b4..a410afe 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,7 +15,7 @@
 - requests
 - kazoo
 
-yum_os_minimum_packages:
+yum_packages:
 - bind-utils
 - chkconfig
 - curl
@@ -34,4 +34,6 @@
 - rng-tools
 - sed
 - unzip
-
+- openldap-clients-2.4.40
+- openldap-servers-2.4.40
+- openldap-2.4.40
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index 0c57486..1f8b24d 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -5,7 +5,38 @@
   yum:
     name: "{{ item }}"
     state: present
-  with_items: "{{ yum_os_minimum_packages }}"
+  with_items: "{{ yum_packages }}"
+
+- name: Start rngd service
+  service:
+    name: rngd
+    enabled: yes
+    state: started
+
+- name: Update vm.swappiness
+  become: yes
+  sysctl:
+    name: vm.swappiness
+    value: '{{ vm_swappiness }}'
+    state: present
+
+- name: Disable Default IPV6
+  become: yes
+  shell: "sysctl -w net.ipv6.conf.default.disable_ipv6=1"
+  tags: ['ipv6']
+
+- name: Disable All IPV6
+  become: yes
+  shell: "sysctl -w net.ipv6.conf.all.disable_ipv6=1"
+  tags: ['ipv6']
+
+- name: Update for apigee installation environment
+  become: yes
+  lineinfile:
+    dest: /etc/environment
+    regexp: "^export CONTINUE_ON_WARNING="
+    line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
+    backup: yes
 
 - name: Download pip package manager
   become: yes
@@ -26,9 +57,4 @@
   pip:
     name: '{{ item }}'
     state: present
-  with_items:
-  - httplib2
-  - pexpect
-  - passlib
-  - requests
-  - kazoo
+  with_items: "{{ pip_packages }}"
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 00dff9f..43d1054 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -13,12 +13,43 @@
   yum:
     name: "{{ item }}"
     state: present
-  with_items: "{{ yum_os_minimum_packages }}"
+  with_items: "{{ yum_packages }}"
   environment:
     http_proxy: "{{ http_proxy }}"
     https_proxy: "{{ https_proxy }}"
     no_proxy: "{{ no_proxy }}"
 
+- name: Start rngd service
+  service:
+    name: rngd
+    enabled: yes
+    state: started
+
+- name: Update vm.swappiness
+  become: yes
+  sysctl:
+    name: vm.swappiness
+    value: '{{ vm_swappiness }}'
+    state: present
+
+- name: Disable Default IPV6
+  become: yes
+  shell: "sysctl -w net.ipv6.conf.default.disable_ipv6=1"
+  tags: ['ipv6']
+
+- name: Disable All IPV6
+  become: yes
+  shell: "sysctl -w net.ipv6.conf.all.disable_ipv6=1"
+  tags: ['ipv6']
+
+- name: Update for apigee installation environment
+  become: yes
+  lineinfile:
+    dest: /etc/environment
+    regexp: "^export CONTINUE_ON_WARNING="
+    line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
+    backup: yes
+
 - name: Download pip package manager with proxy
   become: yes
   tags: ['pip-manager']