diff --git a/README.md b/README.md
index 665c9da73..dfd19c4c6 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ If you would like to contribute to this project please refer to [contribution gu
 3. Finally, Create a Job Template called `Setup` with the following configuration:
   
      - Name: Setup
-     - Inventory: Workshop Inventory
+     - Inventory: Demo Inventory
      - Exec Env: Control Plane EE
      - Playbook: setup_demo.yml
      - Credentials:
diff --git a/cloud/blueprints/al2023.yml b/cloud/blueprints/al2023.yml
new file mode 100644
index 000000000..4f204eebc
--- /dev/null
+++ b/cloud/blueprints/al2023.yml
@@ -0,0 +1,6 @@
+---
+vm_providers:
+  - aws
+aws_instance_size: t3.micro
+aws_image_architecture: x86_64
+aws_image_filter: 'al2023-ami-2023*'
diff --git a/cloud/create_infra.yml b/cloud/create_infra.yml
deleted file mode 100644
index 85797dc21..000000000
--- a/cloud/create_infra.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Create Cloud Infra
-  hosts: localhost
-  gather_facts: false
-  vars:
-    infra_provider: undef
-    aws_public_key: undef
-  tasks:
-    - name: Include provider role
-      ansible.builtin.include_role:
-        name: "demo.cloud.{{ infra_provider }}"
-        tasks_from: create_infra
diff --git a/cloud/create_vm.yml b/cloud/create_vm.yml
deleted file mode 100644
index 941fddc55..000000000
--- a/cloud/create_vm.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: Create Cloud Infra
-  hosts: localhost
-  gather_facts: false
-  vars:
-    vm_name: undef
-    vm_owner: undef
-    vm_provider: undef
-    vm_blueprint: undef
-
-  tasks:
-    - name: "Importing {{ vm_blueprint | upper }}"
-      ansible.builtin.include_vars:
-        file: "blueprints/{{ vm_blueprint }}.yml"
-
-    - name: "Check Provider Compatibility"
-      ansible.builtin.assert:
-        that: "'{{ vm_provider }}' in {{ vm_blueprint_providers }}"
-        fail_msg: "{{ vm_blueprint | upper }} is not available for {{ vm_provider | upper }}"
-      when: "vm_blueprint_providers is defined"
-
-    - name: "Building {{ vm_blueprint | upper }}"
-      ansible.builtin.include_role:
-        name: "demo.cloud.{{ vm_provider }}"
-        tasks_from: create_vm
diff --git a/cloud/setup.yml b/cloud/setup.yml
index 9d5402328..260b9dafd 100644
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -19,8 +19,7 @@ controller_projects:
     organization: Default
     scm_type: git
     wait: true
-    # scm_url: https://github.com/ansible-content-lab/aws.infrastructure_config_demos.git
-    scm_url: https://github.com/willtome/aws.infrastructure_config_demos.git
+    scm_url: https://github.com/ansible-content-lab/aws.infrastructure_config_demos.git
     default_environment: Cloud Services Execution Environment
 
 controller_credentials:
@@ -43,7 +42,7 @@ controller_inventory_sources:
   - name: AWS Inventory
     organization: Default
     source: ec2
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     credential: AWS
     overwrite: true
     source_vars:
@@ -66,7 +65,7 @@ controller_inventory_sources:
   # - name: Azure Inventory
   #   organization: Default
   #   source: azure_rm
-  #  inventory: Workshop Inventory
+  #  inventory: Demo Inventory
   #   credential: Azure
   #   execution_environment: Ansible Engine 2.9 execution environment
   #   overwrite: true
@@ -82,7 +81,7 @@ controller_inventory_sources:
 
 controller_groups:
   - name: cloud_aws
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     variables:
       ansible_user: ec2-user
 
@@ -94,7 +93,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_peer_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -110,7 +109,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_delete_peer_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -124,7 +123,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_transit_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -140,7 +139,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_delete_transit_network.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -154,7 +153,7 @@ controller_templates:
       - AWS
     project: Ansible official demo project
     playbook: cloud/create_vpc.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -182,25 +181,22 @@ controller_templates:
     organization: Default
     credentials:
       - AWS
-      - Workshop Credential
+      - Demo Credential
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_vm.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     survey_enabled: true
     allow_simultaneous: true
-    extra_vars:
-      aws_region: us-east-1
-      aws_keypair_name: aws-test-key
     survey:
       name: ''
       description: ''
       spec:
         - question_name: AWS Region
           type: multiplechoice
-          variable: aws_region
+          variable: create_vm_aws_region
           required: true
           choices:
             - us-east-1
@@ -209,19 +205,19 @@ controller_templates:
             - us-west-2
         - question_name: Name
           type: text
-          variable: vm_name
+          variable: create_vm_vm_name
           required: true
         - question_name: Owner
           type: text
-          variable: vm_owner
+          variable: create_vm_vm_owner
           required: true
         - question_name: Deployment
           type: text
-          variable: vm_deployment
+          variable: create_vm_vm_deployment
           required: true
         - question_name: Environment
           type: multiplechoice
-          variable: vm_environment
+          variable: create_vm_vm_environment
           required: true
           choices:
             - Dev
@@ -237,26 +233,32 @@ controller_templates:
             - rhel9
             - rhel8
             - rhel7
+            - al2023
         - question_name: Subnet
           type: text
-          variable: aws_vpc_subnet_name
+          variable: create_vm_aws_vpc_subnet_name
           required: true
           default: aws-test-subnet
         - question_name: Security Group
           type: text
-          variable: aws_securitygroup_name
+          variable: create_vm_aws_securitygroup_name
           required: true
           default: aws-test-sg
+        - question_name: SSH Keypair
+          type: text
+          variable: create_vm_aws_keypair_name
+          required: true
+          default: aws-test-key
 
   - name: Cloud / AWS / Delete VM
     job_type: run
     organization: Default
     credentials:
       - AWS
-      - Workshop Credential
+      - Demo Credential
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_delete_inventory_vm.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -279,7 +281,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_reports.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -294,7 +296,7 @@ controller_templates:
       - AWS
     project: Ansible Cloud Content Lab - AWS
     playbook: playbook_create_reports.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -322,7 +324,7 @@ controller_templates:
       - AWS
     project: Ansible official demo project
     playbook: cloud/aws_key.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
diff --git a/collections/requirements.yml b/collections/requirements.yml
index b92df16a0..fe3cf7f63 100644
--- a/collections/requirements.yml
+++ b/collections/requirements.yml
@@ -1,9 +1,9 @@
 ---
 collections:
   - name: ansible.controller
-    version: 4.3.0
+    version: 4.4.0
   - name: redhat_cop.controller_configuration
-    version: 2.2.5
+    version: 2.3.1
   # linux
   - name: redhat.insights
     version: 1.0.7
diff --git a/linux/setup.yml b/linux/setup.yml
index b8c43a8b0..dcb031da6 100644
--- a/linux/setup.yml
+++ b/linux/setup.yml
@@ -37,7 +37,7 @@ controller_credentials:
 
 controller_inventory_sources:
   - name: Insights Inventory
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     source: scm
     source_project: Ansible official demo project
     source_path: linux/inventory.insights.yml
@@ -46,14 +46,14 @@ controller_inventory_sources:
 controller_templates:
   - name: "LINUX / Register with Insights"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/ec2_register.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     extra_vars:
       activation_key: !unsafe "RHEL{{ ansible_distribution_major_version }}_{{ env }}"
@@ -85,7 +85,7 @@ controller_templates:
 
   - name: "LINUX / Troubleshoot"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/tshoot.yml"
     notification_templates_started: Telemetry
@@ -93,7 +93,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -106,14 +106,14 @@ controller_templates:
 
   - name: "LINUX / Temporary Sudo"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/temp_sudo.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -135,7 +135,7 @@ controller_templates:
 
   - name: "LINUX / Patching"
     job_type: check
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/patching.yml"
     execution_environment: Default execution environment
@@ -145,7 +145,7 @@ controller_templates:
     use_fact_cache: true
     ask_job_type_on_launch: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -158,7 +158,7 @@ controller_templates:
 
   - name: "LINUX / Start Service"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/service_start.yml"
     notification_templates_started: Telemetry
@@ -166,7 +166,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -183,7 +183,7 @@ controller_templates:
 
   - name: "LINUX / Stop Service"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/service_stop.yml"
     notification_templates_started: Telemetry
@@ -191,7 +191,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -208,14 +208,14 @@ controller_templates:
 
   - name: "LINUX / Run Shell Script"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/run_script.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -233,14 +233,14 @@ controller_templates:
   - name: "LINUX / Fact Scan"
     project: "Ansible official demo project"
     playbook: linux/fact_scan.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - Workshop Credential
+      - Demo Credential
     survey_enabled: true
     survey:
       name: ''
@@ -253,14 +253,14 @@ controller_templates:
 
   - name: "LINUX / Podman Webserver"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/podman.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -278,7 +278,7 @@ controller_templates:
 
   - name: "LINUX / System Roles"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/system_roles.yml"
     notification_templates_started: Telemetry
@@ -292,7 +292,7 @@ controller_templates:
       selinux_policy: targeted
       selinux_state: enforcing
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -305,7 +305,7 @@ controller_templates:
 
   - name: "LINUX / Install Web Console (cockpit)"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/system_roles.yml"
     notification_templates_started: Telemetry
@@ -317,7 +317,7 @@ controller_templates:
       system_roles:
         - cockpit
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -339,14 +339,14 @@ controller_templates:
 
   - name: "LINUX / DISA STIG"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/compliance.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     extra_vars:
       sudo_remove_nopasswd: false
     survey_enabled: true
@@ -361,11 +361,11 @@ controller_templates:
 
   - name: "LINUX / Insights Compliance Scan"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/insights_compliance_scan.yml"
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -386,7 +386,7 @@ controller_templates:
 
   - name: "LINUX / Deploy Application"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "linux/deploy_application.yml"
     notification_templates_started: Telemetry
@@ -394,7 +394,7 @@ controller_templates:
     notification_templates_error: Telemetry
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
diff --git a/network/setup.yml b/network/setup.yml
index a2895b35d..24501e444 100644
--- a/network/setup.yml
+++ b/network/setup.yml
@@ -88,7 +88,7 @@ controller_templates:
     execution_environment: Networking Execution Environment
     use_fact_cache: true
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
diff --git a/satellite/setup.yml b/satellite/setup.yml
index 157c76d84..2ae885791 100644
--- a/satellite/setup.yml
+++ b/satellite/setup.yml
@@ -52,7 +52,7 @@ controller_credentials:
 
 controller_inventory_sources:
   - name: Satellite Inventory
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     credential: Satellite Inventory
     source: satellite6
     update_on_launch: false
@@ -81,12 +81,12 @@ controller_templates:
   - name: LINUX / Register with Satellite
     project: Ansible official demo project
     playbook: satellite/server_register.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - Workshop Credential
+      - Demo Credential
       - Satellite Credential
     extra_vars:
       org_id: "Default_Organization"
@@ -111,14 +111,14 @@ controller_templates:
   - name: LINUX / Compliance Scan with Satellite
     project: Ansible official demo project
     playbook: satellite/server_openscap.yml
-    inventory: Workshop Inventory
-    execution_environment: Ansible Engine 2.9 execution environment
+    inventory: Demo Inventory
+    # execution_environment: Ansible Engine 2.9 execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
       - Satellite Credential
-      - Workshop Credential
+      - Demo Credential
     extra_vars:
       policy_scan: all
     survey_enabled: true
@@ -134,7 +134,7 @@ controller_templates:
   - name: SATELLITE / Publish Content View Version
     project: Ansible official demo project
     playbook: satellite/satellite_publish.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -156,7 +156,7 @@ controller_templates:
   - name: SATELLITE / Promote Content View Version
     project: Ansible official demo project
     playbook: satellite/satellite_promote.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -186,7 +186,7 @@ controller_templates:
   - name: SETUP / Satellite
     project: Ansible official demo project
     playbook: satellite/setup_satellite.yml
-    inventory: Workshop Inventory
+    inventory: Demo Inventory
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
diff --git a/setup_demo.yml b/setup_demo.yml
index b9c89bedc..f72aa855a 100644
--- a/setup_demo.yml
+++ b/setup_demo.yml
@@ -30,7 +30,7 @@
         controller_templates:
           - name: "SUBMIT FEEDBACK"
             job_type: run
-            inventory: "Workshop Inventory"
+            inventory: "Demo Inventory"
             project: "Ansible official demo project"
             playbook: "feedback.yml"
             execution_environment: Default execution environment
diff --git a/windows/setup.yml b/windows/setup.yml
index 3ec7d8aa8..ebc729322 100644
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -15,14 +15,14 @@ controller_projects:
 controller_templates:
   - name: "WINDOWS / Install IIS"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/install_iis.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -41,7 +41,7 @@ controller_templates:
     use_fact_cache: true
     job_type: check
     ask_job_type_on_launch: true
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/patching.yml"
     execution_environment: Default execution environment
@@ -49,7 +49,7 @@ controller_templates:
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -87,14 +87,14 @@ controller_templates:
 
   - name: "WINDOWS / Chocolatey install multiple"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/windows_choco_multiple.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -107,14 +107,14 @@ controller_templates:
 
   - name: "WINDOWS / Chocolatey install specific"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/windows_choco_specific.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -131,14 +131,14 @@ controller_templates:
 
   - name: "WINDOWS / Run PowerShell"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -156,14 +156,14 @@ controller_templates:
 
   - name: "WINDOWS / Query Services"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell_script.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -184,14 +184,14 @@ controller_templates:
 
   - name: "WINDOWS / Configuring Password Requirements"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell_dsc.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -204,14 +204,14 @@ controller_templates:
 
   - name: "WINDOWS / AD / Create Domain"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/create_ad_domain.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -249,14 +249,14 @@ controller_templates:
 
   - name: "WINDOWS / AD / New User"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/helpdesk_new_user_portal.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''
@@ -293,14 +293,14 @@ controller_templates:
 
   - name: "WINDOWS / DISA STIG"
     job_type: run
-    inventory: "Workshop Inventory"
+    inventory: "Demo Inventory"
     project: "Ansible official demo project"
     playbook: "windows/compliance.yml"
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     credentials:
-      - "Workshop Credential"
+      - "Demo Credential"
     survey_enabled: true
     survey:
       name: ''