diff --git a/basic-system/templates/hosts.j2 b/basic-system/templates/hosts.j2
index 9301e375eed74efbdd5e73dd86a2c802cd6fd583..cdfed956a634f31717068171a8609d2de9a33887 100644
--- a/basic-system/templates/hosts.j2
+++ b/basic-system/templates/hosts.j2
@@ -6,15 +6,15 @@ ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
 ff02::3 ip6-allhosts
 
-{%- for host in hosts_alternates %}
+{% for host in hosts_alternates %}
 {{ host }}	{{ ansible_host }} {{ inventory_hostname }}
 {% else %}
 {{ ansible_default_ipv4.address }}	{{ ansible_host }} {{ inventory_hostname }}
-{%- if address in ansible_default_ipv6 %}
+{% if 'address' in ansible_default_ipv6 %}
 {{ ansible_default_ipv6.address }}	{{ ansible_host }} {{ inventory_hostname }}
-{% endif -%}
-{% endfor -%}
+{% endif %}
+{% endfor %}
 
-{%- for host in hosts_additionals %}
+{% for host in hosts_additionals %}
 {{ host.address }}	{{ host.names|join(' ') }}
-{% endfor -%}
+{% endfor %}
diff --git a/shell/tasks/shell.yml b/shell/tasks/shell.yml
index 3e1bae04d127cb59ec3afd4f5eb21be451fbdc6b..464c21716be85cc6ec29dd94a3c80cc1aae485a7 100644
--- a/shell/tasks/shell.yml
+++ b/shell/tasks/shell.yml
@@ -59,28 +59,28 @@
     - packages
     - shell
 
-- name: ensure we have an up-to-date version of grml-zsh-config
-  get_url:
-    url: https://www.archlinux.org/packages/extra/any/grml-zsh-config/download/
-    dest: "{{ role_path }}/files/"
-  delegate_to: localhost
-  run_once: True
-  register: grml_zsh
-  tags:
-    - config
-    - shell
-
-- name: ensure grml-zsh-config is available
-  unarchive:
-    src: "{{ grml_zsh.dest }}"
-    dest: /
-    extra_opts: "--exlcude=.[A-Z]*"
-  when:
-    - grml_zsh.changed
-    - not grml_zsh.failed
-  tags:
-    - config
-    - shell
+    #- name: ensure we have an up-to-date version of grml-zsh-config
+    #  get_url:
+    #    url: https://www.archlinux.org/packages/extra/any/grml-zsh-config/download/
+    #    dest: "{{ role_path }}/files/"
+    #  delegate_to: localhost
+    #  run_once: True
+    #  register: grml_zsh
+    #  tags:
+    #    - config
+    #    - shell
+    #
+    #- name: ensure grml-zsh-config is available
+    #  unarchive:
+    #    src: "{{ grml_zsh.dest }}"
+    #    dest: /
+    #    extra_opts: "--exlcude=.[A-Z]*"
+    #  when:
+    #    - grml_zsh.changed
+    #    - not grml_zsh.failed
+    #  tags:
+    #    - config
+    #    - shell
 
 - name: ensure root uses the global zshrc
   copy: