diff --git a/aws_confluence_dc_node.yml b/aws_confluence_dc_node.yml
index daaf8ea..0bdf71d 100644
--- a/aws_confluence_dc_node.yml
+++ b/aws_confluence_dc_node.yml
@@ -15,5 +15,6 @@
     - role: product_common
     - role: product_install
     - role: database_init
+    - role: confluence_common
     - role: confluence_config
     - role: product_startup
diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index 240a173..087b681 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -11,3 +11,4 @@
 - name: Use EC2 instance ID for cluster node ID
   set_fact:
     atl_cluster_node_id: "{{ ansible_ec2_instance_id }}"
+    atl_local_ipv4: "{{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4.address) }}"
diff --git a/roles/confluence_common/defaults/main.yml b/roles/confluence_common/defaults/main.yml
new file mode 100644
index 0000000..26cb652
--- /dev/null
+++ b/roles/confluence_common/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+
+atl_hazelcast_network_aws_tag_key: "Cluster"
+atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"
+atl_hazelcast_network_aws_iam_region: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_REGION') }}"
+atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}"
+atl_hazelcast_network_aws_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}"
+
+atl_synchrony_service_url: "{{ lookup('env', 'ATL_SYNCHRONY_SERVICE_URL') }}"
diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index db918a0..22ed871 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -2,6 +2,8 @@
 
 atl_jvm_heap: "2048m"
 
+atl_autologin_cookie_age: "{{ lookup('env', 'ATL_AUTOLOGIN_COOKIE_AGE') }}"
+
 atl_db_timeout: "{{ lookup('env', 'ATL_DB_TIMEOUT') or '30' }}"
 atl_db_idletestperiod: "{{ lookup('env', 'ATL_DB_IDLETESTPERIOD') or '100' }}"
 atl_db_maxstatements: "{{ lookup('env', 'ATL_DB_MAXSTATEMENTS') or '0' }}"
@@ -14,10 +16,6 @@ atl_hazelcast_network_aws_iam_region: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_A
 atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}"
 atl_hazelcast_network_aws_tag_value: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_VALUE') }}"
 
-atl_autologin_cookie_age: "{{ lookup('env', 'ATL_AUTOLOGIN_COOKIE_AGE') }}"
-atl_synchrony_service_url: "{{ lookup('env', 'ATL_SYNCHRONY_SERVICE_URL') }}"
-
-
 atl_catalina_opts: ""
 atl_catalina_opts_extra: >-
   -Datlassian.event.thread_pool_configuration.queue_size=4096
@@ -31,7 +29,7 @@ atl_catalina_opts_extra: >-
   -XX:+PrintTenuringDistribution
   -Dsynchrony.proxy.enabled=false
   -Dsynchrony.service.url={{ atl_synchrony_service_url }}
-  -Dconfluence.cluster.node.name={{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4.address) }}
+  -Dconfluence.cluster.node.name={{ atl_local_ipv4 }}
   -Dconfluence.cluster.hazelcast.max.no.heartbeat.seconds=60
 
 atl_tomcat_port: "8080"
diff --git a/roles/confluence_config/molecule/default/playbook.yml b/roles/confluence_config/molecule/default/playbook.yml
index 1be669d..cb861b0 100644
--- a/roles/confluence_config/molecule/default/playbook.yml
+++ b/roles/confluence_config/molecule/default/playbook.yml
@@ -10,11 +10,11 @@
     atl_jvm_heap: 'PLACEHOLDER'
     atl_cluster_node_id: 'FAKEID'
     atl_autologin_cookie_age: "COOKIEAGE"
-    ansible_ec2_local_ipv4: "1.1.1.1"
-    ansible_default_ipv4: "2.2.2.2"
+    atl_local_ipv4: "1.1.1.1"
 
   roles:
     - role: linux_common
     - role: product_common
     - role: product_install
+    - role: confluence_common
     - role: confluence_config
diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py
index 0d1630c..4e0d444 100644
--- a/roles/confluence_config/molecule/default/tests/test_default.py
+++ b/roles/confluence_config/molecule/default/tests/test_default.py
@@ -64,3 +64,4 @@ def test_confluence_config_file(host):
     assert f.user == 'confluence'
     assert f.contains('<property name="confluence.cluster.home">/media/atl/confluence/shared-home</property>')
     assert f.contains('<property name="hibernate.connection.driver_class">org.postgresql.Driver</property>')
+    assert f.contains('<property name="confluence.cluster.aws.host.header">ec2.amazonaws.com</property>')