diff --git a/main.yml b/main.yml
index 45a5f1e..d78ecf6 100644
--- a/main.yml
+++ b/main.yml
@@ -18,7 +18,7 @@
     - name: Ensure unattended-upgrades is installed and up to date
       apt:
         name: unattended-upgrades
-        state: latest
+        state: present
 
     - name: Setup unattended-upgrades
       include_role:
diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index 14930b3..b4e280c 100644
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -3,7 +3,7 @@
   apt:
     name:
       - apache2
-    state: latest
+    state: present
 
 - name: Ensure necessary modules are enabled
   apache2_module:
diff --git a/roles/docker_setup/tasks/main.yml b/roles/docker_setup/tasks/main.yml
index c61471a..fe3edec 100644
--- a/roles/docker_setup/tasks/main.yml
+++ b/roles/docker_setup/tasks/main.yml
@@ -75,5 +75,5 @@
     name: "{{ item.logname }}"
     groups: docker
     append: yes
-  when: item.docker == true
+  when: item.docker
   with_items: "{{ users }}"
diff --git a/roles/setup-http-site-forward/tasks/main.yml b/roles/setup-http-site-forward/tasks/main.yml
index 8d0228d..cac1779 100644
--- a/roles/setup-http-site-forward/tasks/main.yml
+++ b/roles/setup-http-site-forward/tasks/main.yml
@@ -2,11 +2,11 @@
 - name: Add or update Apache2 site
   template:
     src: templates/apache-docker-forward-site.j2
-    dest: /etc/apache2/sites-available/{{site_name}}.conf
+    dest: /etc/apache2/sites-available/{{ site_name }}.conf
   notify: restart apache2
 
 - name: Activate Apache2 site
-  command: a2ensite {{ site_name}}
+  command: a2ensite {{ site_name }}
   args:
     creates: /etc/apache2/sites-enabled/{{ site_name }}.conf
   notify: restart apache2
diff --git a/roles/setup-http-site-proxy/tasks/main.yml b/roles/setup-http-site-proxy/tasks/main.yml
index 70f5f5c..6aeff36 100644
--- a/roles/setup-http-site-proxy/tasks/main.yml
+++ b/roles/setup-http-site-proxy/tasks/main.yml
@@ -2,11 +2,11 @@
 - name: Add or update Apache2 site
   template:
     src: templates/apache-docker-proxy-site.j2
-    dest: /etc/apache2/sites-available/{{site_name}}.conf
+    dest: /etc/apache2/sites-available/{{ site_name }}.conf
   notify: restart apache2
 
 - name: Activate Apache2 site
-  command: a2ensite {{ site_name}}
+  command: a2ensite {{ site_name }}
   args:
     creates: /etc/apache2/sites-enabled/{{ site_name }}.conf
   notify: restart apache2
diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml
index bc29637..ad93bc1 100644
--- a/roles/users/tasks/main.yml
+++ b/roles/users/tasks/main.yml
@@ -37,7 +37,7 @@
     name: "{{ item.logname }}"
     groups: sudo
     append: yes
-  when: item.sudo == true
+  when: item.sudo
   with_items: "{{ users }}"
 
 - name: Check if /etc/aliases exists