diff --git a/defaults/main.yml b/defaults/main.yml
index 425d937..481a95c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,29 +1,2 @@
 ---
 # defaults file for aws-create
-image_id: ''
-instance_type: ''
-key_name: ''
-security_group: ''
-vpc_subnet_id: ''
-wait: ''
-assign_public_ip: ''
-name_prefix: ''
-env_name: ''
-application: ''
-bag: ''
-department: ''
-company_env: ''
-owner_contact_info: ''
-pod: ''
-team_contact_info: ''
-env: ''
-start: 0
-end: 0
-aws_access_key: ''
-aws_secret_key: ''
-aws_region: ''
-session_name: ''
-volume_type: ''
-volume_size: ''
-delete_on_termination: ''
-device_name: ''
diff --git a/tasks/main.yml b/tasks/main.yml
index 9868b5d..88da64d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -19,7 +19,7 @@
         volume_size: '{{ volume_size }}'
         delete_on_termination: '{{ delete_on_termination }}'
     instance_tags:
-      Name: '{{ name_prefix }}-{{ session_name }}-n{{ item }}'
+      Name: '{{ session_name }}{{ dc }}-n{{ item }}'
       application: '{{ application }}'
       bag: '{{ bag }}'
       department: '{{ department }}'
@@ -27,7 +27,7 @@
       owner_contact_info: '{{ owner_contact_info }}'
       pod: '{{ pod }}'
       team_contact_info: '{{ team_contact_info }}'
-      env: '{{ env }}'
+      env: '{{ name_prefix }}-{{ env }}-{{ os_selection }}'
   register: status
   with_sequence: start={{ start }} end={{ end }}