diff --git a/Makefile b/Makefile
index 0c1db72b..fd74f33b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ USERS_SCRIPT        := ./cli/generate_users.py
 INCLUDES_SCRIPT     := ./cli/generate_playbook.py
 
 # Define the prefixes for which we want individual role-include files
-INCLUDE_GROUPS      := "web-" "svc-"
+INCLUDE_GROUPS      := "drv-" "svc-" "desk-" "web-" "util-"
 
 # Directory where these include-files will be written
 INCLUDES_OUT_DIR    := ./tasks/groups
diff --git a/roles/drv-epson-multiprinter/vars/main.yml b/roles/drv-epson-multiprinter/vars/main.yml
new file mode 100644
index 00000000..8b670473
--- /dev/null
+++ b/roles/drv-epson-multiprinter/vars/main.yml
@@ -0,0 +1 @@
+application_id: epson-multiprinter
diff --git a/roles/drv-intel/vars/main.yml b/roles/drv-intel/vars/main.yml
new file mode 100644
index 00000000..b922dc9d
--- /dev/null
+++ b/roles/drv-intel/vars/main.yml
@@ -0,0 +1 @@
+application_id: intel
diff --git a/roles/drv-lid-switch/vars/main.yml b/roles/drv-lid-switch/vars/main.yml
new file mode 100644
index 00000000..8997ffe1
--- /dev/null
+++ b/roles/drv-lid-switch/vars/main.yml
@@ -0,0 +1 @@
+application_id: lid-switch
diff --git a/roles/drv-msi-keyboard-color/vars/main.yml b/roles/drv-msi-keyboard-color/vars/main.yml
new file mode 100644
index 00000000..6770d79f
--- /dev/null
+++ b/roles/drv-msi-keyboard-color/vars/main.yml
@@ -0,0 +1 @@
+application_id: msi-keyboard-color
diff --git a/roles/drv-non-free/vars/main.yml b/roles/drv-non-free/vars/main.yml
new file mode 100644
index 00000000..2bdbcf05
--- /dev/null
+++ b/roles/drv-non-free/vars/main.yml
@@ -0,0 +1 @@
+application_id: non-free
diff --git a/tests/integration/test_application_id_consistency.py b/tests/integration/test_application_id_consistency.py
index d879b2bb..fc7e13a3 100644
--- a/tests/integration/test_application_id_consistency.py
+++ b/tests/integration/test_application_id_consistency.py
@@ -9,7 +9,7 @@ ROLES_DIR = Path(__file__).resolve().parent.parent.parent / "roles"
 class TestApplicationIdConsistency(unittest.TestCase):
     def test_application_id_matches_docker_prefix(self):
         failed_roles = []
-        prefixes = ("web-app-", "web-svc-", "desk-", "util-")
+        prefixes = ("web-app-", "web-svc-", "desk-", "util-", "drv-")
 
         for role_path in ROLES_DIR.iterdir():
             if not role_path.is_dir():