diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg
index edf099325e652182d96a9942700336ec47561b60..75e6d760e90929923d888684e53c90a8a99c75aa 100644
--- a/software/kvm/buildout.hash.cfg
+++ b/software/kvm/buildout.hash.cfg
@@ -27,7 +27,7 @@ md5sum = 352f18067714501c8ccee55f8930d245
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
-md5sum = 6677ac6074f6be671fe8e8b8a6a4afe8
+md5sum = 7d4b14660b7a30084aa7e023b0db50be
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in
diff --git a/software/kvm/instance-kvm-resilient.cfg.jinja2 b/software/kvm/instance-kvm-resilient.cfg.jinja2
index b9209dd252e9b30455904e79ed6a8addae5999f9..38b42dd15c2d39af9c0b945c7a00bee32be1f25a 100644
--- a/software/kvm/instance-kvm-resilient.cfg.jinja2
+++ b/software/kvm/instance-kvm-resilient.cfg.jinja2
@@ -64,7 +64,7 @@ promises = ${:etc}/promise
 # Note: += doesn't work.
 return =
 # Resilient related parameters
-  url ssh-public-key ssh-url notification-id ip {{ monitor_return | join(' ') }}
+  url ssh-public-key resilient-ssh-url notification-id ip {{ monitor_return | join(' ') }}
 # KVM related parameters
 # XXX: return ALL parameters (like nat rules), through jinja
   backend-url url ip
diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg
index 7355632cfdebd7f239d85e86a94a0d791e4bb781..d6d929111e78b6c236bc03176eced5c53804519d 100644
--- a/software/slaprunner/buildout.hash.cfg
+++ b/software/slaprunner/buildout.hash.cfg
@@ -34,7 +34,7 @@ md5sum = b992bb3391de9d6d422bfa8011d8ffc4
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2
-md5sum = bed1c457aa9e54a59b64d167bdafe970
+md5sum = 0f3d75ca834839c5ae04e9c26cca289a
 
 [template_nginx_conf]
 filename = nginx_conf.in
diff --git a/software/slaprunner/instance-resilient.cfg.jinja2 b/software/slaprunner/instance-resilient.cfg.jinja2
index 54c1645d7dc1abf194349aea8ad591e9fa8cf425..5d23a95baaea0a26a72fb7621257640011397462 100644
--- a/software/slaprunner/instance-resilient.cfg.jinja2
+++ b/software/slaprunner/instance-resilient.cfg.jinja2
@@ -12,7 +12,7 @@
   {% set number_of_instances = 2 %}
 {% endif %}
 
-{% set slaprunner_return = ['init-user', 'init-password', 'url', 'ssh-public-key', 'ssh-url', 'notification-id', 'ip', 'backend-url', 'url', 'ssh-command', 'webdav-url', 'public-url', 'git-public-url', 'git-private-url'] -%}
+{% set slaprunner_return = ['init-user', 'init-password', 'url', 'ssh-public-key', 'resilient-ssh-url', 'notification-id', 'ip', 'backend-url', 'url', 'ssh-url', 'ssh-command', 'webdav-url', 'public-url', 'git-public-url', 'git-private-url'] -%}
 {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
 {% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}
diff --git a/stack/lapp/apache/instance-apache-export.cfg.jinja2 b/stack/lapp/apache/instance-apache-export.cfg.jinja2
index 050d50b82c414479fefc574ccfa57d67f86c8873..3b20289a5ecf45638a05ee6e4fcfc307af2560d5 100644
--- a/stack/lapp/apache/instance-apache-export.cfg.jinja2
+++ b/stack/lapp/apache/instance-apache-export.cfg.jinja2
@@ -55,4 +55,4 @@ path = ${directory:www}
 # XXX-Cedric: change the request method to return everything from
 #             getConnectionParameterDict()
 [request-postgres]
-return = ssh-public-key ssh-url notification-id ip url
+return = ssh-public-key resilient-ssh-url notification-id ip url
diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg
index 4f2321b28f47ff164c5088e6678b062e80156235..148c2b84ce08107d011c772123599aa87027408c 100644
--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -86,7 +86,7 @@ context = key templateapache instance-apache-php:output
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = dca811871e293cf3ce1bfc52dd8dab64
+md5sum = e679cbe62f17bb320a22444425e1401a
 mode = 0644
 
 [instance-resilient]
@@ -102,7 +102,7 @@ context = key buildout buildout:bin-directory
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = e8fd20a32c87853ecba2846f50cd0898
+md5sum = 20b4f2d8125a4f9cab5b9145be6b47b5
 mode = 0644
 
 [instance-postgres]
diff --git a/stack/lapp/instance-resilient.cfg.jinja2 b/stack/lapp/instance-resilient.cfg.jinja2
index 628f408343f1ea2061c3b5d5f7a47247e2474b49..0bbd9768664e4381fa9bc25c4e1f0297c85f8212 100644
--- a/stack/lapp/instance-resilient.cfg.jinja2
+++ b/stack/lapp/instance-resilient.cfg.jinja2
@@ -17,7 +17,7 @@ parts +=
 
 # Bubble up the parameters
 [request-apache]
-return = url ssh-public-key ssh-url notification-id ip url backend_url
+return = url ssh-public-key resilient-ssh-url notification-id ip url backend_url
 # XXX: hardcoded values
 config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid}
 config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid}
