diff --git a/apache/tasks/apache-basic-auth.yml b/apache/tasks/apache-basic-auth.yml
index 30f1176c..32dce012 100644
--- a/apache/tasks/apache-basic-auth.yml
+++ b/apache/tasks/apache-basic-auth.yml
@@ -1,7 +1,7 @@
 ---
 - name: Load the basic auth modules
   apache2_module: name={{ item }} state=present
-  with_items: apache_basic_auth_modules
+  with_items: '{{ apache_basic_auth_modules }}'
   notify: apache2 reload
   tags:
     - apache
@@ -29,7 +29,7 @@
 
 - name: Create the basic auth file
   htpasswd: path={{ item.auth_file }} name={{ item.username }} password={{ item.password }} create=yes state={{ item.state }}
-  with_items: apache_basic_users
+  with_items: '{{ apache_basic_users }}'
   when: apache_basic_users is defined and not apache_basic_auth_single_file
   tags:
     - apache
diff --git a/letsencrypt-acmetool-client/tasks/main.yml b/letsencrypt-acmetool-client/tasks/main.yml
index 5411b49d..f6e97539 100644
--- a/letsencrypt-acmetool-client/tasks/main.yml
+++ b/letsencrypt-acmetool-client/tasks/main.yml
@@ -25,12 +25,12 @@
   notify: Initialize letsencrypt acmetool
   tags: letsencrypt
 
-- name: Create the letsencrytp acme user
+- name: Create the letsencrypt acme user
   user: name={{ letsencrypt_acme_user }} home={{ letsencrypt_acme_user_home }} createhome=no shell=/bin/bash
   when: letsencrypt_acme_install
   tags: letsencrypt
 
-- name: Create the letsencrytp acme home, if it does not exist already. In a separate step because it could be already there.
+- name: Create the letsencrypt acme home, if it does not exist already. In a separate step because it could be already there.
   file: dest={{ letsencrypt_acme_user_home }} owner={{ letsencrypt_acme_user }} group={{ letsencrypt_acme_user }} state=directory recurse=yes
   when: letsencrypt_acme_install
   tags: letsencrypt
diff --git a/postfix-relay/tasks/postfix-relay-server.yml b/postfix-relay/tasks/postfix-relay-server.yml
index e1c5152a..7a223a38 100644
--- a/postfix-relay/tasks/postfix-relay-server.yml
+++ b/postfix-relay/tasks/postfix-relay-server.yml
@@ -7,7 +7,7 @@
 
 - name: Install the sasl2 authentication infrastructure
   apt: pkg={{ item }} state=installed
-  with_items: postfix_sasl_packages
+  with_items: '{{ postfix_sasl_packages }}'
   tags:
     - postfix-relay
 
diff --git a/solr-tomcat-instance/defaults/main.yml b/solr-tomcat-instance/defaults/main.yml
index 1f842043..cc7eb1f7 100644
--- a/solr-tomcat-instance/defaults/main.yml
+++ b/solr-tomcat-instance/defaults/main.yml
@@ -33,7 +33,7 @@ solr_opts: "-DzkRun -DnumShards={{ solr_shards }}"
 #solr_opts: "-DzkRun={{ ansible_fqdn}}:{{ solr_zoo_port }} -DnumShards={{ solr_shards }} -DzkHost=index1:{{ solr_zoo_port }},index2:{{ solr_zoo_port }},index3:{{ solr_zoo_port }}"
 
 # Define the following if you want a multicore installation
-#solr_multicore: True
+solr_multicore: False
 solr_cores:
   - collection1
 
diff --git a/solr-tomcat-instance/templates/solr.xml.j2 b/solr-tomcat-instance/templates/solr.xml.j2
index 86a3c5ef..f44540e6 100644
--- a/solr-tomcat-instance/templates/solr.xml.j2
+++ b/solr-tomcat-instance/templates/solr.xml.j2
@@ -29,7 +29,7 @@
 <solr>
 
   <solrcloud>
-    {% if solr_multicore is not defined or not solr_multicore %}
+    {% if not solr_multicore %}
     <str name="host">{{ ansible_fqdn }}</str>
     <int name="hostPort">{{ solr_http_port_1 }}</int>
     <str name="hostContext">${hostContext:solr}</str>
@@ -43,7 +43,7 @@
     <int name="connTimeout">${connTimeout:0}</int>
   </shardHandlerFactory>
 
-  {% if solr_multicore is defined or solr_multicore %}
+  {% if solr_multicore %}
   <cores adminPath="/admin/cores">
     {% for core in solr_cores %}