diff --git a/roles/codimd/tasks/main.yml b/roles/codimd/tasks/main.yml
index 7ea0069..f3b349f 100644
--- a/roles/codimd/tasks/main.yml
+++ b/roles/codimd/tasks/main.yml
@@ -22,6 +22,9 @@
     production: true
   become: true
   become_user: codimd
+  register: yarn_result
+  retries: 3
+  until: yarn_result is succeeded
 
 # Connection to database
 - name: Connect CodiMD to PostgreSQL db
diff --git a/roles/matrix-appservice-irc/tasks/main.yml b/roles/matrix-appservice-irc/tasks/main.yml
index 298efa4..4025fc7 100644
--- a/roles/matrix-appservice-irc/tasks/main.yml
+++ b/roles/matrix-appservice-irc/tasks/main.yml
@@ -20,6 +20,9 @@
     production: true
   become: true
   become_user: matrix-appservice-irc
+  register: npm_result
+  retries: 3
+  until: npm_result is succeeded
 
 # Configure
 - name: Configure matrix-appservice-irc