diff --git a/tasks/jailkit.yml b/tasks/jailkit.yml
index 2b535a29a5677eaea5d651768e678eff06bc002a..fde538394c3985b1a600d207ed883e9d4404fafd 100644
--- a/tasks/jailkit.yml
+++ b/tasks/jailkit.yml
@@ -30,6 +30,12 @@
   import_tasks: install.yml
   when: jailkit_available is defined and jailkit_available.stdout != '/usr/sbin/jk_init'
 
+# See https://savannah.nongnu.org/bugs/?58804
+- name: Patch JK Lib
+  command: sed -i 's/+chroot+rfile+/+chrootrfile+/g' /usr/share/jailkit/jk_lib.py
+  tags:
+    - always
+
 - name: Create Jail Root Directory
   file:
     path: '{{ jailroot }}'
diff --git a/tasks/updatejail.yml b/tasks/updatejail.yml
index 10f067750da354ff1f6eed1ba5969c472085c87c..dd226f1983cbd9ae72c7335c30956351a9517545 100644
--- a/tasks/updatejail.yml
+++ b/tasks/updatejail.yml
@@ -4,7 +4,7 @@
 - block:
 
   - name: JailKit Update Components
-    shell: jk_init -j {{ jailroot }}/{{ drupal.jail.name }} {{ jailkit_components }}
+    shell: jk_init {% if force|default('no')=='yes' %}-f {% endif %}-j {{ jailroot }}/{{ drupal.jail.name }} {{ jailkit_components }}
 
   - name: JailKit Update Directories
     shell: jk_update -j {{ jailroot }}/{{ drupal.jail.name }} --skip={{ jailroot }}/{{ drupal.jail.name }}/home/{{ drupal.jail.name }} --skip=/etc/drush/aliases.drushrc.php /bin /dev /etc /home /lib /lib64 /opt /usr
diff --git a/templates/jk_init.ini b/templates/jk_init.ini
index 0270be5c176967acc3bce2d432b745de4f4fd994..28e6532ccd7b9bac54fb6614a0b7456631bf0cbd 100644
--- a/templates/jk_init.ini
+++ b/templates/jk_init.ini
@@ -77,7 +77,7 @@ includesections = basicshell
 
 [zsh]
 comment = zsh shell
-paths = /usr/bin/zsh, /etc/zsh, /usr/lib/x86_64-linux-gnu/zsh, /usr/share/zsh
+paths = /bin/zsh, /usr/bin/zsh, /etc/zsh, /usr/lib/x86_64-linux-gnu/zsh, /usr/share/zsh
 users = root
 groups = root
 includesections = basicshell