diff --git a/handlers/main.yml b/handlers/main.yml
index 304fe01d25e1bc32b55271f2e1ecd11e789067b4..b745bf942311bc8a6f00fa4379b33eba02cb0f5f 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -16,7 +16,7 @@
 
 - name: Restart ssh
   service:
-    name: ssh
+    name: '{{ ssh_daemon[ansible_os_family] }}'
     state: restarted
 
 - name: Restart Collectd
diff --git a/tasks/lock_root.yml b/tasks/lock_root.yml
index 11d939d702163597bd9e842ab2381bb1b05edcf3..9ac64cc9cdc414b9850dc066eb31a9abc25190f1 100644
--- a/tasks/lock_root.yml
+++ b/tasks/lock_root.yml
@@ -3,7 +3,7 @@
 - name: Disable root account
   user:
     name: root
-    password: ''
+    password: '*************'
   register: lock_root
   changed_when: not (lock_root.stderr is defined and 'no changes' in lock_root.stderr)
 
diff --git a/tasks/openbsd_bootstrap.yml b/tasks/openbsd_bootstrap.yml
index 7d0ca7b2d18fde8e8b261b99a1130d2c1d4e0270..677bf12ce475f89fe2dc043a132ee6abbc605b38 100644
--- a/tasks/openbsd_bootstrap.yml
+++ b/tasks/openbsd_bootstrap.yml
@@ -7,11 +7,10 @@
   changed_when: "'python' in openbsd_pkg_add_python.stdout"
 
 - name: Symlink python
-  file:
-    path: /usr/bin/python
-    src: /usr/local/bin/python2.7
-    state: link
-    force: yes
+  raw: ln -s /usr/local/bin/python2.7 /usr/bin/python
+  register: symlink_python
+  changed_when: not 'File exists' in symlink_python.stderr
+  failed_when: symlink_python|failed and not 'File exists' in symlink_python.stdout_lines[0]
 
 - name: Gather facts
   setup:
diff --git a/vars/main.yml b/vars/main.yml
index a89cf1af9038aaa9155f482466c104e5c0d125cc..a4b91f636334a432d0fe84d153dc7d57e98d7e06 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -32,10 +32,12 @@ openbsd_collectd_version:
     '5.8': 'collectd-5.5.0p1'
 
 openbsd_pkg_mirror: http://www.mirrorservice.org/pub
-ansible_python_interpreter: '{{ "/usr/local/bin/python2.7" if openbsd_bootstrap is defined else omit }}'
 update_ca_certificates:
     OpenBSD: /usr/local/sbin/update-ca-certificates
     Debian: /usr/sbin/update-ca-certificates
 ca_store:
     OpenBSD: /etc/ssl/cert.pem
     Debian: /etc/ssl/certs/ca-certificates.crt
+ssh_daemon:
+    OpenBSD: sshd
+    Debian: ssh