From 02de615411e00a5f80c7a94b560311394cbf5c1c Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:00:56 +0100
Subject: [PATCH 01/13] Remove unused automation_hub_url variable

This variable was defined in preinit_vars.yml but never referenced
anywhere in the codebase.
---
 pre_init/vars/preinit_vars.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pre_init/vars/preinit_vars.yml b/pre_init/vars/preinit_vars.yml
index 1a1cdbd..c3647f0 100644
--- a/pre_init/vars/preinit_vars.yml
+++ b/pre_init/vars/preinit_vars.yml
@@ -10,7 +10,6 @@ ansible_cfg_log_path: '~/lab_builder_ansible.log'
 ansible_cfg_collections_path: '~/.ansible/collections/ansible_collections:/usr/share/ansible/collections/ansible_collections'
 ansible_cfg_patch_collection_dir: '~/.ansible/collections/ansible_collections'
 
-automation_hub_url: '{{ automation_hub_url_vault }}'
 automation_hub_token: '{{ automation_hub_token_vault }}'
 
 init_env_collection_install: true

From 7b17bdc2b77edf86b1c5f12055ebc497c4d963cd Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:01:06 +0100
Subject: [PATCH 02/13] Consolidate AAP debug tasks into a single task

Three separate debug tasks for reporting AAP endpoint, user, and
password are combined into one task with a message list.
---
 pre_init/openshift_vp_preinit.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pre_init/openshift_vp_preinit.yml b/pre_init/openshift_vp_preinit.yml
index 7678528..9985038 100644
--- a/pre_init/openshift_vp_preinit.yml
+++ b/pre_init/openshift_vp_preinit.yml
@@ -145,17 +145,12 @@
       ansible.builtin.set_fact:
         admin_password: "{{ admin_pw.resources[0].data.password | b64decode }}"
 
-    - name: Report AAP Endpoint
+    - name: Report AAP connection details
       ansible.builtin.debug:
-        msg: "AAP Endpoint: https://{{ ansible_host }}"
-
-    - name: Report AAP User
-      ansible.builtin.debug:
-        msg: "AAP Admin User: admin"
-
-    - name: Report AAP Admin Password
-      ansible.builtin.debug:
-        msg: "AAP Admin Password: {{ admin_password }}"
+        msg:
+          - "AAP Endpoint: https://{{ ansible_host }}"
+          - "AAP Admin User: admin"
+          - "AAP Admin Password: {{ admin_password }}"
 
     - name: Check on current API status
       ansible.builtin.uri:

From 80a765c73191f11d78007972f6c91a6a2e539dc7 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:01:50 +0100
Subject: [PATCH 03/13] Use local_token_duration_days variable in jwt_check
 error message

The error message had "30 days" hardcoded even though the duration is
parameterized via local_token_duration_days.
---
 pre_init/jwt_check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre_init/jwt_check.yml b/pre_init/jwt_check.yml
index 4c9c6e3..718068b 100644
--- a/pre_init/jwt_check.yml
+++ b/pre_init/jwt_check.yml
@@ -67,7 +67,7 @@
 - name: Token is not valid any longer
   ansible.builtin.fail:
     msg: >
-      "The {{ local_token_name }} token was generated more than 30 days ago {{ '%Y-%m-%d %H:%M' | strftime(jwt_iat) }}, "
+      "The {{ local_token_name }} token was generated more than {{ local_token_duration_days }} days ago {{ '%Y-%m-%d %H:%M' | strftime(jwt_iat) }}, "
       "you should renew your token. We're continuing, but chances are there might be issues with the token."
   when: (iat_after_duration | int < ansible_date_time['epoch'] | int)
   ignore_errors: true

From 266f57111ec5dc310df347baf6f24554f3fdb892 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:01:58 +0100
Subject: [PATCH 04/13] Quote template variables consistently in
 agof_overrides.yml.j2

aap_password and aap_hostname were unquoted while other string values
in the same file were quoted.
---
 pre_init/templates/agof_overrides.yml.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pre_init/templates/agof_overrides.yml.j2 b/pre_init/templates/agof_overrides.yml.j2
