diff --git a/deploy.sh b/deploy.sh
index 56d9faf..54890dc 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -929,7 +929,7 @@ function prepare_mgmt_cluster_templates {
     # Management cluster templates
     local f_b_name
     # shellcheck disable=SC2044
-    for file in $(find "${mgmt_templates_local_dir}" -type f  -name "*.template"); do
+    for file in $(find -L "${mgmt_templates_local_dir}" -type f  -name "*.template"); do
         f_b_name=$(basename "${file}")
         render_template < "${file}" > "${mgmt_templates_work_dir}/${f_b_name}"
         ${scp_bin} -i "${SSH_PRIVATE_KEY_PATH}" "${mgmt_templates_work_dir}/${f_b_name}" \
@@ -978,14 +978,26 @@ function prepare_managed_cluster_templates {
 
     local f_b_name
     # shellcheck disable=SC2044
-    for file in $(find "${managed_templates_local_dir}" -maxdepth 1 -type f  -name "*.template"); do
+    for file in $(find -L "${managed_templates_local_dir}" -maxdepth 1 -type f  -name "*.template"); do
         f_b_name=$(basename "${file}")
-        render_template < "${file}" > "${managed_templates_work_dir}/${f_b_name%.tmpl}"
-        ${scp_bin} -i "${SSH_PRIVATE_KEY_PATH}" "${managed_templates_work_dir}/${f_b_name%.tmpl}" "${SEED_NODE_USER}@${NETWORK_LCM_SEED_IP}:${managed_templates_remote_dir}"
+        render_template < "${file}" > "${managed_templates_work_dir}/${f_b_name}"
+        ${scp_bin} -i "${SSH_PRIVATE_KEY_PATH}" "${managed_templates_work_dir}/${f_b_name}" \
+            "${SEED_NODE_USER}@${NETWORK_LCM_SEED_IP}:${managed_templates_remote_dir}"
     done
 
-    ${scp_bin} -i "${SSH_PRIVATE_KEY_PATH}" -r "${managed_templates_local_dir}/certs" "${SEED_NODE_USER}@${NETWORK_LCM_SEED_IP}:${managed_templates_remote_dir}/certs"
-    ${ssh_cmd} chmod +x "${managed_templates_remote_dir}/certs/create_secrets.sh"
+    local managed_templates_certs_local_dir managed_templates_certs_remote_dir
+    managed_templates_certs_local_dir="${managed_templates_local_dir}/certs"
+    managed_templates_certs_remote_dir="${managed_templates_remote_dir}/certs"
+
+    # shellcheck disable=SC2044
+    for file in $(find -L "${managed_templates_certs_local_dir}" -maxdepth 1 -type f  -name "*.template"); do
+        f_b_name=$(basename "${file}")
+        render_template < "${file}" > "${managed_templates_certs_local_dir}/${f_b_name%.template}"
+    done
+
+    ${scp_bin} -i "${SSH_PRIVATE_KEY_PATH}" -r "${managed_templates_certs_local_dir}" \
+        "${SEED_NODE_USER}@${NETWORK_LCM_SEED_IP}:${managed_templates_certs_remote_dir}"
+    ${ssh_cmd} chmod +x "${managed_templates_certs_remote_dir}/create_secrets.sh"
 
     cp -Lr "${managed_templates_local_dir}/hack" "${managed_templates_work_dir}/hack"
 }
diff --git a/templates/2.28.0/managed/certs/server-csr.json b/templates/2.28.0/managed/certs/server-csr.json.template
similarity index 67%
rename from templates/2.28.0/managed/certs/server-csr.json
rename to templates/2.28.0/managed/certs/server-csr.json.template
index 868f9ed..d3304c5 100644
--- a/templates/2.28.0/managed/certs/server-csr.json
+++ b/templates/2.28.0/managed/certs/server-csr.json.template
@@ -1,7 +1,7 @@
 {
-    "CN": "*.it.just.works",
+    "CN": "*.{{ MCC_OPENSTACK_PUBLIC_DOMAIN }}",
     "hosts":     [
-        "*.it.just.works"
+        "*.{{ MCC_OPENSTACK_PUBLIC_DOMAIN }}"
     ],
     "key":     {
         "algo": "rsa",