diff --git a/roles/re2o-firewall-gulp/tasks/main.yml b/roles/re2o-firewall-gulp/tasks/main.yml
index f83c648c..056f604b 100644
--- a/roles/re2o-firewall-gulp/tasks/main.yml
+++ b/roles/re2o-firewall-gulp/tasks/main.yml
@@ -3,6 +3,6 @@
   template:
     src: re2o-services/firewall/firewall_config.py.j2
     dest: /var/local/re2o-services/firewall/firewall_config.py
-    mode: 644
+    mode: '644'
     owner: root
     group: root
diff --git a/roles/re2o-firewall-ipv6-zayo/tasks/main.yml b/roles/re2o-firewall-ipv6-zayo/tasks/main.yml
index f52e861b..b002e58b 100644
--- a/roles/re2o-firewall-ipv6-zayo/tasks/main.yml
+++ b/roles/re2o-firewall-ipv6-zayo/tasks/main.yml
@@ -3,6 +3,6 @@
   template:
     src: re2o-services/firewall/firewall_config.py.j2
     dest: /var/local/re2o-services/firewall/firewall_config.py
-    mode: 644
+    mode: '644'
     owner: root
     group: root
diff --git a/roles/re2o-firewall-odlyd/tasks/main.yml b/roles/re2o-firewall-odlyd/tasks/main.yml
index 7674d761..fbdf1a66 100644
--- a/roles/re2o-firewall-odlyd/tasks/main.yml
+++ b/roles/re2o-firewall-odlyd/tasks/main.yml
@@ -3,6 +3,6 @@
   template:
     src: re2o-services/firewall/firewall_config.py.j2
     dest: /var/local/re2o-services/firewall/firewall_config.py
-    mode: 644
+    mode: '644'
     owner: root
     group: root
diff --git a/roles/re2o-firewall-routeur/tasks/main.yml b/roles/re2o-firewall-routeur/tasks/main.yml
index 8234f384..0ccef3db 100644
--- a/roles/re2o-firewall-routeur/tasks/main.yml
+++ b/roles/re2o-firewall-routeur/tasks/main.yml
@@ -3,6 +3,6 @@
   template:
     src: re2o-services/firewall/firewall_config.py.j2
     dest: /var/local/re2o-services/firewall/firewall_config.py
-    mode: 644
+    mode: '644'
     owner: root
     group: root
diff --git a/roles/re2o-firewall-zamok/tasks/main.yml b/roles/re2o-firewall-zamok/tasks/main.yml
index 44420fa2..79a8e51c 100644
--- a/roles/re2o-firewall-zamok/tasks/main.yml
+++ b/roles/re2o-firewall-zamok/tasks/main.yml
@@ -3,6 +3,6 @@
   template:
     src: re2o-services/firewall/firewall_config.py.j2
     dest: /var/local/re2o-services/firewall/firewall_config.py
-    mode: 644
+    mode: '644'
     owner: root
     group: root
diff --git a/roles/re2o-home/tasks/main.yml b/roles/re2o-home/tasks/main.yml
index 9a2195b0..4de08999 100644
--- a/roles/re2o-home/tasks/main.yml
+++ b/roles/re2o-home/tasks/main.yml
@@ -20,6 +20,7 @@
   git:
     repo: 'http://gitlab.adm.crans.org/nounous/re2o-home.git'
     dest: /var/local/re2o-services/home
+    version: master
     umask: '002'
 
 - name: Create symbolic link to configuration
diff --git a/roles/re2o-notif-users/tasks/main.yml b/roles/re2o-notif-users/tasks/main.yml
index d00bf226..f1954db4 100644
--- a/roles/re2o-notif-users/tasks/main.yml
+++ b/roles/re2o-notif-users/tasks/main.yml
@@ -20,6 +20,7 @@
   git:
     repo: 'http://gitlab.adm.crans.org/nounous/re2o-notif-users.git'
     dest: /var/local/re2o-services/notif-users
+    version: master
     umask: '002'
 
 - name: Create symbolic link to configuration
diff --git a/roles/scripts/tasks/main.yml b/roles/scripts/tasks/main.yml
index d9689b53..961165a1 100644
--- a/roles/scripts/tasks/main.yml
+++ b/roles/scripts/tasks/main.yml
@@ -20,4 +20,5 @@
   git:
     repo: 'http://gitlab.adm.crans.org/nounous/scripts.git'
     dest: /usr/scripts
+    version: master
     umask: '002'