index 5af5c08..5997b21 100644
--- a/pre_init/templates/agof_overrides.yml.j2
+++ b/pre_init/templates/agof_overrides.yml.j2
@@ -8,8 +8,8 @@ admin_user: admin
 admin_password: "{{ admin_password }}"
 
 aap_username: admin
-aap_password: {{ admin_password }}
-aap_hostname: {{ ansible_host }}
+aap_password: "{{ admin_password }}"
+aap_hostname: "{{ ansible_host }}"
 aap_validate_certs: false
 
 agof_iac_repo: "{{ agof_iac_repo }}"

From c2a51d37123afe45c081268c1d57a722c525b8de Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:13:47 +0100
Subject: [PATCH 05/13] Fix broken exception handling in activations_to_enable
 filter

dict.get() never raises exceptions, and IndexError was the wrong type
anyway (KeyError would be correct for dicts). The except branch was
unreachable, causing every activation to be treated as enabled
regardless of its 'enabled' or 'state' values.

Replace with explicit key presence check that respects the 'enabled'
field value and falls back to checking 'state'.
---
 .../roles/pre_config_fixups/filter_plugins/filters.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/agof_configure_aap/roles/pre_config_fixups/filter_plugins/filters.py b/agof_configure_aap/roles/pre_config_fixups/filter_plugins/filters.py
index d504055..dd2934b 100644
--- a/agof_configure_aap/roles/pre_config_fixups/filter_plugins/filters.py
+++ b/agof_configure_aap/roles/pre_config_fixups/filter_plugins/filters.py
@@ -12,13 +12,12 @@ def activations_to_enable(self, activations=None):
             return enabled_activations
 
         for a in activations:
-            enabled = False
-            try:
-                a.get('enabled')
+            if 'enabled' in a:
+                enabled = bool(a['enabled'])
+            elif a.get('state', 'present') in ["present", "enabled"]:
                 enabled = True
-            except IndexError:
-                if a.get('state', 'present') in ["present", "enabled"]:
-                    enabled = True
+            else:
+                enabled = False
 
             if enabled:
                 enabled_activations.append(a.get('name'))

From a6094e2dee7cfd97b49e58267de59928b7f7b693 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:13:56 +0100
Subject: [PATCH 06/13] Remove unused controller_state variable

Defined in configure_aap defaults but never referenced anywhere in the
project.
---
 agof_configure_aap/roles/configure_aap/defaults/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/agof_configure_aap/roles/configure_aap/defaults/main.yml b/agof_configure_aap/roles/configure_aap/defaults/main.yml
index 72b2811..5fce45b 100644
--- a/agof_configure_aap/roles/configure_aap/defaults/main.yml
+++ b/agof_configure_aap/roles/configure_aap/defaults/main.yml
@@ -7,8 +7,6 @@ aap_hostname: 'aap.{{ pattern_name }}.{{ pattern_dns_zone }}'
 
 api_prefix: api/controller/v2
 
-controller_state: present
-
 agof_configure_aap_debug: false
 aap_request_timeout: 90
 aap_configuration_async_dir: /tmp/.ansible_async

From e1ebad75caf9b2b837ec8d3d368e4d2fd4d770c6 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:14:14 +0100
Subject: [PATCH 07/13] Rename vague "Debug" task to "Show AAP hostname"

Task name should describe what it shows, not just say "Debug".
---
 agof_configure_aap/roles/configure_aap/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agof_configure_aap/roles/configure_aap/tasks/main.yml b/agof_configure_aap/roles/configure_aap/tasks/main.yml
index b49f883..7e9ff94 100644
--- a/agof_configure_aap/roles/configure_aap/tasks/main.yml
+++ b/agof_configure_aap/roles/configure_aap/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: Debug
+- name: Show AAP hostname
   ansible.builtin.debug:
     msg:
       - "aap_hostname: {{ aap_hostname }}"

From 7ef45850561f125789b0e87d90979eca7be167ae Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:14:23 +0100
Subject: [PATCH 08/13] Remove unnecessary block wrapper around pre-config
 fixups

