diff --git a/examples/templates/README.md b/examples/templates/README.md
index 81e572f0f..cdcaf63e9 100644
--- a/examples/templates/README.md
+++ b/examples/templates/README.md
@@ -1 +1,229 @@
-Controller Configuration Skeleton
+Controller Configuration
+=========
+
+A single playbook and multiple task and vars files which can be used to define your Tower or Controller configuration as code.  Update the vars files to define your objects and run the playbook to deploy your changes to your Tower / AAP 2.1 cluster(s).
+
+If executed with the `alltags` tag then the playbook will create all ojbects defined in all vars files in the appropriate order.
+
+Use of some tags may require that you include other tags; for example if adding a project but you haven't already added the correct SCM credential.
+
+Available tags:
+- alltags
+- settings
+- credtypes
+- orgs
+- users
+- teams
+- credentials
+- projects
+- labels
+- inventory
+- inventorysources
+- instancegroups
+- hosts
+- groups
+- ees
+- notifications
+- jobtemplates
+- workflows
+- schedules
+- roles
+
+Requirements
+------------
+
+This content utilizes the controller_configuration collection and the awx.awx or ansible.tower or ansible.controller collections.  You will need connectivity to a Private Automation Hub server which has synchronized these collections or to the internet so that the collections can be installed.
+
+You will also need Tower or Controller credentials with sufficient permissions to create the objects you define as code.  This will need to be a local account within the cluster and not an externally (such as ldap) authenticated account.
+
+Variables
+--------------
+
+`controller_config.yml`:
+
+    absent_present
+
+        I suggest leaving `absent_present` set to "present".
+
+    which_org
+
+        You can update `which_org` to specify your org within the cluster and just create all objects in a single organization.  If you do not wish to use `which_org` then you will have to hard code the organization for each individual object replacing the variable `"{{ which_org }}"` with the organization name.
+
+    CONTROLLER_VERIFY_SSL
+
+        CONTROLLER_VERIFY_SSL it is recommended not to modify this variable.  By default Tower / AAP 2.1 is installed with a self-signed certificate.  If you do not replace the certificate then you will receive certificate errors which prevent creating your objects.
+
+`vars/controller_credential_types.yml`:
+
+    controller_credential_types
+
+        Dictionary of credential types to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional credential types.
+
+`vars/controller_credentials.yml`:
+
+    controller_credentials
+
+        Dictionary of credentials to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional credentials.
+
+`vars/controller_groups.yml`:
+
+    controller_groups
+
+        Dictionary of (host) groups to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional groups.  You will need to ensure the inventory and hosts exists before you add groups.
+
+`vars/controller_hosts.yml`:
+
+    controller_hosts
+
+        Dictionary of hosts to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional hosts.  You will need to ensure the inventory exists before you add hosts to it.
+
+`vars/controller_inventories.yml`:
+
+    controller_inventories
+
+        Dictionary of inventories to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional inventories.
+
+`vars/controller_inventory_sources.yml`:
+
+    controller_inventory_sources
+
+        Dictionary of inventory sources to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional inventory sources.  You will need to ensure the inventory exists before you add hosts to it.
+
+`vars/controller_job_templates.yml`:
+
+    controller_job_templates
+
+        Dictionary of job templates to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional job templates.
+
+`vars/controller_labels.yml`:
+
+    controller_labels
+
+        Dictionary of labels to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional labels.
+
+`vars/controller_notification_templates.yml`:
+
+    controller_notification_templates
+
+        Dictionary of notification templates to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional notification templates.
+
+`vars/controller_organizations_with_hub.yml`:
+
+    controller_organizations
+
+        Dictionary of organizations to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional oranizaitons.
+
+    You must associate Galaxy / Automation Hub credentials with an Organization before you sync projects.  Otherwise the project sync will fail. This particular vars file has the organization defined with the Galaxy / Automation Hub credentials.
+
+    There is a check in the `tasks/manage_controller_organizations.yml` which checks to see if the organization is already defined.  If it is not defined then it creates the organization.
+
+    However, you cannot associate a Galaxy / Private Automation Hub credential to an organization you are defining for the first time because those credentials for that organization have not been created yet.  So the organization is created, then credentials are added to the organization, and then the organization is updated to associate the Galaxy / Automation Hub credentials.
+
+`vars/controller_organizations.yml`:
+
+    controller_organinzations
+
+        Dictionary of organizations to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional organizations.
+
+    This vars file has the organization defined without the Galaxy / Automation Hub credential.
+
+`vars/controller_projects.yml`:
+
+    controller_projects
+
+        Dictionary of projects to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional projects.
+
+`vars/controller_schedules.yml`:
+
+    controller_schedules
+
+        Dictionary of schedules to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional schedules.
+
+`vars/controller_settings.yml`:
+
+    controller_settings
+
+        Dictionary of settings to create.  This file does not contain an example.  Check `tasks/manage_controller_settings.yml` for a link to documentation of the `controller_configuration` collection.
+
+`vars/controller_teams.yml`:
+
+    controller_teams
+
+        Dictionary of teams to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional teams.
+
+`vars/controller_users.yml`:
+
+    Unless otherwise instructed, please refrain from adding local users.  Users should be added to the organization via LDAP mapping.
+
+    controller_users
+
+        Dictionary of local users to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional users.
+
+`vars/controller_vars.yml`:
+
+    DO NOT: populate this file with valid credentials and then commit the file to GitHub!
+
+    controller_vars
+
+        If using ansible-playbook, populate `controller_vars` your Tower or Controller hostname (or IP adress), username, and password.  The variables are used for your connection to Tower / Controller to create the objects you define in these vars files.
+
+        If you are going to create a Job Template in Tower / Controller to run the `controller_config.yml` playbook then do not populate this file and instead use either a Survey or extra_vars with your job tmeplate.
+
+`vars/controller_workflows.yml`:
+
+    controller_workflows
+
+        Dictionary of workflows to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional workflows.
+
+`vars/controller_execution_environments.yml`:
+
+    controller_execution_environments
+
+        Dictionary of exection environments to define.  One example exists that will need to be filled in.  You can also copy / paste the example for additional execution environments.
+
+`vars/controller_notification_templates.yml`:
+
+    controller_notification_templates
+
+        Dictionary of notification templates to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional notification templates.
+
+`vars/controller_roles.yml`:
+
+    controller_roles
+
+        Dictionary of roles to define.  One example exists that will need to be filled in.  You can also copy / paste the example for additional roles.
+
+`vars/controller_instance_groups.yml`:
+
+    controller_instance_groups
+
+        Dictionary of instance groups to create.  One example exists that will need to be filled in.  You can also copy / paste the example for additional instance groups.
+
+Dependencies
+------------
+
+A combination of `ansible.controller` or `ansible.tower` or `awx.awx` and
+`controller_configuration` collections.
+
+Playbook Execution
+----------------
+
+You can run this playbook from ansible cli or as a Job Template in Tower / Controller.
+
+From the command line to define all objects:
+
+    ansible-playbook controller_config.yml --tags alltags
+
+    or just to create new job templates:
+
+    ansible-playbook controller_config.yaml --tags jobtemplates
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/examples/templates/collections/requirements.yml b/examples/templates/collections/requirements.yml
index f5983cea1..d6273c44a 100644
--- a/examples/templates/collections/requirements.yml
+++ b/examples/templates/collections/requirements.yml
@@ -1,6 +1,7 @@
 ---
 collections:
   - name: awx.awx
