diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile
index d480e132..4303940b 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 d5c50dd6..ff9cb57f 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 35946b27..5d700f7f 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 4b5204e0..28d34764 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 255740e4..803f018f 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 4792e3d3..6a8a3f2c 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 455bcb25..0208ace2 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 1547985c..775f92f1 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 99799927..55370abe 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