diff --git a/firmware/firmware.freifunk.lu.yml b/firmware/firmware.freifunk.lu.yml
index f02f6789df9180283b534ebe0457c00a27990339..aa2fcadd2da2c16128ab5351557c8e77d8097ced 100644
--- a/firmware/firmware.freifunk.lu.yml
+++ b/firmware/firmware.freifunk.lu.yml
@@ -1,15 +1,14 @@
 ---
-- hosts: test
-  become: yes
+- name: "Setup the firmware.freifunk.lu website"
+  hosts: test
+  become: true
   vars:
-    server_name: 'firmware.freifunk.lu '
+    server_name: 'firmware.freifunk.lu'
     document_root: /var/www/firmware.freifunk.lu
   tasks:
     - name: Update apt cache and install Nginx
-      apt:
+      ansible.builtin.apt:
         name: nginx
-        state: latest
-        update_cache: yes
 
 # Create directory  firmware.freifunk.lu
     - name: Create the directory firmware.freifunk.lu in /var/www if it does not exist
@@ -20,13 +19,16 @@
 
 
     - name: Apply Nginx template
-      template:
+      ansible.builtin.template:
         src: /etc/ansible/playbooks/files/firmware.conf.j2
         dest: /etc/nginx/sites-available/firmware.freifunk.lu
+        owner: root
+        group: root
+        mode: "0644"
       notify: Restart Nginx
 
     - name: Enable new site
-      file:
+      ansible.builtin.file:
         src: /etc/nginx/sites-available/firmware.freifunk.lu
         dest: /etc/nginx/sites-enabled/firmware.freifunk.lu
         state: link
@@ -34,6 +36,6 @@
 
   handlers:
     - name: Restart Nginx
-      service:
+      ansible.builtin.service:
         name: nginx
-        state: restarted  
+        state: restarted