diff --git a/playbooks/roles/letsencrypt-acme-sh-install/README.rst b/playbooks/roles/letsencrypt-acme-sh-install/README.rst
index d14c468fb1..59b1d57dfb 100644
--- a/playbooks/roles/letsencrypt-acme-sh-install/README.rst
+++ b/playbooks/roles/letsencrypt-acme-sh-install/README.rst
@@ -1,6 +1,6 @@
 Install acme.sh client
 
-This makes the `acme.sh <https://github.com/Neilpang/acme.sh>`__
+This makes the `acme.sh <https://github.com/acmesh-official/acme.sh>`__
 client available on the host.
 
 Additionally a ``driver.sh`` script is installed to run the
diff --git a/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml b/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
index 350e7a6cda..b771cd1656 100644
--- a/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
+++ b/playbooks/roles/letsencrypt-acme-sh-install/tasks/main.yaml
@@ -1,8 +1,12 @@
 - name: Install acme.sh client
   git:
-    repo: https://github.com/Neilpang/acme.sh
+    repo: https://github.com/acmesh-official/acme.sh
     dest: /opt/acme.sh
     version: dev
+  register: clone_acmesh_result
+  until: clone_acmesh_result is not failed
+  retries: 3
+  delay: 2
 
 - name: Install letsencrypt group
   group: