diff --git a/playbooks/roles/install-ansible/templates/ansible.cfg.j2 b/playbooks/roles/install-ansible/templates/ansible.cfg.j2
index 0dd890f613..a343ff5dd9 100644
--- a/playbooks/roles/install-ansible/templates/ansible.cfg.j2
+++ b/playbooks/roles/install-ansible/templates/ansible.cfg.j2
@@ -9,6 +9,8 @@ retry_files_save_path=
 gathering=smart
 fact_caching=jsonfile
 fact_caching_connection=/var/cache/ansible/facts
+# Squash warning about ansible auto-transforming group names with -'s in them
+force_valid_group_names=ignore
 callback_whitelist=profile_tasks, timer
 {% if install_ansible_ara_enable %}
 callback_plugins=/etc/ansible/callback_plugins:{{ install_ansible_ara_callback_plugins.stdout }}
diff --git a/playbooks/roles/install-docker/tasks/main.yaml b/playbooks/roles/install-docker/tasks/main.yaml
index 83e088bf2b..5b1a505308 100644
--- a/playbooks/roles/install-docker/tasks/main.yaml
+++ b/playbooks/roles/install-docker/tasks/main.yaml
@@ -6,11 +6,11 @@
 
 - name: Install docker-ce from upstream
   include: upstream.yaml
-  when: use_upstream_docker
+  when: use_upstream_docker|bool
 
 - name: Install docker-engine from distro
   include: distro.yaml
-  when: not use_upstream_docker
+  when: not use_upstream_docker|bool
 
 - name: reset ssh connection to pick up docker group
   meta: reset_connection