diff --git a/.github/workflows/m9s.yml b/.github/workflows/m9s.yml
index c847315..46ee276 100644
--- a/.github/workflows/m9s.yml
+++ b/.github/workflows/m9s.yml
@@ -32,7 +32,8 @@ jobs:
     - name: "Clone OpenWrt source code"
       run: |
         df -hT $PWD
-        git clone --depth=1 --branch "main" https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git clone https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git -C openwrt checkout 00ceb1ed1763f7479df6edf92ffada948f0e7d45
 
     - name: Load msm89xx target and packages
       run: |
diff --git a/.github/workflows/mf68e.yml b/.github/workflows/mf68e.yml
index 8b06705..c38f97a 100644
--- a/.github/workflows/mf68e.yml
+++ b/.github/workflows/mf68e.yml
@@ -32,7 +32,8 @@ jobs:
     - name: "Clone OpenWrt source code"
       run: |
         df -hT $PWD
-        git clone --depth=1 --branch "main" https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git clone https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git -C openwrt checkout 00ceb1ed1763f7479df6edf92ffada948f0e7d45
 
     - name: Load msm89xx target and packages
       run: |
diff --git a/.github/workflows/uf02.yml b/.github/workflows/uf02.yml
index 45d268e..94177ad 100644
--- a/.github/workflows/uf02.yml
+++ b/.github/workflows/uf02.yml
@@ -32,7 +32,8 @@ jobs:
     - name: "Clone OpenWrt source code"
       run: |
         df -hT $PWD
-        git clone --depth=1 --branch "main" https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git clone https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git -C openwrt checkout 00ceb1ed1763f7479df6edf92ffada948f0e7d45
 
     - name: Load msm89xx target and packages
       run: |
diff --git a/.github/workflows/uz801.yml b/.github/workflows/uz801.yml
index 49e3a87..2a77034 100644
--- a/.github/workflows/uz801.yml
+++ b/.github/workflows/uz801.yml
@@ -32,7 +32,8 @@ jobs:
     - name: "Clone OpenWrt source code"
       run: |
         df -hT $PWD
-        git clone --depth=1 --branch "main" https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git clone https://git.openwrt.org/openwrt/openwrt.git openwrt
+        git -C openwrt checkout 00ceb1ed1763f7479df6edf92ffada948f0e7d45
 
     - name: Load msm89xx target and packages
       run: |
diff --git a/devenv/Dockerfile b/devenv/Dockerfile
index f232ad2..fe26bcc 100644
--- a/devenv/Dockerfile
+++ b/devenv/Dockerfile
@@ -20,7 +20,8 @@ FROM base AS openwrt
 ENV BRANCH=main
 
 # Clone OpenWrt repository
-RUN git clone --depth=1 -b ${BRANCH} https://git.openwrt.org/openwrt/openwrt.git openwrt
+RUN git clone https://git.openwrt.org/openwrt/openwrt.git openwrt && \
+    git -C openwrt checkout 00ceb1ed1763f7479df6edf92ffada948f0e7d45
 
 # Apply patch inside openwrt directory
 COPY enable_wcn36xx_mac80211.patch .
diff --git a/diffconfig b/diffconfig
index 973cd4a..2fd4394 100644
--- a/diffconfig
+++ b/diffconfig
@@ -89,4 +89,6 @@ CONFIG_PACKAGE_ucode-mod-math=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
 CONFIG_PACKAGE_wireguard-tools=y
+CONFIG_PACKAGE_kmod-zram=y
+CONFIG_PACKAGE_zram-swap=y
 # CONFIG_TARGET_ROOTFS_EXT4FS is not set
diff --git a/diffconfig_m9s b/diffconfig_m9s
index 3664dda..16da736 100644
--- a/diffconfig_m9s
+++ b/diffconfig_m9s
@@ -91,4 +91,6 @@ CONFIG_PACKAGE_ucode-mod-math=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
 CONFIG_PACKAGE_wireguard-tools=y
