diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index c6cb279..fa0b19b 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -3,11 +3,12 @@
 - name: Install distro-specific prerequisites
   include_tasks: "{{ ansible_distribution|lower }}.yml"
 
-- name: Use EC2 instance ID for cluster node ID
-  set_fact:
-    atl_cluster_node_id: "{{ ansible_ec2_instance_id }}"
-
 - name: Fetch local EC2 metadata
   ec2_metadata_facts:
   # Guard is mostly for testing
   when: ansible_system_vendor == "Amazon EC2"
+
+- name: Use EC2 instance ID for cluster node ID
+  set_fact:
+    atl_cluster_node_id: "{{ ansible_ec2_instance_id }}"
+