diff --git a/groups/features.py b/groups/features.py
index 54a58a7..fca9379 100644
--- a/groups/features.py
+++ b/groups/features.py
@@ -17,3 +17,12 @@ groups['dns'] = {
         },
     },
 }
+
+groups['switches-mikrotik'] = {
+    'bundles': {
+        'routeros',
+    },
+    'locking_node': 'home.router',
+    'os': 'routeros',
+    'username': 'admin',
+}
diff --git a/nodes/home.switch-rack.toml b/nodes/home.switch-rack.toml
index 1944e1e..57014f0 100644
--- a/nodes/home.switch-rack.toml
+++ b/nodes/home.switch-rack.toml
@@ -1,6 +1,3 @@
-bundles = ["routeros"]
+groups = ["switches-mikrotik"]
 hostname = "172.19.138.4"
-locking_node = "home.router"
-os = "routeros"
 password = "encrypt$gAAAAABkI1Eqsust7XuYFK2-FaRzXWM5fOXumhdi5fWNokLtM0CBAqVqc5zcg37XH_JIZvkhp3buKvswcvd_znaV3Rb8kKeJTs4_VJo6OsvbiWkujfT50HspoUXER0JSZSmeZts8a_2i"
-username = "admin"