diff --git a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
index db6eea26f..3421e369b 100644
--- a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
+++ b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
@@ -34,7 +34,7 @@
     name: aws/aws_vpc
     tasks_from: security_group
   vars:
-    aws_vpc:
+    aws_vpc_sg:
       name: "{{ aws_ec2_autoscale_cluster.name }}"
       profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
       region: "{{ aws_ec2_autoscale_cluster.region }}"
@@ -45,10 +45,10 @@
       rules:
         - proto: all
           group_name: "{{ aws_ec2_autoscale_cluster.name }}"
-    rules_egress:
-      - proto: all
-        group_name: "{{ aws_ec2_autoscale_cluster.name }}"
-        rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
+      rules_egress:
+        - proto: all
+          group_name: "{{ aws_ec2_autoscale_cluster.name }}"
+          rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
 
 - name: Set _aws_ec2_autoscale_cluster_security_group variable.
   ansible.builtin.set_fact:
diff --git a/roles/debian/pam_ldap/tasks/main.yml b/roles/debian/pam_ldap/tasks/main.yml
index b2a4de250..2445bed77 100644
--- a/roles/debian/pam_ldap/tasks/main.yml
+++ b/roles/debian/pam_ldap/tasks/main.yml
@@ -14,14 +14,14 @@
   ansible.builtin.file:
     path: /etc/ldap/ssl
     state: directory
-  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
+  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
 
 - name: Copy certificate.
   ansible.builtin.copy:
     src: "{{ pam_ldap.ssl_certificate }}"
     dest: "/etc/ldap/ssl/{{ pam_ldap.ssl_certificate | basename }}"
     mode: "0666"
-  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
+  when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
 
 - name: Copy nslcd config.
   ansible.builtin.template: