diff --git a/roles/aws_common/defaults/main.yml b/roles/aws_common/defaults/main.yml
index 4aa3f4c..a952423 100644
--- a/roles/aws_common/defaults/main.yml
+++ b/roles/aws_common/defaults/main.yml
@@ -15,3 +15,5 @@ atl_aws_log_groups:
   product: "{{ atl_aws_log_group_base }}"
   audit: "{{ atl_aws_log_group_base }}-audit"
   provisioning: "{{ atl_aws_log_group_base }}-provisioning"
+
+atl_write_tags: true
diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index 9c90622..708435a 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -26,6 +26,7 @@
 
 - name: Store some metadata about this run
   include_tasks: "write-tags.yml"
+  when: atl_write_tags
 
 - name: Initiate the startup of any new AWS services now
   meta: flush_handlers