+CONFIG_PACKAGE_kmod-zram=y
+CONFIG_PACKAGE_zram-swap=y
 # CONFIG_TARGET_ROOTFS_EXT4FS is not set
diff --git a/diffconfig_mf68e b/diffconfig_mf68e
index 3210102..afe5360 100644
--- a/diffconfig_mf68e
+++ b/diffconfig_mf68e
@@ -91,4 +91,6 @@ CONFIG_PACKAGE_ucode-mod-math=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
 CONFIG_PACKAGE_wireguard-tools=y
+CONFIG_PACKAGE_kmod-zram=y
+CONFIG_PACKAGE_zram-swap=y
 # CONFIG_TARGET_ROOTFS_EXT4FS is not set
diff --git a/diffconfig_uf02 b/diffconfig_uf02
index c22f17f..fd15b58 100644
--- a/diffconfig_uf02
+++ b/diffconfig_uf02
@@ -92,4 +92,6 @@ CONFIG_PACKAGE_ucode-mod-math=y
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
 CONFIG_PACKAGE_wireguard-tools=y
+CONFIG_PACKAGE_kmod-zram=y
+CONFIG_PACKAGE_zram-swap=y
 # CONFIG_TARGET_ROOTFS_EXT4FS is not set
diff --git a/enable_wcn36xx_mac80211.patch b/enable_wcn36xx_mac80211.patch
index e3ab51f..c05d307 100644
--- a/enable_wcn36xx_mac80211.patch
+++ b/enable_wcn36xx_mac80211.patch
@@ -1,18 +1,16 @@
-diff --git a/oopenwrt/package/kernel/mac80211/ath.mk b/openwrt/package/kernel/mac80211/ath.mk
-index 5b13b6a..f8c5edf 100644
+diff --git a/openwrt/package/kernel/mac80211/ath.mk b/openwrt/package/kernel/mac80211/ath.mk
 --- a/openwrt/package/kernel/mac80211/ath.mk
 +++ b/openwrt/package/kernel/mac80211/ath.mk
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  PKG_DRIVERS += \
 -	ath ath5k ath6kl ath6kl-sdio ath6kl-usb ath9k ath9k-common ath9k-htc ath10k ath10k-smallbuffers \
 -	ath11k ath11k-ahb ath11k-pci ath12k carl9170 owl-loader ar5523 wil6210 qcom-qmi-helpers
 +	ath ath5k ath6kl ath6kl-sdio ath6kl-usb ath9k ath9k-common ath9k-htc ath10k ath10k-sdio ath10k-smallbuffers \
 +	ath11k ath11k-ahb ath11k-pci ath12k carl9170 owl-loader ar5523 wil6210 wcn36xx qcom-qmi-helpers
-+
- 
+
  PKG_CONFIG_DEPENDS += \
  	CONFIG_PACKAGE_ATH_DEBUG \
-@@ -25,7 +26,8 @@ ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
+@@ -25,7 +25,8 @@
  	CARL9170_DEBUGFS \
  	ATH5K_DEBUG \
  	ATH6KL_DEBUG \
@@ -20,18 +18,18 @@ index 5b13b6a..f8c5edf 100644
 +	WIL6210_DEBUGFS \
 +	WCN36XX_DEBUGFS
  endif
- 
+
  ifdef CONFIG_PACKAGE_MAC80211_TRACING
-@@ -40,7 +42,7 @@ ifdef CONFIG_PACKAGE_MAC80211_TRACING
+@@ -40,7 +41,7 @@
  endif
- 
+
  config-$(call config_package,qcom-qmi-helpers) += QCOM_QMI_HELPERS
 -config-$(call config_package,ath,regular smallbuffers) += ATH_CARDS ATH_COMMON
 +config-$(call config_package,ath,regular sdio smallbuffers) += ATH_CARDS ATH_COMMON
  config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH11K_DEBUG ATH12K_DEBUG ATH9K_STATION_STATISTICS
  config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
  config-$(CONFIG_PACKAGE_ATH_SPECTRAL) += ATH9K_COMMON_SPECTRAL ATH10K_SPECTRAL ATH11K_SPECTRAL
-@@ -50,6 +52,7 @@ config-$(call config_package,ath9k-common) += ATH9K_COMMON
+@@ -50,6 +51,7 @@
  config-$(call config_package,owl-loader) += ATH9K_PCI_NO_EEPROM
  config-$(CONFIG_TARGET_ath79) += ATH9K_AHB
  config-$(CONFIG_TARGET_ipq40xx) += ATH10K_AHB
@@ -39,15 +37,15 @@ index 5b13b6a..f8c5edf 100644
  config-$(CONFIG_PCI) += ATH9K_PCI
  config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD ATH_REG_DYNAMIC_USER_REG_HINTS
  config-$(CONFIG_ATH9K_HWRNG) += ATH9K_HWRNG
-@@ -62,6 +65,7 @@ config-$(CONFIG_ATH11K_THERMAL) += ATH11K_THERMAL
- 
+@@ -62,6 +64,7 @@
+
  config-$(call config_package,ath9k-htc) += ATH9K_HTC
  config-$(call config_package,ath10k,regular) += ATH10K ATH10K_PCI
 +config-$(call config_package,ath10k-sdio,sdio) += ATH10K ATH10K_SDIO
  config-$(call config_package,ath10k-smallbuffers,smallbuffers) += ATH10K ATH10K_PCI ATH10K_SMALLBUFFERS
  config-$(call config_package,ath11k) += ATH11K
  config-$(call config_package,ath11k-ahb) += ATH11K_AHB
-@@ -140,7 +144,7 @@ endef
+@@ -140,7 +143,7 @@
  define KernelPackage/ath
    $(call KernelPackage/mac80211/Default)
    TITLE:=Atheros common driver part
@@ -56,16 +54,25 @@ index 5b13b6a..f8c5edf 100644
    FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko
    MENU:=1
  endef
-@@ -294,10 +298,30 @@ define KernelPackage/ath10k/config
- 
+@@ -295,11 +298,12 @@
+        config ATH10K_LEDS
+                bool "Enable LED support"
+                default y
+-               depends on PACKAGE_kmod-ath10k || PACKAGE_kmod-ath10k-smallbuffers
++               depends on PACKAGE_kmod-ath10k || PACKAGE_kmod-ath10k-sdio || PACKAGE_kmod-ath10k-smallbuffers
+
         config ATH10K_THERMAL
                 bool "Enable thermal sensors and throttling support"
 -               depends on PACKAGE_kmod-ath10k || PACKAGE_kmod-ath10k-smallbuffers
 +               default y
 +               depends on PACKAGE_kmod-ath10k || PACKAGE_kmod-ath10k-sdio || PACKAGE_kmod-ath10k-smallbuffers
- 
+
  endef
- 
+
+@@ -310,6 +314,25 @@
+   PROVIDES:=@kmod-ath10k-any
+ endef
+
 +define KernelPackage/ath10k-sdio
 +  $(call KernelPackage/mac80211/Default)
 +  TITLE:=Atheros 802.11ac SDIO wireless cards support
@@ -85,13 +92,13 @@ index 5b13b6a..f8c5edf 100644
 +Atheros IEEE 802.11ac family of chipsets with SDIO bus.
 +endef
 +
- define KernelPackage/ath10k-smallbuffers
-   $(call KernelPackage/ath10k)
-   TITLE+= (small buffers for low-RAM devices)
-@@ -356,6 +380,20 @@ This module adds support for Qualcomm Technologies 802.11ax family of
+ define KernelPackage/ath11k
+   $(call KernelPackage/mac80211/Default)
+   TITLE:=Qualcomm 802.11ax wireless chipset support (common code)
+@@ -362,6 +385,20 @@
  chipsets with PCI bus.
  endef
- 
+
 +define KernelPackage/wcn36xx
 +  $(call KernelPackage/mac80211/Default)
 +  TITLE:=Qualcomm Atheros WCN3660/3680 support