+  - name: ansible.tower
   - name: ansible.controller
   - name: redhat_cop.controller_configuration
 ...
diff --git a/examples/templates/controller_config.yml b/examples/templates/controller_config.yml
index 1755c6a2d..6b4cbffec 100644
--- a/examples/templates/controller_config.yml
+++ b/examples/templates/controller_config.yml
@@ -1,17 +1,42 @@
+# Available tags
+#   - never
+#   - alltags
+#   - settings
+#   - credtypes
+#   - orgs
+#   - users
+#   - teams
+#   - credentials
+#   - projects
+#   - labels
+#   - inventory
+#   - inventorysources
+#   - hosts
+#   - groups
+#   - jobtemplates
+#   - workflows
+#   - schedules
+#   - ees
+#   - instancegroups
+#   - notifications
+#   - roles
+
+
 ---
-- name: Playbook to configure a Tower cluster
+- name: Playbook to configure a controller cluster
   hosts: localhost
   connection: local
   gather_facts: false
   collections:
-    - ansible.tower
+    - ansible.controller
     - redhat_cop.controller_configuration
 
   vars:
     absent_present: "present"
+    which_org: ""
 
   environment:
-    CONTROLLER_VERIFY_SSL: false
+    CONTROLLER_VERIFY_SSL: False
 
   pre_tasks:
     - name: Include Vars
