diff --git a/roles/aws_common/tasks/amazon.yml b/roles/aws_common/tasks/amazon.yml
index e014724..4c2aebb 100644
--- a/roles/aws_common/tasks/amazon.yml
+++ b/roles/aws_common/tasks/amazon.yml
@@ -6,8 +6,3 @@
       - ec2-utils
       - amazon-ssm-agent
       - amazon-efs-utils
-
-- name: Fetch local EC2 metadata
-  ec2_metadata_facts:
-  # Guard is mostly for testing
-  when: ansible_system_vendor == "Amazon EC2"
diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index b6d8366..2440fb3 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -2,3 +2,8 @@
 
 - name: Install distro-specific prerequisites
   include: "{{ ansible_distribution|lower }}.yml"
+
+- name: Fetch local EC2 metadata
+  ec2_metadata_facts:
+  # Guard is mostly for testing
+  when: ansible_system_vendor == "Amazon EC2"