diff --git a/defaults/main.yml b/defaults/main.yml
index 27f4d6b..7b84a0d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,6 +4,15 @@
 
 # Default value to limit swap file use
 vm_swappiness: 60
+apigee_net_ipv4_tcp_fin_timeout: 15
+apigee_max_map_count: 131072
+
+sysctl_minimum:
+- { name: 'vm.swappiness', value: "{{ vm_swappiness }}" }
+- { name: 'net.ipv6.conf.all.disable_ipv6', value: '1' }
+- { name: 'net.ipv6.conf.default.disable_ipv6', value: '1' }
+- { name: 'net.ipv4.tcp_fin_timeout', value: "{{ apigee_net_ipv4_tcp_fin_timeout }}" }
+- { name: 'vm.max_map_count', value: '{{ apigee_max_map_count }}' }
 
 qpid_client: ftp://fr2.rpmfind.net/linux/epel/7/x86_64/q/qpid-cpp-client-1.35.0-3.el7.x86_64.rpm
 qpid_server: ftp://fr2.rpmfind.net/linux/epel/7/x86_64/q/qpid-cpp-server-1.35.0-3.el7.x86_64.rpm
diff --git a/tasks/main.yml b/tasks/main.yml
index fadb798..22143f9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -49,28 +49,14 @@
   become: yes
   when: ansible_os_family == "RedHat" and ansible_distribution_major_version | version_compare("6", ">")
 
-- name: Update sysctl attributes for vm.swappiness
+- name: Update sysctl attributes
   become: yes
-  tags: ['vm.swappiness']
   sysctl:
     name: "{{ item.name }}"
     value: "{{ item.value }}"
     state: present
     sysctl_set: yes
-  with_items:
-  - { name: 'vm.swappiness', value: "{{ vm_swappiness }}" }
-
-- name: Update sysctl attributes for ipv6
-  become: yes
-  tags: ['ipv6']
-  sysctl:
-    name: "{{ item.name }}"
-    value: "{{ item.value }}"
-    state: present
-    sysctl_set: yes
-  with_items:
-  - { name: 'net.ipv6.conf.all.disable_ipv6', value: '1' }
-  - { name: 'net.ipv6.conf.default.disable_ipv6', value: '1' }
+  with_items: "{{ sysctl_minimum }}"
 
 - name: Update for apigee installation environment
   become: yes