diff --git a/stack/resilient/buildout.hash.cfg b/stack/resilient/buildout.hash.cfg
index a655b1f9c4f0563fc1e1333a4a367312e3bab6a5..6ab6499ec641d3420f2037aec3b7338fb5302deb 100644
--- a/stack/resilient/buildout.hash.cfg
+++ b/stack/resilient/buildout.hash.cfg
@@ -14,7 +14,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = 516482f89d7a3ebe4458a404eb4a575b
+md5sum = f3bf5e1d8bbfbb428c5bbe3a57d8cbe5
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
@@ -30,7 +30,7 @@ md5sum = 57b9b421d233402e6d5177c69cf9567e
 
 [template-replicated]
 filename = template-replicated.cfg.in
-md5sum = 5369b039600e1df8b471ac4b41d5de60
+md5sum = dba869ed13e001f2188c466673df4bbf
 
 [template-parts]
 filename = template-parts.cfg.in
diff --git a/stack/resilient/pbsready.cfg.in b/stack/resilient/pbsready.cfg.in
index d01d61661301cefb01c5afef8d0437148d39ddf0..e8444d1831ee005c2388170f3d2741f58a10930c 100644
--- a/stack/resilient/pbsready.cfg.in
+++ b/stack/resilient/pbsready.cfg.in
@@ -273,5 +273,5 @@ recipe = slapos.cookbook:userinfo
 [resilient-publish-connection-parameter]
 recipe = slapos.cookbook:publish
 ssh-public-key = $${sshkeys-sshd:public-key-value}
-ssh-url = ssh://$${user-info:pw-name}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
+resilient-ssh-url = ssh://$${user-info:pw-name}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
 ip = $${slap-network-information:global-ipv6}
diff --git a/stack/resilient/template-replicated.cfg.in b/stack/resilient/template-replicated.cfg.in
index 59a3880107ff28e5f7f4463fc7c893314356c743..110428df527f3e30c29bd0f7dea38a74ccf54c89 100644
--- a/stack/resilient/template-replicated.cfg.in
+++ b/stack/resilient/template-replicated.cfg.in
@@ -33,7 +33,7 @@ software-url = ${slap-connection:software-release-url}
    {{heriteLeader}}
 software-type = {{typeexport}}
 name = {{namebase}}0
-return = ssh-public-key ssh-url notification-id ip {{ monitor_return }}
+return = ssh-public-key resilient-ssh-url notification-id ip {{ monitor_return }}
 
 config-number = 0
 config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %}
@@ -87,7 +87,7 @@ name = {{namebase}}{{id}}
 
 software-url = ${slap-connection:software-release-url}
 software-type = {{typeimport}}
-return = ssh-public-key ssh-url notification-url ip takeover-url takeover-password  {{ monitor_return }}
+return = ssh-public-key resilient-ssh-url notification-url ip takeover-url takeover-password  {{ monitor_return }}
 
 pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}-push
 
@@ -229,7 +229,7 @@ mode = 700
 [request-pull-backup-server-{{namebase}}-{{id}}]
 <= request-pbs-common
 name = PBS {{id}} pulling from ${request-{{namebase}}:name}
-config-url = ${request-{{namebase}}:connection-ssh-url}
+config-url = ${request-{{namebase}}:connection-resilient-ssh-url}
 config-type = pull
 config-server-key = ${request-{{namebase}}:connection-ssh-public-key}
 config-on-notification = ${request-{{namebase}}:connection-notification-id}
@@ -259,7 +259,7 @@ monitor-url-list = {{ monitor_url_list | join(' ') }}
 [request-pull-backup-server-{{namebase}}-backup-{{id}}]
 <= request-pbs-common
 name = PBS pushing on ${request-{{namebase}}-pseudo-replicating-{{id}}:name}
-config-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-url}
+config-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-resilient-ssh-url}
 config-type = push
 config-server-key = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-public-key}
 config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${request-pull-backup-server-{{namebase}}-{{id}}:config-notification-id}