diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index f63bfc69..676f218f 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -495,7 +495,6 @@ necessary_kconfig_options_containers = {
     ">=3.6": {
         "all": {  # all arches
             "MEMCG": True,
-            "MEMCG_SWAP": True,
             "DM_THIN_PROVISIONING": True,  # Storage Drivers
         },
         "x86 x86_64": {  # only for x86, x86_64 (and sparc64, ia64)
@@ -503,6 +502,11 @@ necessary_kconfig_options_containers = {
             "CGROUP_HUGETLB": True,  # Optional section
         }
     },
+    ">=3.6 <6.1": {  # option has been dropped
+        "all": {
+            "MEMCG_SWAP": True,
+        }
+    },
     ">=3.7 <5.0": {
         "all": {
             "NF_NAT_IPV4": True,  # Needed for lxc