diff --git a/roles/aws/aws_ami_asg_cleanup/tasks/main.yml b/roles/aws/aws_ami_asg_cleanup/tasks/main.yml
index 9c1c8f6ec..d23a1f5ea 100644
--- a/roles/aws/aws_ami_asg_cleanup/tasks/main.yml
+++ b/roles/aws/aws_ami_asg_cleanup/tasks/main.yml
@@ -31,7 +31,7 @@
 
 - name: Sleep for 30 seconds for IAM before Lambda creation
   ansible.builtin.wait_for:
-    timeout: 30
+    timeout: 20
 
 - name: Create Lambda function
   amazon.aws.lambda:
@@ -49,11 +49,11 @@
 
 - name: Create scheduler to invoke Lambda function
   amazon.aws.cloudwatchevent_rule:
-    name: "cleanup_asg_ami_{{ _domain_name }}"
+    name: "cleanup_asg_ami_{{ _aws_resource_name }}"
     schedule_expression: "{{ aws_ami_asg_cleanup.scheduler_cron }}"
     description: Clean up ASG AMIs
     region: "{{ _aws_region }}"
     targets:
       - id: 'clean_up_ami'
         arn: "{{ _created_iam_lambda_cleanup_function.configuration.function_arn }}"
-        input: '{"asg_name": "{{ _domain_name | regex_replace("\.", "-") }}"}'
+        input: '{"asg_name": "{{ _aws_resource_name }}"}'
diff --git a/roles/debian/apt_extra_packages/tasks/main.yml b/roles/debian/apt_extra_packages/tasks/main.yml
index 2cdaf6f83..8c688b0ed 100644
--- a/roles/debian/apt_extra_packages/tasks/main.yml
+++ b/roles/debian/apt_extra_packages/tasks/main.yml
@@ -7,13 +7,13 @@
   ansible.builtin.set_fact:
     apt_list: []
 
-- name: Add URLs to wget list
+- name: Add items with URL to wget list
   ansible.builtin.set_fact:
     wget_list: "{{ wget_list + [item] }}"
   loop: "{{ apt_extra_packages }}"
   when: "item is regex('^https?://')"
 
-- name: Add URLs to apt list
+- name: Add non URL items to apt list
   ansible.builtin.set_fact:
     apt_list: "{{ apt_list + [item] }}"
   when: "item is not regex('^https?://')"
@@ -31,4 +31,4 @@
   when: wget_list | length > 0
   loop: "{{ wget_list }}"
   loop_control:
-    loop_var: wget_item
\ No newline at end of file
+    loop_var: wget_item