diff --git a/ansible/tasks/setup-system.yml b/ansible/tasks/setup-system.yml
index 88286e472..db9bb9cfa 100644
--- a/ansible/tasks/setup-system.yml
+++ b/ansible/tasks/setup-system.yml
@@ -168,25 +168,6 @@
         value: '9187,8085'
         state: 'present'
 
-- name: Execute tasks when (debpkg_mode or nixpkg_mode)
-  when:
-    - (debpkg_mode or nixpkg_mode)
-  block:
-    # Set Sysctl params for restarting the OS on OOM after 10
-    - name: Set vm.panic_on_oom=1
-      ansible.builtin.sysctl:
-        name: 'vm.panic_on_oom'
-        reload: true
-        state: 'present'
-        value: '1'
-
-    - name: Set kernel.panic=10
-      ansible.builtin.sysctl:
-        name: 'kernel.panic'
-        reload: true
-        state: 'present'
-        value: '10'
-
 - name: set hosts file
   ansible.builtin.copy:
     content: |
diff --git a/ansible/tasks/setup-tuned.yml b/ansible/tasks/setup-tuned.yml
index 8cd9cff16..c24ac928a 100644
--- a/ansible/tasks/setup-tuned.yml
+++ b/ansible/tasks/setup-tuned.yml
@@ -112,6 +112,19 @@
             value: 10
 
 
+        - name: tuned - Set ip_local_reserved_ports
+          become: true
+          community.general.ini_file:
+            create: true
+            group: 'root'
+            mode: '0644'
+            no_extra_spaces: true
+            option: 'net.ipv4.ip_local_reserved_ports'
+            path: '/etc/tuned/profiles/postgresql/tuned.conf'
+            section: 'sysctl'
+            state: 'present'
+            value: '3000,3001,8085,9122,9187,9999'
+
         - name: tuned - Set tcp_keepalive_time
           become: true
           community.general.ini_file: