diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 160e7c7..bae3410 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -946,6 +946,9 @@ _tkg_srcprep() {
   if [[ "$_distro" = "Debian" || "$_distro" = "Ubuntu" ]]; then
     #Help Debian cert compile problem.
     scripts/config --set-str "SYSTEM_TRUSTED_KEYS" ""
+    #Debian/Ubuntu don't properly support zstd module compression
+    _disable "MODULE_COMPRESS_ZSTD"
+    _enable "MODULE_COMPRESS_NONE"
   fi
   # Skip dbg package creation on non-Arch
   if [ "$_distro" != "Arch" ]; then
@@ -1717,14 +1720,6 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
     fi
   fi
 
-  # Distro specific workarounds in the .config file, when using Arch config file by default
-  if [ -z  "$_configfile" ] || [ "$_configfile" = "config_hardened.x86_64" ]; then
-    if [[ "$_distro" =~ ^(Debian|Ubuntu)$ ]]; then
-      _disable "MODULE_COMPRESS_ZSTD"
-      _enable "MODULE_COMPRESS_NONE"
-    fi
-  fi
-
   # rewrite configuration
   msg2 "Setting config"
   make ${_config_updating} ${llvm_opt} |& tee -a "$_where"/logs/prepare.log.txt