diff --git a/roles/ssh/defaults/main.yaml b/roles/ssh/defaults/main.yaml
index 8f7d2cf..30a6a31 100644
--- a/roles/ssh/defaults/main.yaml
+++ b/roles/ssh/defaults/main.yaml
@@ -1,3 +1,2 @@
 ---
-sshd_x11_forwarding: false
-sshd_password_auth: false
+ssh_password_auth: false
diff --git a/roles/ssh/tasks/main.yaml b/roles/ssh/tasks/main.yaml
index 11cfa75..396dc36 100644
--- a/roles/ssh/tasks/main.yaml
+++ b/roles/ssh/tasks/main.yaml
@@ -8,6 +8,6 @@
     validate: '/usr/sbin/sshd -t -f %s'
   notify: Restart sshd
   with_dict:
-    PermitRootLogin: 'prohibit-password'
-    PasswordAuthentication: "{{ 'yes' if sshd_password_auth else 'no' }}"
-    X11Forwarding: "{{ 'yes' if sshd_x11_forwarding else 'no' }}"
+    PermitRootLogin: "prohibit-password"
+    PasswordAuthentication: "{{ 'yes' if ssh_password_auth else 'no' }}"
+    X11Forwarding: "no"