diff --git a/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml b/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
index 2db5c2cf97..c441f8b629 100644
--- a/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
+++ b/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
@@ -2,12 +2,20 @@
   git:
     repo: https://github.com/acmesh-official/acme.sh
     dest: /opt/acme.sh
+    # Pinned due to https://github.com/acmesh-official/acme.sh/issues/4416
     version: 3.0.5
   register: clone_acmesh_result
   until: clone_acmesh_result is not failed
   retries: 3
   delay: 2
 
+# Temporary https://github.com/acmesh-official/acme.sh/issues/4659 fix
+# until we can upgrade to 3.0.6 or later
+- name: Patch for issue 4659
+  shell: |
+    git -C /opt/acme.sh cherry-pick 4c30250
+    git -C /opt/acme.sh cherry-pick 327e2fb
+
 - name: Install letsencrypt group
   group:
     name: letsencrypt