@@ -21,107 +46,141 @@
     - name: Include task for managing LDAP settings
       include_tasks: tasks/manage_controller_settings.yml
       tags:
-        - all
         - never
+        - alltags
         - settings
 
+    - name: Include task for managing instance groups
+      include_tasks: tasks/manage_instance_groups.yml
+      tags:
+        - never
+        - alltags
+        - instancegroups
+
     - name: Include task for managing credential types
       include_tasks: tasks/manage_credential_types.yml
       tags:
-        - all
         - never
+        - alltags
         - credtypes
 
     - name: Include task for managing organizations
       include_tasks: tasks/manage_organizations.yml
       tags:
-        - all
         - never
+        - alltags
         - orgs
 
     - name: Include task for managing users
       include_tasks: tasks/manage_users.yml
       tags:
-        - all
         - never
+        - alltags
         - users
 
+    - name: Include task for managing teams
+      include_tasks: tasks/manage_teams.yml
+      tags:
+        - never
+        - alltags
+        - teams
+
     - name: Include task for managing credentials
       include_tasks: tasks/manage_credentials.yml
       tags:
-        - all
         - never
+        - alltags
         - credentials
 
-    # Add Orgs a second time to associate the Galaxy /
-    # Automation Hub credentials with the Org for project sync
+    # Add Orgs a second time to associate the Galaxy / Automation Hub credentials with the Org for project sync
     - name: Include task for managing organizations
       include_tasks: tasks/manage_organizations.yml
       tags:
-        - all
         - never
+        - alltags
         - orgs
 
+    - name: Include task for manging execution environments
+      include_tasks: tasks/manage_ees.yml
+      tags:
+        - never
+        - alltags
+        - ees
+
     - name: Include task for managing projects
       include_tasks: tasks/manage_projects.yml
       tags:
-        - all
         - never
+        - alltags
         - projects
 
     - name: Include task for managing labels
       include_tasks: tasks/manage_labels.yml
       tags:
-        - all
         - never
+        - alltags
         - labels
 
     - name: Include task for managing inventories
       include_tasks: tasks/manage_inventories.yml
       tags:
-        - all
         - never
+        - alltags
         - inventory
 
     - name: Include task for managing inventories
       include_tasks: tasks/manage_inventory_sources.yml
       tags:
-        - all
         - never
+        - alltags
         - inventorysources
 
     - name: Include task for managing hosts
       include_tasks: tasks/manage_hosts.yml
       tags:
-        - all
         - never
+        - alltags
         - hosts
 
     - name: Include task for managing groups
       include_tasks: tasks/manage_groups.yml
       tags:
-        - all
         - never
+        - alltags
         - groups
 
+    - name: Include task for managing notification templates
+      include_tasks: tasks/manage_notification_templates.yml
+      tags:
+        - never
+        - alltags
+        - notifications
+
     - name: Include task for managing job templates
       include_tasks: tasks/manage_job_templates.yml
       tags:
-        - all
         - never
+        - alltags
         - jobtemplates
 
     - name: Include task for managing workflow templates
       include_tasks: tasks/manage_workflow_templates.yml
       tags:
-        - all
         - never
+        - alltags
         - workflows
 
     - name: Include task for managing schedules
       include_tasks: tasks/manage_schedules.yml
       tags:
-        - all
         - never
