diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all/main.yml
similarity index 97%
rename from inventory/group_vars/all.yml
rename to inventory/group_vars/all/main.yml
index 27bf402..99f1285 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all/main.yml
@@ -43,3 +43,4 @@ common_packages:
 ntp_servers:
   - 0.us.pool.ntp.org
   - 1.us.pool.ntp.org
+ansible_become: true
diff --git a/inventory/group_vars/all/vault.yml b/inventory/group_vars/all/vault.yml
new file mode 100644
index 0000000..fb955c2
--- /dev/null
+++ b/inventory/group_vars/all/vault.yml
@@ -0,0 +1,12 @@
+---
+vault_acme_email: "Jeremy@hobbs.farm"
+vault_cloudflare_api_token: "OrayfA6wXHln7dOH2eLpy9Yi3eU57fduehq1eYVU"
+vault_grafana_admin_password: "admin"
+vault_matrix_shared_secret: "nYS75Wug@Fqsyd*;Pj7z-QQfN;9jjXmh:g7Pwb0Xy2X&M_-iWM"
+vault_vaultwarden_admin_token: "SiNVsGHA/fKyfCkv+prnh7ywh5OevicCMKLv3XHxLvQ8BUO6zVY+ubdi3P4zKzyT"
+vault_guacamole_db_password: "bigdog01"
+vault_gitea_db_password: "xAbt2gWIszjVPxP5bczCWhQH"
+vault_semaphore_db_password: "ecXRjUeee6BJQgDzzpxKDxAc"
+vault_smtp_host: ""
+vault_slack_webhook: ""
+ansible_become_password: "&Rip8a115"
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index e3e8b1c..872f833 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
 - name: Restart sshd
   ansible.builtin.systemd:
-    name: sshd
+    name: ssh
     state: restarted
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 74c3bcb..ed07ba5 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -40,7 +40,7 @@
 
 - name: Ensure SSH is running
   ansible.builtin.systemd:
-    name: sshd
+    name: ssh
     state: started
     enabled: true
   tags: [common, ssh]
diff --git a/roles/common/templates/sshd_config.j2 b/roles/common/templates/sshd_config.j2
index f8af40a..9d210f8 100644
--- a/roles/common/templates/sshd_config.j2
+++ b/roles/common/templates/sshd_config.j2
@@ -1,4 +1,5 @@
 # Managed by Ansible - do not edit manually
+Include /etc/ssh/sshd_config.d/*.conf
 Port {{ sshd_port }}
 AddressFamily any
 ListenAddress 0.0.0.0