diff --git a/Makefile b/Makefile
index e69c0034..d1ee6a62 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ USERS_OUT           := ./group_vars/all/03_users.yml
 USERS_SCRIPT        := ./cli/build/defaults/users.py
 INCLUDES_SCRIPT     := ./cli/build/role_include.py
 
-INCLUDE_GROUPS := $(shell python3 main.py meta invokable_paths -s "-" --no-signal | tr '\n' ' ')
+INCLUDE_GROUPS := $(shell python3 main.py meta categories invokable -s "-" --no-signal | tr '\n' ' ')
 
 # Directory where these include-files will be written
 INCLUDES_OUT_DIR    := ./tasks/groups
diff --git a/roles/categories.yml b/roles/categories.yml
index 2271c200..feefd371 100644
--- a/roles/categories.yml
+++ b/roles/categories.yml
@@ -102,9 +102,13 @@ roles:
     invokable: true
   svc:
     title: "Services"
-    description: "Docker infrastructure services (DBMS, LDAP, Redis, etc.)"
-    icon: "fas fa-database"
-    invokable: true
+    description: "Infrastructure services like databases"
+    invokable: false
+    db:  
+      title: "Databases"
+      description: "Database applications (DBMS, LDAP, Redis, etc.)"
+      icon: "fas fa-database"
+      invokable: true
     opt:
       title: "Service Optimation"
       description: "Optimation Services to improve your system"
diff --git a/tasks/stages/01_constructor.yml b/tasks/stages/01_constructor.yml
index 51fd0840..677f96dd 100644
--- a/tasks/stages/01_constructor.yml
+++ b/tasks/stages/01_constructor.yml
@@ -107,5 +107,6 @@
     - drv
     - gen
     - net
+    - svc-db
   loop_control:
     label: "{{ item }}-roles.yml"
\ No newline at end of file
diff --git a/tasks/stages/02_server.yml b/tasks/stages/02_server.yml
index 57f00c74..764d83a2 100644
--- a/tasks/stages/02_server.yml
+++ b/tasks/stages/02_server.yml
@@ -13,6 +13,7 @@
 - name: "Include server roles"
   include_tasks: "./tasks/groups/{{ item }}-roles.yml"
   loop:
+    - svc-db
     - util-srv
     - web-svc # Services need to run before applications
     - web-app