+        - alltags
         - schedules
+
+    - name: Include task for managing roles
+      include_tasks: tasks/manage_roles.yml
+      tags:
+        - never
+        - alltags
+        - roles
 ...
diff --git a/examples/templates/tasks/manage_controller_settings.yml b/examples/templates/tasks/manage_controller_settings.yml
index 8ed567355..000eeacad 100644
--- a/examples/templates/tasks/manage_controller_settings.yml
+++ b/examples/templates/tasks/manage_controller_settings.yml
@@ -1,7 +1,25 @@
 ---
+- name: Include LDAP settings vars
+  include_vars: ../vars/controller_ldap_configuration.json
+  tags:
+    - settings
+    - alltags
+
+- import_role:
+    name: redhat_cop.controller_configuration.settings
+  tags:
+    - settings
+    - alltags
+
 - name: Include credential types vars
   include_vars: ../vars/controller_ldap_configuration.json
+  tags:
+    - settings
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.settings
+  tags:
+    - settings
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_credential_types.yml b/examples/templates/tasks/manage_credential_types.yml
index 6efb8e9c4..a86d457a2 100644
--- a/examples/templates/tasks/manage_credential_types.yml
+++ b/examples/templates/tasks/manage_credential_types.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include credential types vars
   include_vars: ../vars/controller_credential_types.yml
+  tags:
+    - credtypes
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.credential_types
+  tags:
+    - credtypes
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_credentials.yml b/examples/templates/tasks/manage_credentials.yml
index eb618d5a7..1b61554b2 100644
--- a/examples/templates/tasks/manage_credentials.yml
+++ b/examples/templates/tasks/manage_credentials.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include credentials vars
   include_vars: ../vars/controller_credentials.yml
+  tags:
+    - credentials
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.credentials
+  tags:
+    - credentials
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_execution_environments.yml b/examples/templates/tasks/manage_execution_environments.yml
new file mode 100644
index 000000000..aa25a7e35
--- /dev/null
+++ b/examples/templates/tasks/manage_execution_environments.yml
@@ -0,0 +1,13 @@
+---
+- name: Include EE vars
+  include_vars: ../vars/controller_ees.yml
+  tags:
+    - ees
+    - alltags
+
+- import_role:
+    name: redhat_cop.controller_configuration.execution_environments
+  tags:
+    - ees
+    - alltags
+...
diff --git a/examples/templates/tasks/manage_groups.yml b/examples/templates/tasks/manage_groups.yml
index 9469a07e2..4908ec6bc 100644
--- a/examples/templates/tasks/manage_groups.yml
+++ b/examples/templates/tasks/manage_groups.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include groups vars
   include_vars: ../vars/controller_groups.yml
+  tags:
+    - groups
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.groups
+  tags:
+    - groups
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_hosts.yml b/examples/templates/tasks/manage_hosts.yml
index 7948b9ad7..d5b81346b 100644
--- a/examples/templates/tasks/manage_hosts.yml
+++ b/examples/templates/tasks/manage_hosts.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include hosts vars
   include_vars: ../vars/controller_hosts.yml
+  tags:
+    - hosts
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.hosts
+  tags:
+    - hosts
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_instance_groups.yml b/examples/templates/tasks/manage_instance_groups.yml
new file mode 100644
index 000000000..0ce7c6ab7
--- /dev/null
+++ b/examples/templates/tasks/manage_instance_groups.yml
@@ -0,0 +1,13 @@
+---
+- name: Include instance group vars
+  include_vars: ../vars/controller_instance_groups.yml
+  tags:
+    - instancegroups
+    - alltags
+
+- import_role:
+    name: redhat_cop.controller_configuration.instance_groups
+  tags:
+    - instancegroups
+    - alltags
+...
diff --git a/examples/templates/tasks/manage_inventories.yml b/examples/templates/tasks/manage_inventories.yml
index d31e732b4..50bfe538b 100644
--- a/examples/templates/tasks/manage_inventories.yml
+++ b/examples/templates/tasks/manage_inventories.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include inventories vars
   include_vars: ../vars/controller_inventories.yml
