diff --git a/images/sonic/config_db.json b/images/sonic/config_db.json
index b34fca11..56f47426 100644
--- a/images/sonic/config_db.json
+++ b/images/sonic/config_db.json
@@ -21,9 +21,6 @@
     "mgmt-framework": {
       "state": "disabled"
     },
-    "pmon": {
-      "state": "disabled"
-    },
     "snmp": {
       "state": "disabled"
     },
diff --git a/images/sonic/launch.py b/images/sonic/launch.py
index 1f3af01b..7f350aff 100755
--- a/images/sonic/launch.py
+++ b/images/sonic/launch.py
@@ -91,6 +91,8 @@ def initial_configuration(g: GuestFS) -> None:
     g.ln_s(linkname=systemd_system + 'tacacs-config.timer', target='/dev/null') # After boot Host configuration
     # Started by featured
     g.ln_s(linkname=sonic_target_wants + 'lldp.service', target='/lib/systemd/system/lldp.service')
+    g.ln_s(linkname=systemd_system + 'pmon.service', target='/lib/systemd/system/pmon.service')
+    g.ln_s(linkname=sonic_target_wants + 'pmon.service', target='/lib/systemd/system/pmon.service')
 
     # Workaround: Only useful for BackEndToRRouter
     g.ln_s(linkname=systemd_system + 'backend-acl.service', target='/dev/null')
diff --git a/roles/sonic/tasks/fix-network-performance.yaml b/roles/sonic/tasks/fix-network-performance.yaml
new file mode 100644
index 00000000..c1ccac0a
--- /dev/null
+++ b/roles/sonic/tasks/fix-network-performance.yaml
@@ -0,0 +1,16 @@
+---
+- name: Collect facts about interfaces
+  ansible.builtin.setup:
+    gather_subset:
+      - '!all'
+      - '!min'
+      - interfaces
+
+- name: Gather all network interfaces except eth0
+  set_fact:
+    interfaces: "{{ ansible_interfaces | select('match', '^eth[0-9]+$') | reject('equalto', 'eth0') | list }}"
+
+- name: Disable GRO on all network interfaces except eth0
+  shell: ethtool -K {{ item }} gro off
+  become: true
+  with_items: "{{ interfaces }}"
diff --git a/roles/sonic/tasks/main.yaml b/roles/sonic/tasks/main.yaml
index 8303d570..537c6087 100644
--- a/roles/sonic/tasks/main.yaml
+++ b/roles/sonic/tasks/main.yaml
@@ -2,6 +2,9 @@
 - name: Install frr-pythontools
   ansible.builtin.import_tasks: frr-reload.yaml
 
+- name: Fix Network Performance
+  ansible.builtin.import_tasks: fix-network-performance.yaml
+
 - name: Set lldp tx-interval to 10
   ansible.builtin.command: lldpcli configure lldp tx-interval 10
   retries: 10