diff --git a/defaults/main.yml b/defaults/main.yml
index 62dcaaf..c1e9c46 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,6 @@
 ---
 # defaults file for apigee-opdk-setup-os-pg
 apigee_kernel_sem: '500 32000 32 1024'
+
+sysctl_pg:
+- { name: 'kernel.sem', value: "{{ apigee_kernel_sem }}" }
\ No newline at end of file
diff --git a/files/apigee-pg.limits.conf b/files/apigee-pg.limits.conf
deleted file mode 100644
index 84dabcf..0000000
--- a/files/apigee-pg.limits.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-* - memlock unlimited
-* - nofile 100000
-* - nproc 32768
-* - as unlimited
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index 7b071b7..a03f167 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,20 +1,10 @@
 ---
-# tasks file for apigee-opdk-setup-os-pg
-
-- name: Update kernel.sem for postgres
+# tasks file for apigee-opdk-setup-os-postgres
+- name: Update sysctl attributes
   become: yes
   sysctl:
-    name: kernel.sem
-    value: '{{ apigee_kernel_sem }}'
+    name: "{{ item.name }}"
+    value: "{{ item.value }}"
     state: present
-  tags: ['os-tuning']
-
-- name: Update limits.conf
-  become: yes
-  copy:
-    src: apigee-pg.limits.conf
-    dest: /etc/security/limits.d/apigee-pg.limits.conf
-    owner: root
-    group: root
-    mode: 0644
-  tags: ['os-tuning']
\ No newline at end of file
+    sysctl_set: yes
+  with_items: "{{ sysctl_pg }}"