diff --git a/linux/ec2_register.yml b/linux/ec2_register.yml
index 8679acc..acf70d1 100644
--- a/linux/ec2_register.yml
+++ b/linux/ec2_register.yml
@@ -48,6 +48,7 @@
     import_role:
       name: redhat.insights.insights_client
     vars:
+      insights_display_name: "{{ inventory_hostname }}"
       insights_tags:
         env: "{{ env }}"
         purpose: demo
diff --git a/linux/inventory.insights.yml b/linux/inventory.insights.yml
index 7d65487..7eada03 100644
--- a/linux/inventory.insights.yml
+++ b/linux/inventory.insights.yml
@@ -5,7 +5,6 @@ groups:
   patch_bugs: insights_patching.rhba_count > 0
   patch_enhancements: insights_patching.rhea_count > 0
   patch_security: insights_patching.rhsa_count > 0
-get_tags: False
 filter_tags:
   - insights-client/purpose=demo
 keyed_groups:
diff --git a/linux/run_script.yml b/linux/run_script.yml
index a90228b..a1c3364 100644
--- a/linux/run_script.yml
+++ b/linux/run_script.yml
@@ -11,4 +11,5 @@
       shell: "{{ shell_script }}"
 
     - debug:
-        msg: You should really consider converting this script to a playbook!
\ No newline at end of file
+        msg: You should really consider converting this script to a playbook!
+      run_once: yes
\ No newline at end of file
diff --git a/linux/setup.yml b/linux/setup.yml
index 08928b1..e36a60f 100644
--- a/linux/setup.yml
+++ b/linux/setup.yml
@@ -194,7 +194,7 @@ controller_templates:
           type: text
           variable: HOSTS
           required: true
-        - question_name: Service Name
+        - question_name: Shell Script
           type: textarea
           variable: shell_script
           required: true
diff --git a/setup_demo.yml b/setup_demo.yml
index d9d6f61..25accf5 100644
--- a/setup_demo.yml
+++ b/setup_demo.yml
@@ -17,4 +17,4 @@
     - name: Print Message
       debug:
         msg: "{{ user_message }}"
-      #when: user_message is defined
\ No newline at end of file
+      when: user_message is defined
\ No newline at end of file