+  tags:
+    - inventory
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.inventories
+  tags:
+    - inventory
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_inventory_sources.yml b/examples/templates/tasks/manage_inventory_sources.yml
index 1b7ad6edd..b917ecbcf 100644
--- a/examples/templates/tasks/manage_inventory_sources.yml
+++ b/examples/templates/tasks/manage_inventory_sources.yml
@@ -1,7 +1,13 @@
 ---
-- name: Include inventories vars
+- name: Include inventory sources vars
   include_vars: ../vars/controller_inventory_sources.yml
+  tags:
+    - inventorysources
+    - alltags
 
 - include_role:
-    name: redhat_cop.controller_configuration.inventories
+    name: redhat_cop.controller_configuration.inventory_sources
+  tags:
+    - inventorysources
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_job_templates.yml b/examples/templates/tasks/manage_job_templates.yml
index de1ae9e70..3098adb9e 100644
--- a/examples/templates/tasks/manage_job_templates.yml
+++ b/examples/templates/tasks/manage_job_templates.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include job templates vars
   include_vars: ../vars/controller_job_templates.yml
+  tags:
+    - jobtemplates
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.job_templates
+  tags:
+    - jobtemplates
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_labels.yml b/examples/templates/tasks/manage_labels.yml
index a2a7dd903..3dd221d3d 100644
--- a/examples/templates/tasks/manage_labels.yml
+++ b/examples/templates/tasks/manage_labels.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include labels vars
   include_vars: ../vars/controller_labels.yml
+  tags:
+    - labels
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.labels
+  tags:
+    - labels
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_notification_templates.yml b/examples/templates/tasks/manage_notification_templates.yml
new file mode 100644
index 000000000..d626b8a2b
--- /dev/null
+++ b/examples/templates/tasks/manage_notification_templates.yml
@@ -0,0 +1,13 @@
+---
+- name: Include notification template vars
+  include_vars: ../vars/controller_notification_templates.yml
+  tags:
+    - notifications
+    - alltags
+
+- import_role:
+    name: redhat_cop.controller_configuration.notification_templates
+  tags:
+    - notifications
+    - alltags
+...
diff --git a/examples/templates/tasks/manage_organizations.yml b/examples/templates/tasks/manage_organizations.yml
index 636bb59db..74a4193e2 100644
--- a/examples/templates/tasks/manage_organizations.yml
+++ b/examples/templates/tasks/manage_organizations.yml
@@ -1,5 +1,5 @@
 ---
-- name: Get list of organizations from Controller
+- name: Get list of organizations from controller
   uri:
     force_basic_auth: true
     method: GET
@@ -9,6 +9,9 @@
     user: "{{ controller_username }}"
     validate_certs: "{{ controller_validate_certs }}"
   register: existing_organizations
+  tags:
+    - orgs
+    - alltags
 
 - name: Set fact when organization is present
   set_fact:
@@ -17,18 +20,30 @@
   loop: "{{ existing_organizations.json.results }}"
   loop_control:
     loop_var: org_names
+  tags:
+    - orgs
+    - alltags
 
 - name: Include organizations vars
   include_vars: ../vars/controller_organizations.yml
   when:
     - org_exists is not defined
+  tags:
+    - orgs
+    - alltags
 
 - name: Include organizations vars
   include_vars: ../vars/controller_organizations_with_hub.yml
   when:
     - org_exists is defined
     - org_exists
+  tags:
+    - orgs
+    - alltags
 
 - include_role:
     name: redhat_cop.controller_configuration.organizations
+  tags:
+    - orgs
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_projects.yml b/examples/templates/tasks/manage_projects.yml
index 0562253e7..b617176f7 100644
--- a/examples/templates/tasks/manage_projects.yml
+++ b/examples/templates/tasks/manage_projects.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include projects vars
   include_vars: ../vars/controller_projects.yml