A block containing a single task can be replaced with the task
directly, moving the when condition onto it.
---
 agof_configure_aap/roles/configure_aap/tasks/main.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/agof_configure_aap/roles/configure_aap/tasks/main.yml b/agof_configure_aap/roles/configure_aap/tasks/main.yml
index 7e9ff94..732680f 100644
--- a/agof_configure_aap/roles/configure_aap/tasks/main.yml
+++ b/agof_configure_aap/roles/configure_aap/tasks/main.yml
@@ -113,11 +113,9 @@
     - agof_configure_aap_debug
 
 - name: Perform any necessary pre-config fixups
-  when: (perform_pre_config_fixups|bool) is true
-  block:
-    - name: Pre-config fixes
-      ansible.builtin.include_role:
-        name: agof_configure_aap/roles/pre_config_fixups
+  when: perform_pre_config_fixups | bool
+  ansible.builtin.include_role:
+    name: agof_configure_aap/roles/pre_config_fixups
 
 - name: "Configure AAP - Version 2.5+"
   block:

From cac4d3b405a9ae5678156ed75d54b4680c7db92f Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 17:14:34 +0100
Subject: [PATCH 09/13] Consolidate adjacent set_fact tasks in
 rulebook_activations

These two set_fact tasks have no dependency on each other and can be
a single task.
---
 .../roles/pre_config_fixups/tasks/rulebook_activations.yml   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/agof_configure_aap/roles/pre_config_fixups/tasks/rulebook_activations.yml b/agof_configure_aap/roles/pre_config_fixups/tasks/rulebook_activations.yml
index 0114ef5..34f81fe 100644
--- a/agof_configure_aap/roles/pre_config_fixups/tasks/rulebook_activations.yml
+++ b/agof_configure_aap/roles/pre_config_fixups/tasks/rulebook_activations.yml
@@ -8,12 +8,9 @@
       ansible.builtin.debug:
         var: eda_rulebook_activations
 
-    - name: Default set of rulebook activations to stop to empty
+    - name: Initialize activation tracking variables
       ansible.builtin.set_fact:
         rulebook_activations_to_disable: []
-
-    - name: Determine whether we have any enabled activations due to configure
-      ansible.builtin.set_fact:
         enabled_activation_names: "{{ eda_rulebook_activations | activations_to_enable | list }}"
 
     - name: Retrieve existing rulebook activation configs

From a16c811ca43b61d3942fdf6c02fe57073d69c293 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 18:10:21 +0100
Subject: [PATCH 10/13] Remove commented-out debug task in resources.yml

---
 .../aws/roles/manage_ec2_infra/tasks/resources/resources.yml  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml b/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml
index 2c02210..7cff87a 100644
--- a/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml
+++ b/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml
@@ -103,10 +103,6 @@
     region: "{{ ec2_region }}"
   register: create_key
 
-#- name: Debug create key
-#  ansible.builtin.debug:
-#    var: create_key
-
 - name: Save private key
   ansible.builtin.copy:
     content: "{{ create_key.key.private_key }}"

From 3560ae697df51161e727259725eccd402e7a387d Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 18:10:32 +0100
Subject: [PATCH 11/13] Consolidate AWS user set_fact tasks in aws_check_setup

aws_user and aws_account are independent facts extracted from the same
whoami result and can be set in a single task.
---
 init_env/aws/roles/aws_check_setup/tasks/main.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/init_env/aws/roles/aws_check_setup/tasks/main.yml b/init_env/aws/roles/aws_check_setup/tasks/main.yml
index ce9d057..7d98272 100644
--- a/init_env/aws/roles/aws_check_setup/tasks/main.yml
+++ b/init_env/aws/roles/aws_check_setup/tasks/main.yml
@@ -87,10 +87,7 @@
   debug:
     var: whoami
 
-- name: save username of AWS user
+- name: save AWS user details
   set_fact:
     aws_user: '{{ whoami.arn.split("/")[-1] }}'
-
-- name: save account id of AWS user
-  set_fact:
     aws_account: '{{ whoami.account }}'

From a81ef48a30eba85f1c652eb36828ec4666ef4912 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 18:10:42 +0100
Subject: [PATCH 12/13] Consolidate adjacent debug tasks in teardown.yml

