diff --git a/tasks/main.yml b/tasks/main.yml
index 04f09110..0a5323de 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -43,12 +43,4 @@
     tags:
       - always
 
-  - include: rhel6stig/main.yml
-    when:
-      - stig_version == 'rhel6'
-
-  # NOTE(mhayden): RHEL 7 STIG content is still under development. Do not run
-  # these tasks against a production environment at this time.
-  - include: rhel7stig/main.yml
-    when:
-      - stig_version == 'rhel7'
+  - include: "{{ stig_version }}stig/main.yml"