diff --git a/roles/minetest/tasks/rpi_minetest_install.yml b/roles/minetest/tasks/rpi_minetest_install.yml
index 1f466fc09..e1197cd4a 100644
--- a/roles/minetest/tasks/rpi_minetest_install.yml
+++ b/roles/minetest/tasks/rpi_minetest_install.yml
@@ -5,12 +5,10 @@
     rpi_src_url: http://www.nathansalapat.com/downloads/0.4.17.1.tar.gz
     rpi_src: minetest-0.4.17.1.tar.gz
 
-- name: Install packages for minetest
+- name: Install 'libhiredis-dev' package for minetest
   package:
-          name: "{{ item }}"
-          state: present
-  with_items:
-    - libhiredis-dev
+    name: libhiredis-dev
+    state: present
 
 #- name: Minetest already installed - terminate play
 #  meta: end_play
@@ -24,24 +22,22 @@
 
 - name: Create /etc/minetest and /library/games directories
   file:
-        path: "{{ item }}"
-        mode: 0755
-        owner: root
-        group: root
-        state: directory
+    state: directory
+    path: "{{ item }}"
+    owner: root
+    group: root
+    mode: 0755
   with_items:
     - /etc/minetest
     - /library/games
 
 - name: Create /var/log/minetest directory
   file:
-        path: "{{ item }}"
-        mode: 0755
-        owner: "{{ minetest_runas_user }}"
-        group: "{{ minetest_runas_group }}"
-        state: directory
-  with_items:
-    - /var/log/minetest
+    state: directory
+    path: /var/log/minetest
+    owner: "{{ minetest_runas_user }}"
+    group: "{{ minetest_runas_group }}"
+    mode: 0755
 
 - name: Extract minetest into /library/games
   unarchive:
@@ -50,22 +46,22 @@
     owner: "{{ minetest_runas_user }}"
     group: "{{ minetest_runas_group }}"
 
-- name: Create symbolic link
+- name: Create symbolic link /library/games/minetest
   file:
+    state: link
     src: /library/games/0.4.17.1
     dest: /library/games/minetest
     owner: "{{ minetest_runas_user }}"
     group: "{{ minetest_runas_group }}"
-    state: link
 
-- name: Create minetest-server service and minetest.conf file
+- name: Create /etc/minetest/minetest.conf and minetest-serve.service
   template:
     backup: no
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     owner: root
     group: root
-    mode: "{{ item.mode }}"
+    mode: 0644
   with_items:
-  - { src: 'minetest.conf.j2', dest: '/etc/minetest/minetest.conf', mode: '0644'}
-  - { src: 'minetest-serve.service.j2', dest: '/etc/systemd/system/minetest-serve.service', mode: '0644'}
+  - { src: 'minetest.conf.j2', dest: '/etc/minetest/minetest.conf' }
+  - { src: 'minetest-serve.service.j2', dest: '/etc/systemd/system/minetest-serve.service' }