Two separate debug tasks for ec2_vpc_id and ec2_security_group with
the same debug_teardown condition are combined into one.
---
 .../aws/roles/manage_ec2_infra/tasks/teardown.yml     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml b/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml
index e6fc18b..5c72d14 100644
--- a/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml
+++ b/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml
@@ -24,14 +24,11 @@
     ec2_security_group: "{{ ec2_name_prefix }}-insecure_all"
   when: ec2_security_group is undefined
 
-- name: debug ec2_vpc_id
+- name: debug ec2 variables
   debug:
-    var: ec2_vpc_id
-  when: debug_teardown
-
-- name: debug ec2_security_group
-  debug:
-    var: ec2_security_group
+    msg:
+      - "ec2_vpc_id: {{ ec2_vpc_id | default('UNDEFINED') }}"
+      - "ec2_security_group: {{ ec2_security_group | default('UNDEFINED') }}"
   when: debug_teardown
 
 # retrieve instances for VPC 1

From 822bb2c337abd90086d53fd73948e16c8ebe1edd Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 10 Feb 2026 18:12:19 +0100
Subject: [PATCH 13/13] Use fully qualified collection names for builtin
 modules in init_env

Replace unqualified module names (set_fact, debug, assert, fail, file,
include_tasks, template) with their ansible.builtin.* equivalents
across all task files in init_env/aws/.
---
 .../aws/roles/aws_check_setup/tasks/main.yml  | 22 +++++++++----------
 .../aws/roles/manage_ec2_infra/tasks/main.yml |  2 +-
 .../manage_ec2_infra/tasks/provision.yml      |  4 ++--
 .../manage_ec2_infra/tasks/resources/none.yml |  2 +-
 .../tasks/resources/resources.yml             |  4 ++--
 .../roles/manage_ec2_infra/tasks/teardown.yml | 18 +++++++--------
 .../roles/manage_ec2_instances/tasks/main.yml |  2 +-
 init_env/aws/teardown.yml                     |  6 ++---
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/init_env/aws/roles/aws_check_setup/tasks/main.yml b/init_env/aws/roles/aws_check_setup/tasks/main.yml
index 7d98272..d6b7e19 100644
--- a/init_env/aws/roles/aws_check_setup/tasks/main.yml
+++ b/init_env/aws/roles/aws_check_setup/tasks/main.yml
@@ -1,19 +1,19 @@
 ---
 - name: make sure we are running correct Ansible Version
-  assert:
+  ansible.builtin.assert:
     that:
       - ansible_version.major >= 2
       - ansible_version.minor >= 11
 
 - name: make sure dns_type is set to a correct value
-  assert:
+  ansible.builtin.assert:
     that:
       - dns_type is defined
       - dns_type in valid_dns_type
     msg: "dns_type must be defined and be one of: {{ valid_dns_type }}"
 
 - name: make sure we are not running with TESTPATTERN as the name so no overlap
-  assert:
+  ansible.builtin.assert:
     that:
       - ec2_name_prefix != "TESTPATTERN"
     msg:
@@ -21,7 +21,7 @@
       - "please set a unique name for your pattern"
 
 - name: make sure we are not using `ansible` as the password
-  assert:
+  ansible.builtin.assert:
     that:
       - admin_password != "ansible"
     msg:
@@ -35,7 +35,7 @@
   when: dns_type == "aws"
   block:
     - name: check for underscores in pattern name
-      fail:
+      ansible.builtin.fail:
         msg: "Amazon AWS does not allow underscores _ for s3 websites, please see https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html"
       when:
         - "'_' in ec2_name_prefix"
@@ -48,7 +48,7 @@
       register: test
 
     - name: make sure pattern_dns_zone is owned by your account
-      assert:
+      ansible.builtin.assert:
         that:
           - test.zone_id is not none
         msg:
@@ -62,7 +62,7 @@
   until: az_names is not failed
 
 - name: Remove any AZs in the aws_az_deny_list when defined
-  set_fact:
+  ansible.builtin.set_fact:
     availability_zones: >-
       {{ az_names.availability_zones | json_query(__filter_query) }}
   vars:
