diff --git a/qca-nss-drv/Makefile b/qca-nss-drv/Makefile
index a874804..29a87fd 100644
--- a/qca-nss-drv/Makefile
+++ b/qca-nss-drv/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qca-nss-drv
-PKG_RELEASE:=16
+PKG_RELEASE:=17
 
 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-drv.git
 PKG_SOURCE_PROTO:=git
diff --git a/qca-nss-drv/files/qca-nss-drv.init b/qca-nss-drv/files/qca-nss-drv.init
index 9cb3842..10f60ff 100644
--- a/qca-nss-drv/files/qca-nss-drv.init
+++ b/qca-nss-drv/files/qca-nss-drv.init
@@ -2,6 +2,7 @@
 # vim: set syn=bash
 # shellcheck disable=2155,3010,3019,3043,3057,3060
 
+# shellcheck disable=2034
 START=94
 PROG="qca-nss-drv"
 
@@ -92,29 +93,36 @@ set_affinity() {
 enable_rps() {
 
   # NSS Core 0 : 4 nss queues to each core
-  set_affinity "nss_queue0"               0-3 1
+  set_affinity "nss_queue0"                 0 1
   set_affinity "nss_queue1"                 1 1
   set_affinity "nss_queue2"                 2 1
   set_affinity "nss_queue3"                 3 1
 
   # NSS Core 1 : 1 nss queue to 3rd core
   set_affinity "nss_queue0"                 3 2
+  set_affinity "nss_queue1"                 2 2
+  set_affinity "nss_queue2"                 1 2
+  set_affinity "nss_queue3"                 0 2
 
   # NSS Core 0 : 2 nss sos/queues to last core
-  set_affinity "nss_empty_buf_sos"        1-3 1
-  set_affinity "nss_empty_buf_queue"      2,3 1
+  set_affinity "nss_empty_buf_sos"          0 1
+  set_affinity "nss_empty_buf_queue"        0 1
 
   # NSS Core 1 : 1 nss sos to last core
   set_affinity "nss_empty_buf_sos"          3 2
+  set_affinity "nss_empty_buf_queue"        3 2
 
   # USB 3.0 : pin to 3rd core
-  set_affinity "xhci-hcd:usb1"            1,3 1
+  set_affinity "xhci-hcd:usb1"              2 1
+  set_affinity "xhci-hcd:usb2"              2 1
+  set_affinity "xhci-hcd:usb3"              2 1
 
   # TCL Completion, REO Dest, ERR, Exception and h2rxdma
   # are offloaded, so balance remaining IRQs accordingly.
   # PPDU IRQ : pin to 2nd and 3rd core
-  set_affinity 'ppdu-end-interrupts-mac1'   1 1
-  set_affinity 'ppdu-end-interrupts-mac3'   2 1
+  set_affinity 'ppdu-end-interrupts-mac1'   2 1
+  set_affinity 'ppdu-end-interrupts-mac2'   3 1
+  set_affinity 'ppdu-end-interrupts-mac3'   1 1
 
   set_affinity 'ath10k_pci'               2,3 1