diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg
index bb97cb52b15558b7afbac8d90dd500dc3cc753e7..db55d81b19e3fc07b0b4d29a1300b63dfbb675b9 100644
--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -26,7 +26,7 @@ md5sum = 204ea7abf93694cf3b0f1a08dcd57256
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = a86adb0791e2a00f4e8e4e2ce96221cf
+md5sum = 895d940da4dd9247a4ca2cbf216375e3
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
diff --git a/software/caddy-frontend/instance-master.cfg.in b/software/caddy-frontend/instance-master.cfg.in
index 12ec4008767cfbebc70cb2b220eb65a8755631fa..5fe86e23143aa6f50f952b9640d12f02e7ae60d5 100644
--- a/software/caddy-frontend/instance-master.cfg.in
+++ b/software/caddy-frontend/instance-master.cfg.in
@@ -1,5 +1,9 @@
 {% set aibcc_enabled = True %}
 {% import "caucase" as caucase with context %}
+{#- DANGER! DANGER! #}
+{#- Avoid touching the NAME_BASE, as it will result with backward incompatible cluster setup #}
+{%- set NAME_BASE = 'caddy-frontend' %}
+{#- DANGER! DANGER! #}
 {%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] -%}
 {%- set GOOD_CIPHER_LIST = ['ECDHE-ECDSA-AES256-GCM-SHA384', 'ECDHE-RSA-AES256-GCM-SHA384', 'ECDHE-ECDSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-ECDSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-AES256-CBC-SHA', 'ECDHE-RSA-AES128-CBC-SHA', 'ECDHE-ECDSA-AES256-CBC-SHA', 'ECDHE-ECDSA-AES128-CBC-SHA', 'RSA-AES256-CBC-SHA', 'RSA-AES128-CBC-SHA', 'ECDHE-RSA-3DES-EDE-CBC-SHA', 'RSA-3DES-EDE-CBC-SHA'] %}
 {#- Allow to pass only some parameters to frontend nodes #}
@@ -107,7 +111,6 @@ context =
 {% set frontend_list = [] %}
 {% set frontend_section_list = [] %}
 {% set request_dict = {} %}
-{% set namebase = 'caddy-frontend' %}
 # XXX Dirty hack, not possible to define default value before
 {% set sla_computer_caddy_1_key = '-sla-1-computer_guid' %}
 {% if not sla_computer_caddy_1_key in slapparameter_dict %}
@@ -121,7 +124,7 @@ context =
 # Here we request individually each frontend.
 # The presence of sla parameters is checked and added if found
 {% for i in range(1, frontend_quantity + 1) %}
-{%   set frontend_name = "%s-%s" % (namebase, i) %}
+{%   set frontend_name = "%s-%s" % (NAME_BASE, i) %}
 {%   set request_section_title = 'request-%s' % frontend_name %}
 {%   set sla_key = "-sla-%s-" % i %}
 {%   set sla_key_length = sla_key | length %}