diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 4fcf44e..f24e2d5 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -132,7 +132,7 @@ atl_proxy_port:  "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}"
 atl_tomcat_port: "{{ lookup('env', 'ATL_TOMCAT_DEFAULTCONNECTORPORT') or '8080' }}"
 atl_ssl_proxy: "{{ lookup('env', 'ATL_SSL_PROXY') or 'false' }}"
 atl_apptunnel_port: "{{ lookup('env', 'ATL_APPTUNNEL_PORT') or '' }}"
-atl_hostedzone: "{{ lookup('env', 'ATL_HOSTEDZONE') or '' }}"
+atl_hostedzone: "{{ lookup('env', 'ATL_HOSTEDZONE') or '' | regex_replace('\\.$') }}"
 
 atl_tomcat_acceptcount: "{{ lookup('env', 'ATL_TOMCAT_ACCEPTCOUNT') or '10' }}"
 atl_tomcat_connectiontimeout: "{{ lookup('env', 'ATL_TOMCAT_CONNECTIONTIMEOUT') or '20000' }}"
diff --git a/roles/bitbucket_mesh_config/tasks/main.yml b/roles/bitbucket_mesh_config/tasks/main.yml
index 7a4e787..9f0a445 100644
--- a/roles/bitbucket_mesh_config/tasks/main.yml
+++ b/roles/bitbucket_mesh_config/tasks/main.yml
@@ -12,7 +12,7 @@
 
 - name: Set fact if this stack is a mesh clone
   ansible.builtin.set_fact:
-    mesh_clone: "{{ (atl_mesh_snapshot_az1 is defined) | ternary(true, false) }}"
+    mesh_clone: "{{ (atl_mesh_snapshot_az1 | length > 0) | ternary(true, false) }}"
 
 # workout if there is a valid mesh_vol, either mounted or abandoned, set mesh_vol or mesh_snap
 - name: Check for valid mesh_vol