diff --git a/books/base.yml b/books/base.yml
index fc123c3..2896714 100644
--- a/books/base.yml
+++ b/books/base.yml
@@ -9,6 +9,9 @@
   roles:
     - networking
     - base_config
+
+- hosts: all, !tests, !no_user,
+  roles:
     - create_users
     - ssh_totp
 
diff --git a/books/users.yml b/books/users.yml
index 38b7f62..03736fd 100644
--- a/books/users.yml
+++ b/books/users.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env ansible-playbook
 ---
 
-- hosts: all, !tests
+- hosts: all, !tests, !no_user
   roles:
     - create_users
     - base_totp
diff --git a/hosts b/hosts
index 521face..d96d57e 100644
--- a/hosts
+++ b/hosts
@@ -57,4 +57,6 @@ all:
     matrix:
       hosts:
         matrix_server:
-
+    no_user:
+      hosts:
+        matrix_server: