diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile
index d480e13222729d2c0cdc2f9dd9fd3ac95f486ba1..4303940b4b61a2edc4585152f21ffa232f39cfe4 100644
--- a/package/gluon-config-mode-autoupdater/Makefile
+++ b/package/gluon-config-mode-autoupdater/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Let the user know whether the autoupdater is enabled or not.
-  DEPENDS:=+gluon-config-mode-core +gluon-autoupdater
+  DEPENDS:=gluon-config-mode-core-virtual +gluon-autoupdater
 endef
 
 define Package/gluon-config-mode-autoupdater/description
diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile
index d5c50dd6d2c493e2eda4011434338d1c4e5be9db..ff9cb57f8c51ebb415895df040138bf7935f6ae9 100644
--- a/package/gluon-config-mode-contact-info/Makefile
+++ b/package/gluon-config-mode-contact-info/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-contact-info
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Set a custom string that will be distributed in the mesh.
-  DEPENDS:=+gluon-config-mode-core +gluon-node-info
+  DEPENDS:=gluon-config-mode-core-virtual +gluon-node-info
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index 35946b27d95bde0bedfa9627040790f9722c8e17..5d700f7f0c3a389c30cc06dc3a6c9cf00377ffae 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -17,7 +17,8 @@ define Package/gluon-config-mode-core
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Luci based config mode for user friendly setup of new mesh nodes
-  DEPENDS:=+gluon-setup-mode +gluon-luci-theme +gluon-lock-password $(GLUON_I18N_PACKAGES)
+  DEPENDS:=gluon-setup-mode-virtual +gluon-luci-theme +gluon-lock-password $(GLUON_I18N_PACKAGES)
+  PROVIDES:=gluon-config-mode-core-virtual
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile
index 4b5204e0fbe0c10ee5f517790a1009c2d5cb4664..28d347643e54bb9a3fc94e8d340b3a3043c0bd50 100644
--- a/package/gluon-config-mode-geo-location/Makefile
+++ b/package/gluon-config-mode-geo-location/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-geo-location
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Set geographic location of a node
-  DEPENDS:=+gluon-config-mode-core +gluon-node-info
+  DEPENDS:=gluon-config-mode-core-virtual +gluon-node-info
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile
index 255740e48d12f2a4c0df189e4251f55e97f647af..803f018f3f76385eb0555eecf1974b79e1cdff18 100644
--- a/package/gluon-config-mode-hostname/Makefile
+++ b/package/gluon-config-mode-hostname/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-hostname
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Set the hostname
-  DEPENDS:=+gluon-config-mode-core
+  DEPENDS:=gluon-config-mode-core-virtual
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile
index 4792e3d328ee2c68af4d447cc19961d4cd3f36dc..6a8a3f2c08ad676bdf39202b34ce5b9c569714cf 100644
--- a/package/gluon-config-mode-mesh-vpn/Makefile
+++ b/package/gluon-config-mode-mesh-vpn/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-mesh-vpn
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Toggle mesh-vpn and bandwidth limit
-  DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-fastd +gluon-simple-tc
+  DEPENDS:=gluon-config-mode-core-virtual +gluon-mesh-vpn-fastd +gluon-simple-tc
 endef
 
 define Build/Prepare
diff --git a/package/gluon-luci-admin/Makefile b/package/gluon-luci-admin/Makefile
index 455bcb25b973dd2323125c2aae0a74a77aba91cf..0208ace242f6dee9b7efc88155a2b8450ba2b3a9 100644
--- a/package/gluon-luci-admin/Makefile
+++ b/package/gluon-luci-admin/Makefile
@@ -15,7 +15,7 @@ define Package/gluon-luci-admin
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Luci based simple administration interface for mesh nodes
-  DEPENDS:=+gluon-config-mode-core
+  DEPENDS:=gluon-config-mode-core-virtual
 endef
 
 define Package/gluon-luci-admin/description
diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile
index 1547985c3b2a1e8451034cb7de495f9e76f2c6bb..775f92f114502ebd5a0495a92091a21f422eb941 100644
--- a/package/gluon-mesh-vpn-fastd/Makefile
+++ b/package/gluon-mesh-vpn-fastd/Makefile
@@ -11,7 +11,7 @@ define Package/gluon-mesh-vpn-fastd
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Support for connecting batman-adv meshes via fastd
-  DEPENDS:=+gluon-core +gluon-mesh-batman-adv +gluon-wan-dnsmasq +fastd +iptables-mod-extra
+  DEPENDS:=+gluon-core gluon-mesh-batman-adv +gluon-wan-dnsmasq +fastd +iptables-mod-extra
 endef
 
 define Package/gluon-mesh-vpn-fastd/description
diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile
index 99799927e3a9a36dd75cbdc2f931ad706b86fbf3..55370abee6f755ac14400c88ceb1cb3e9e202957 100644
--- a/package/gluon-setup-mode/Makefile
+++ b/package/gluon-setup-mode/Makefile
@@ -15,6 +15,7 @@ define Package/gluon-setup-mode
   CATEGORY:=Gluon
   TITLE:=Setup mode
   DEPENDS:=+gluon-core +uhttpd +dnsmasq
+  PROVIDES:=gluon-setup-mode-virtual
 endef
 
 define Package/gluon-setup-mode/description