diff --git a/roles/ssh/handlers/main.yml b/roles/ssh/handlers/main.yml
index b0b4d57..6018910 100644
--- a/roles/ssh/handlers/main.yml
+++ b/roles/ssh/handlers/main.yml
@@ -1,4 +1,6 @@
 ---
 - name: restart sshd
-  service: name=sshd.socket state=restarted
+  service:
+    name: sshd.service
+    state: restarted
   when: ssh.enable_sshd == True
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index 284aa95..629ff61 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -8,33 +8,22 @@
   template:
     src: sshd_config.j2
     dest: /etc/ssh/sshd_config
-
-- name: Create OpenSSH systemd unit file directory
-  file:
-    path: /etc/systemd/system/sshd.socket.d
-    state: directory
-
-- name: Push OpenSSH socket unit file
-  template:
-    src: sshd-socket-override.conf.j2
-    dest: /etc/systemd/system/sshd.socket.d/override.conf
   notify:
-    - reload systemd config
     - restart sshd
 
 - name: Enable and start OpenSSH
   service:
-    name: sshd.socket
+    name: sshd.service
     enabled: yes
     state: started
   when: ssh.enable_sshd is defined and ssh.enable_sshd == True
 
 - name: Disable and stop OpenSSH
   service:
-    name: sshd.socket
+    name: sshd.service
     enabled: no
     state: stopped
-  when: ssh.enable_sshd is defined and ssh.enable_sshd == True
+  when: ssh.enable_sshd is defined and ssh.enable_sshd == False
 
 - name: Install sshfs
   pacman:
diff --git a/roles/ssh/templates/sshd-socket-override.conf.j2 b/roles/ssh/templates/sshd-socket-override.conf.j2
deleted file mode 100644
index a14eb6a..0000000
--- a/roles/ssh/templates/sshd-socket-override.conf.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-[Socket]
-ListenStream=
-ListenStream={{ ssh.port }}