@@ -70,12 +70,12 @@
       [?!contains(`{{ (aws_az_deny_list | default([])) | to_json }}`, zone_name)]
 
 - name: Output AWS Availability Zones (AZs)
-  debug:
+  ansible.builtin.debug:
     var: availability_zones
     verbosity: 2
 
 - name: SET AZ ZONE TO FIRST AVAILABLE
-  set_fact:
+  ansible.builtin.set_fact:
     ec2_az: "{{ availability_zones[0].zone_name }}"
 
 - name: grab information about AWS user
@@ -84,10 +84,10 @@
   register: whoami
 
 - name: print whoami
-  debug:
+  ansible.builtin.debug:
     var: whoami
 
 - name: save AWS user details
-  set_fact:
+  ansible.builtin.set_fact:
     aws_user: '{{ whoami.arn.split("/")[-1] }}'
     aws_account: '{{ whoami.account }}'
diff --git a/init_env/aws/roles/manage_ec2_infra/tasks/main.yml b/init_env/aws/roles/manage_ec2_infra/tasks/main.yml
index 1f3e835..476b42d 100644
--- a/init_env/aws/roles/manage_ec2_infra/tasks/main.yml
+++ b/init_env/aws/roles/manage_ec2_infra/tasks/main.yml
@@ -3,6 +3,6 @@
   when: teardown|bool
 
 - name: provision aws resources and instances
-  include_tasks: provision.yml
+  ansible.builtin.include_tasks: provision.yml
   tags: provisioned
   when: not teardown|bool
diff --git a/init_env/aws/roles/manage_ec2_infra/tasks/provision.yml b/init_env/aws/roles/manage_ec2_infra/tasks/provision.yml
index d788a22..a1330b4 100644
--- a/init_env/aws/roles/manage_ec2_infra/tasks/provision.yml
+++ b/init_env/aws/roles/manage_ec2_infra/tasks/provision.yml
@@ -1,10 +1,10 @@
 ---
 - name: ensure workshop folder {{ ec2_name_prefix }} exists
-  file:
+  ansible.builtin.file:
     path: "{{ pattern_state_rootdir }}/{{ ec2_name_prefix }}"
     state: directory
 
 ## These AWS resources are used for every workshop type
 ## This includes VPC, subnet, Security Group, Internet Gateway and route table
 - name: provision aws resources
-  include_tasks: resources/resources.yml
+  ansible.builtin.include_tasks: resources/resources.yml
diff --git a/init_env/aws/roles/manage_ec2_infra/tasks/resources/none.yml b/init_env/aws/roles/manage_ec2_infra/tasks/resources/none.yml
index 8536500..4543a11 100644
--- a/init_env/aws/roles/manage_ec2_infra/tasks/resources/none.yml
+++ b/init_env/aws/roles/manage_ec2_infra/tasks/resources/none.yml
@@ -1,4 +1,4 @@
 ---
 - name: dns_type set to none, not using any cloud for backup
-  debug:
+  ansible.builtin.debug:
     msg: "dns_type set to none, not using any cloud for backup"
diff --git a/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml b/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml
index 7cff87a..5d82d1f 100644
--- a/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml
+++ b/init_env/aws/roles/manage_ec2_infra/tasks/resources/resources.yml
@@ -15,7 +15,7 @@
   retries: 5
 
 - name: Create file for all AWS security group rules
-  template:
+  ansible.builtin.template:
     src: vpc_rules.j2
     dest: "{{pattern_state_rootdir}}/{{ec2_name_prefix}}/aws_rules.yml"
   delegate_to: localhost
@@ -92,7 +92,7 @@
   retries: 5
 
 - name: set variables for instance creation
-  set_fact:
+  ansible.builtin.set_fact:
     ec2_vpc_id: "{{ create_vpc.vpc.id }}"
     ec2_security_group: "{{ ec2_name_prefix }}-insecure_all"
     ec2_vpc_subnet_id: "{{ create_subnet.subnet.id }}"
diff --git a/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml b/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml
index 5c72d14..305625a 100644
--- a/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml
+++ b/init_env/aws/roles/manage_ec2_infra/tasks/teardown.yml
@@ -7,25 +7,25 @@
   register: vpc_net_facts
 
 - name: debug vpc_net_facts
-  debug:
+  ansible.builtin.debug:
     var: vpc_net_facts
   when: debug_teardown
 
 - name: debugging vpc id for {{ ec2_name_prefix }}
-  debug:
+  ansible.builtin.debug:
     msg: "vpc id:'{{vpc_net_facts.vpcs[0].id}}'"
   when:
     - debug_teardown
     - vpc_net_facts.vpcs|length > 0
 
 - name: use set fact for easier variables
-  set_fact:
+  ansible.builtin.set_fact:
     ec2_vpc_id: "{{vpc_net_facts.vpcs[0].id|default('WORKSHOP_UNDEF')}}"
     ec2_security_group: "{{ ec2_name_prefix }}-insecure_all"
   when: ec2_security_group is undefined
 
 - name: debug ec2 variables
-  debug:
+  ansible.builtin.debug:
     msg:
       - "ec2_vpc_id: {{ ec2_vpc_id | default('UNDEFINED') }}"
       - "ec2_security_group: {{ ec2_security_group | default('UNDEFINED') }}"
@@ -40,7 +40,7 @@
   register: all_workshop_vpc_nodes
 
 - name: debug all_workshop_vpc_nodes
-  debug:
+  ansible.builtin.debug:
     var: all_workshop_vpc_nodes
   when: debug_teardown
 
@@ -58,7 +58,7 @@
     - not aws_cli_destroy_ec2|default(false)|bool
 
 - name: debug result_ec2_destroy
-  debug:
+  ansible.builtin.debug:
     var: result_ec2_destroy
   when: debug_teardown
 
@@ -72,7 +72,7 @@
       register: dangling_eni_info
 
     - name: debug dangling_eni_info
-      debug:
+      ansible.builtin.debug:
         var: dangling_eni_info
       when: debug_teardown
 
@@ -91,7 +91,7 @@
       register: subnet1_eni_info
 
     - name: debug subnet1_eni_info
-      debug:
+      ansible.builtin.debug:
         var: subnet1_eni_info
       when: debug_teardown
 
@@ -159,7 +159,7 @@
   when: item.associations == []
 
 - name: set keys for instance creation dynamically since key was not supplied by user
-  set_fact:
+  ansible.builtin.set_fact:
     ec2_key_name: "{{ ec2_name_prefix }}-key"
 
 - name: delete ssh key pair for workshop {{ ec2_name_prefix }}
diff --git a/init_env/aws/roles/manage_ec2_instances/tasks/main.yml b/init_env/aws/roles/manage_ec2_instances/tasks/main.yml
index bc87de8..34bc519 100644
--- a/init_env/aws/roles/manage_ec2_instances/tasks/main.yml
+++ b/init_env/aws/roles/manage_ec2_instances/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # Note: we always build AAP. It is in the defaults
 - name: overwrite select ec2_instaces vars if ec2_instances_xtra vars are provided
-  set_fact:
+  ansible.builtin.set_fact:
     ec2_instances: '{{ ec2_instances|combine(ec2_instances_xtra) }}'
   when: (ec2_instances_xtra is defined) and (ec2_instances_xtra is not none)
 
diff --git a/init_env/aws/teardown.yml b/init_env/aws/teardown.yml
index 5962044..b7686c0 100644
--- a/init_env/aws/teardown.yml
+++ b/init_env/aws/teardown.yml
@@ -12,11 +12,11 @@
     - name: collection final check
       block:
         - name: run AWS check setup if using AWS
-          include_role:
+          ansible.builtin.include_role:
             name: roles/aws_check_setup
       rescue:
         - name: Error with setup
-          fail:
+          ansible.builtin.fail:
             msg: The provisioner has failed during initial check_setup, please scroll up to see exact error.  Open an issue on https://github.com/validatedpatterns/agof/issues
 
 - name: "Get info on the elements built"
@@ -74,6 +74,6 @@
       loop: "{{ built_instances }}"
 
     - name: Remove pattern local files
-      file:
+      ansible.builtin.file:
         dest: "{{ pattern_state_rootdir }}/{{ ec2_name_prefix }}"
         state: absent