+  tags:
+    - projects
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.projects
+  tags:
+    - projects
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_roles.yml b/examples/templates/tasks/manage_roles.yml
new file mode 100644
index 000000000..68dce00ab
--- /dev/null
+++ b/examples/templates/tasks/manage_roles.yml
@@ -0,0 +1,13 @@
+---
+- name: Include roles vars
+  include_vars: ../vars/controller_roles.yml
+  tags:
+    - roles
+    - alltags
+
+- import_role:
+    name: redhat_cop.controller_configuration.roles
+  tags:
+    - roles
+    - alltags
+...
diff --git a/examples/templates/tasks/manage_schedules.yml b/examples/templates/tasks/manage_schedules.yml
index eafbd2387..8585042ac 100644
--- a/examples/templates/tasks/manage_schedules.yml
+++ b/examples/templates/tasks/manage_schedules.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include schedules vars
   include_vars: ../vars/controller_schedules.yml
+  tags:
+    - schedules
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.schedules
+  tags:
+    - schedules
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_teams.yml b/examples/templates/tasks/manage_teams.yml
new file mode 100644
index 000000000..6e8b91ab8
--- /dev/null
+++ b/examples/templates/tasks/manage_teams.yml
@@ -0,0 +1,13 @@
+---
+- name: Include teams vars
+  include_vars: ../vars/controller_teams.yml
+  tags:
+    - teams
+    - alltags
+
+- import_role:
+    name: redhat_cop.controller_configuration.teams
+  tags:
+    - teams
+    - alltags
+...
diff --git a/examples/templates/tasks/manage_users.yml b/examples/templates/tasks/manage_users.yml
index 9033818ce..519aca9ca 100644
--- a/examples/templates/tasks/manage_users.yml
+++ b/examples/templates/tasks/manage_users.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include users vars
   include_vars: ../vars/controller_users.yml
+  tags:
+    - users
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.users
+  tags:
+    - users
+    - alltags
 ...
diff --git a/examples/templates/tasks/manage_workflow_templates.yml b/examples/templates/tasks/manage_workflow_templates.yml
index 512860ecd..10e637ceb 100644
--- a/examples/templates/tasks/manage_workflow_templates.yml
+++ b/examples/templates/tasks/manage_workflow_templates.yml
@@ -1,7 +1,13 @@
 ---
 - name: Include workflows vars
   include_vars: ../vars/controller_workflows.yml
+  tags:
+    - workflows
+    - alltags
 
-- include_role:
+- import_role:
     name: redhat_cop.controller_configuration.workflow_job_templates
+  tags:
+    - workflows
+    - alltags
 ...
diff --git a/examples/templates/vars/controller_credential_types.yml b/examples/templates/vars/controller_credential_types.yml
index 01e3dd1f3..a8a146a42 100644
--- a/examples/templates/vars/controller_credential_types.yml
+++ b/examples/templates/vars/controller_credential_types.yml
@@ -18,15 +18,17 @@ controller_credential_types:
           label: ""
           type: ""
         - id: ""
+          help_text: ""
+          label: ""
+          type: ""
       required:
-        -
-        -
+        - ""
+        - ""
     injectors:
       env:
-        # DO NOT MODIFY VALUES - changing them will cause an error
-        _HOST: "{% raw %}{  { host }}{% endraw %}"
-        _USERNAME: "{% raw %}{  { username }}{% endraw %}"
-        _PASSWORD: "{% raw %}{  { password }}{% endraw %}"
-        _VERIFY_SSL: "{% raw %}{  { verify_ssl }}{% endraw %}"
-        _OAUTH_TOKEN: "{% raw %}{  { oauth_token }}{% endraw %}"
+        _HOST: "{% raw %}{  { host }}{% endraw %}"                 # DO NOT REMOVE SPACES - removing them will cause an error.
+        _USERNAME: "{% raw %}{  { username }}{% endraw %}"         # DO NOT REMOVE SPACES - removing them will cause an error.
+        _PASSWORD: "{% raw %}{  { password }}{% endraw %}"         # DO NOT REMOVE SPACES - removing them will cause an error.
+        _VERIFY_SSL: "{% raw %}{  { verify_ssl }}{% endraw %}"     # DO NOT REMOVE SPACES - removing them will cause an error.
+        _OAUTH_TOKEN: "{% raw %}{  { oauth_token }}{% endraw %}"   # DO NOT REMOVE SPACES - removing them will cause an error.
 ...
