diff --git a/roles/confluence_config/molecule/aurora/playbook.yml b/roles/confluence_config/molecule/aurora/playbook.yml
index 67cc0af..d57ff60 100644
--- a/roles/confluence_config/molecule/aurora/playbook.yml
+++ b/roles/confluence_config/molecule/aurora/playbook.yml
@@ -14,8 +14,6 @@
     atl_cluster_node_id: 'FAKEID'
     atl_autologin_cookie_age: "COOKIEAGE"
     atl_local_ipv4: "1.1.1.1"
-    atl_tomcat_scheme: "http"
-    atl_proxy_name: "localhost"
 
   roles:
     - role: linux_common
diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py
index a8d3013..d74ba7b 100644
--- a/roles/confluence_config/molecule/default/tests/test_default.py
+++ b/roles/confluence_config/molecule/default/tests/test_default.py
@@ -38,8 +38,6 @@ def test_server_file(host):
     assert f.contains('acceptCount="10"')
     assert f.contains('secure="false"')
     assert f.contains('scheme="http"')
-    assert not f.contains('proxyName=')
-    assert not f.contains('proxyPort=')
 
 def test_install_permissions(host):
     assert host.file('/opt/atlassian/confluence/current/conf/server.xml').user == 'root'
diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml
index 307580e..5ed6d66 100644
--- a/roles/confluence_config/tasks/main.yml
+++ b/roles/confluence_config/tasks/main.yml
@@ -90,5 +90,7 @@
       - bandanavalue
       - <baseUrl>.*</baseUrl>
       - "<baseUrl>{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}</baseUrl>"
-  when: atl_proxy_name is defined
+  when:
+    - atl_proxy_name is defined
+    - atl_tomcat_scheme is defined
   ignore_errors: yes  # For Molecule as it has no db test framework included