diff --git a/playbooks/02b-services-user.yml b/playbooks/02b-services-user.yml
index 00d976a..90fa7a3 100644
--- a/playbooks/02b-services-user.yml
+++ b/playbooks/02b-services-user.yml
@@ -2,24 +2,6 @@
 - name: "Deploy services"
   hosts: asgard
 
-  vars:
-    volumes:
-      rproxy:
-        - "etc-letsencrypt"
-      www: []
-      lrproxy:
-        - "etc-letsencrypt"
-      database:
-        - "wal"
-        - "data"
-      cloud:
-        - "nextcloud"
-        - "data"
-      git:
-        - "data"
-      notes:
-        - "data"
-
   tasks:
     - include_tasks: tasks/services/b-user/service-user.yml
       with_items: "{{ host_services }}"
diff --git a/plays/services/roles/base/meta/argument_spec.yml b/plays/services/roles/base/meta/argument_spec.yml
index c9349c1..164f019 100644
--- a/plays/services/roles/base/meta/argument_spec.yml
+++ b/plays/services/roles/base/meta/argument_spec.yml
@@ -8,6 +8,6 @@ argument_specs:
         type: "list"
         elem: "str"
         required: true
-      services_bridge_gateway:
+      services_base_bridge_gateway:
         type: "str"
         required: true
diff --git a/plays/services/roles/base/templates/user/veth/interface.j2 b/plays/services/roles/base/templates/user/veth/interface.j2
index 07de7f3..6d83e2e 100644
--- a/plays/services/roles/base/templates/user/veth/interface.j2
+++ b/plays/services/roles/base/templates/user/veth/interface.j2
@@ -7,9 +7,9 @@ iface {{ services_service_iface_name }} inet manual
 
     post-up ip -n {{ services_service_user_name }} link set veth0 up
     post-up ip -n {{ services_service_user_name }} address add {{ services_service_iface_address }}/24 dev veth0
-    post-up ip -n {{ services_service_user_name }} route add default via {{ services_bridge_gateway }} dev veth0
+    post-up ip -n {{ services_service_user_name }} route add default via {{ services_base_bridge_gateway }} dev veth0
 
-    pre-down ip -n {{ services_service_user_name }} route del default via {{ services_bridge_gateway }} dev veth0
+    pre-down ip -n {{ services_service_user_name }} route del default via {{ services_base_bridge_gateway }} dev veth0
     pre-down ip -n {{ services_service_user_name }} address del {{ services_service_iface_address }}/24 dev veth0
     pre-down ip -n {{ services_service_user_name }} link set veth0 down
 
diff --git a/plays/system/roles/base/meta/argument_specs.yml b/plays/system/roles/base/meta/argument_specs.yml
index 0527f24..92749ce 100644
--- a/plays/system/roles/base/meta/argument_specs.yml
+++ b/plays/system/roles/base/meta/argument_specs.yml
@@ -7,7 +7,7 @@ argument_specs:
       ansible_port:
         type: "int"
         required: true
-      ssh_user:
+      system_base_ssh_user:
         type: "str"
         required: true
       system_base_additional_ssh_users:
diff --git a/plays/system/roles/base/templates/sshd/99-local.conf.j2 b/plays/system/roles/base/templates/sshd/99-local.conf.j2
index 9b0a74c..173a7f7 100644
--- a/plays/system/roles/base/templates/sshd/99-local.conf.j2
+++ b/plays/system/roles/base/templates/sshd/99-local.conf.j2
@@ -7,7 +7,7 @@ Port {{ ansible_port }}
 PermitRootLogin no
 
 # Explicitly set the list of allowed ssh users.
-AllowUsers {{ [ssh_user] | union(system_base_additional_ssh_users) | join(" ") }}
+AllowUsers {{ [system_base_ssh_user] | union(system_base_additional_ssh_users) | join(" ") }}
 
 # SSH enabled only via ssh-key.
 PasswordAuthentication no