diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index f71ed03..fd2bfd8 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -7,13 +7,6 @@
     state: present
   with_items: "{{ yum_packages }}"
 
-- 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"
@@ -24,14 +17,6 @@
   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
   tags: ['pip-manager']
@@ -46,7 +31,15 @@
   shell: python /tmp/get-pip.py
   when: pip_conf_dir is not defined
 
+- name: Update pip
+  tags: ['pip']
+  become: yes
+  pip:
+    name: pip
+    state: latest
+
 - name: Update python packages
+  tags: ['pip']
   become: yes
   pip:
     name: '{{ item }}'
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index 43d1054..56ebfdb 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -19,37 +19,6 @@
     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']
@@ -73,6 +42,7 @@
     no_proxy: "{{ no_proxy }}"
 
 - name: Update pip
+  tags: ['pip']
   become: yes
   pip:
     name: pip
@@ -83,6 +53,7 @@
     no_proxy: "{{ no_proxy }}"
 
 - name: Update python packages with no proxy
+  tags: ['pip']
   become: yes
   pip:
     name: '{{ item }}'