diff --git a/examples/templates/vars/controller_execution_environments.yml b/examples/templates/vars/controller_execution_environments.yml
new file mode 100644
index 000000000..463009f1e
--- /dev/null
+++ b/examples/templates/vars/controller_execution_environments.yml
@@ -0,0 +1,12 @@
+# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/execution_environments
+# for documentation and additional parameter information
+
+---
+controller_execution_environments:
+  - name: ""
+    image: ""
+    organization: "{{ which_org }}"
+    credential: ""
+    pull: "" # always, missing, or never
+    state: "{{ absent_present }}"
+...
diff --git a/examples/templates/vars/controller_instance_groups.yml b/examples/templates/vars/controller_instance_groups.yml
new file mode 100644
index 000000000..7376c2003
--- /dev/null
+++ b/examples/templates/vars/controller_instance_groups.yml
@@ -0,0 +1,10 @@
+# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/instance_groups
+# for documentation and additional parameter information
+
+---
+controller_instance_groups:
+  - name: ""
+    instances: ""
+    is_container_group: false
+    state: "{{ absent_present }}"
+...
diff --git a/examples/templates/vars/controller_notification_templates.yml b/examples/templates/vars/controller_notification_templates.yml
index 3f09c26aa..7ec83f72d 100644
--- a/examples/templates/vars/controller_notification_templates.yml
+++ b/examples/templates/vars/controller_notification_templates.yml
@@ -1,21 +1,21 @@
-# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/falsetification_templates
+# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/notification_templates
 # for documentation and additional parameter information
 
 ---
-controller_falsetification_templates:
+controller_notification_templates:
   - name: ""
     new_name: ""
     description: ""
     organization: ""
-    falsetification_type: "email"
-    falsetification_configuration:
+    notification_type: "email"
+    notification_configuration:
       - host: ""
-        port:
+        port: 25
         username: ""
-        password: "{{ lookup('file','falsetifyOps_Pass_Vault.yml') }}"
+        password: ""
         sender: ""
         recipients:
-          -
+          - ""
         timeout: 30
         use_tls: true
         use_ssl: false
diff --git a/examples/templates/vars/controller_roles.yml b/examples/templates/vars/controller_roles.yml
new file mode 100644
index 000000000..c0831da0d
--- /dev/null
+++ b/examples/templates/vars/controller_roles.yml
@@ -0,0 +1,16 @@
+# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/roles
+# for documentation and additional parameter information
+
+# READ DOCUMENTATION FOR THIS ROLE BEFORE DEFINING PERMISSIONS AS CODE TO
+# ENSURE UNDERSTANDING
+
+---
+controller_roles:
+  - user: ""
+    role: ""
+    state: "{{ absent_present }}"
+
+  - team: ""
+    role: ""
+    state: "{{ absent_present }} "
+...
diff --git a/examples/templates/vars/controller_teams.yml b/examples/templates/vars/controller_teams.yml
new file mode 100644
index 000000000..8d7a75ac1
--- /dev/null
+++ b/examples/templates/vars/controller_teams.yml
@@ -0,0 +1,10 @@
+# Refer to https://github.com/redhat-cop/controller_configuration/tree/devel/roles/teams
+# for documentation and additional parameter information
+
+---
+controller_teams:
+  - name: ""
+    description: ""
+    organization: "{{ which_org }}"
+    state: "{{ absent_present }}"
+...
diff --git a/examples/templates/vars/controller_users.yml b/examples/templates/vars/controller_users.yml
index 587a9d96f..7d0d77baf 100644
--- a/examples/templates/vars/controller_users.yml
+++ b/examples/templates/vars/controller_users.yml
@@ -3,11 +3,11 @@
 
 ---
 controller_user_accounts:
-  - username:
-    password:
-    email:
-    first_name:
-    last_name:
+  - username: ""
+    password: ""
+    email: ""
+    first_name: ""
+    last_name: ""
     is_superuser: false
     state: "{{ absent_present }}"
 ...