diff --git a/playbooks/deploy-containers.yml b/playbooks/deploy-containers.yml
new file mode 100644
index 0000000..937ddfe
--- /dev/null
+++ b/playbooks/deploy-containers.yml
@@ -0,0 +1,11 @@
+---
+
+- name: 'Common setup for all containers'
+  hosts: containers
+  vars_prompt:
+    - name: admin_password
+      prompt: Local administrator password for containers
+  roles:
+    - common
+    - aur
+    - pamconfig
diff --git a/playbooks/deploy-desktop.yml b/playbooks/deploy-desktop.yml
index 31c2683..0694b52 100644
--- a/playbooks/deploy-desktop.yml
+++ b/playbooks/deploy-desktop.yml
@@ -5,4 +5,3 @@
   roles:
     - aur
     - kanidm_native
-    - 2fa
diff --git a/playbooks/deploy-nginx.yml b/playbooks/deploy-nginx.yml
index 1013b34..d7f0736 100644
--- a/playbooks/deploy-nginx.yml
+++ b/playbooks/deploy-nginx.yml
@@ -2,5 +2,10 @@
 
 - name: Configure Nginx proxy
   hosts: nginx
+  vars_prompt:
+    - name: admin_password
+      prompt: Enter the administrator password that will be used for this system
+              
   roles:
+    - common
     - nginx
diff --git a/playbooks/deploy-unifi.yml b/playbooks/deploy-unifi.yml
new file mode 100644
index 0000000..2dd9404
--- /dev/null
+++ b/playbooks/deploy-unifi.yml
@@ -0,0 +1,11 @@
+---
+
+- name: Configure UniFi Network Server
+  hosts: unifi
+  vars_prompt:
+    - name: admin_password
+      prompt: Enter the administrator password that will be used for this system
+
+  roles:
+    - common
+    - unifi_network_server