diff --git a/group_vars/crans_server/borg.yml b/group_vars/all/borg.yml
similarity index 100%
rename from group_vars/crans_server/borg.yml
rename to group_vars/all/borg.yml
diff --git a/group_vars/crans_server/vars.yml b/group_vars/crans_server/vars.yml
index f2463107540aef71e967a4ff393d394032722e64..b195184f06b5354d809a3449aeb072348d528c66 100644
--- a/group_vars/crans_server/vars.yml
+++ b/group_vars/crans_server/vars.yml
@@ -1,9 +1,3 @@
-ldap:
-  local: False
-  servers: ["172.16.1.1"]
-  base: "dc=crans,dc=org"
-
-
 # Parameters for debian and ubuntu mirror
 debian_mirror: http://mirror.adm.crans.org/debian
 ubuntu_mirror: http://mirror.adm.crans.org/ubuntu
diff --git a/group_vars/ovh/vars.yml b/group_vars/ovh/vars.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad05e34683564852df4e094b720ccaef7d666fb2
--- /dev/null
+++ b/group_vars/ovh/vars.yml
@@ -0,0 +1,5 @@
+# Parameters for debian and ubuntu mirror
+debian_mirror: http://deb.debian.org/debian
+ubuntu_mirror: http://deb.debian.org/ubuntu
+debian_components: main contrib non-free
+ubuntu_components: main restricted universe multiverse
diff --git a/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2 b/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2
index e8bbe8d247ff27563951c1d55e30db2189fba97e..61c03736a91ebb224ce7f85e24c32c9380db774a 100644
--- a/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2
+++ b/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2
@@ -1,3 +1,3 @@
 {{ ansible_header | comment }}
 
-deb http://{{ mirror.name }}/debian bullseye main
+deb {{ debian_mirror }} bullseye main
diff --git a/roles/prometheus-nginx-exporter/templates/nginx/status.j2 b/roles/prometheus-nginx-exporter/templates/nginx/status.j2
index 863b4b279148bb9e1a97c5073034f9b4ad5c9350..b9ed48c0cf2527ceff512d7801b6d0917098ad92 100644
--- a/roles/prometheus-nginx-exporter/templates/nginx/status.j2
+++ b/roles/prometheus-nginx-exporter/templates/nginx/status.j2
@@ -1,7 +1,7 @@
 {{ ansible_header | comment }}
 
 server {
-    listen [::1]:8080;
+    listen [::1]:6424;
     location = /stub_status {
         stub_status;
     }