diff --git a/roles/maas/templates/automation-compose.yml.j2 b/roles/maas/templates/automation-compose.yml.j2
index 35930fa..b37a963 100644
--- a/roles/maas/templates/automation-compose.yml.j2
+++ b/roles/maas/templates/automation-compose.yml.j2
@@ -44,7 +44,7 @@
     - "SWITCHQ_PROVISION_TTL=0s"
     - "SWITCHQ_DEFAULT_ROLE=fabric-switch"
     - "SWITCHQ_ADDRESS_URL=file:///switchq/dhcp/dhcp_harvest.inc"
-  volumnes:
+  volumes:
     - "/etc/bind/maas:/switchq/dhcp"
 
 automation:
@@ -60,14 +60,14 @@
     - "GODEBUG=netdns=go"
     - "AUTOMATION_PROVISION_URL=http://provisioner:4243/provision/"
     - "AUTOMATION_PROVISION_TTL=30m"
-{% if virtualbox_support is defined %}
+{% if virtualbox_support is defined and virtualbox_support == 1 %}
     - "AUTOMATION_POWER_HELPER_SCRIPT=/etc/maas/virtualbox/power_discovery"
     - "AUTOMATION_POWER_HELPER_USER={{ virtualbox.power_helper_user }}"
     - "AUTOMATION_POWER_HELPER_HOST={{ virtualbox_host }}"
 {% endif %}
   volumes:
     - "/etc/maas:/mappings"
-{% if virtualbox_support is defined %}
+{% if virtualbox_support is defined and virtualbox_support == 1 %}
     - "/etc/maas/virtualbox:/etc/maas/virtualbox"
 {% endif %}
   command: [ "-apiVersion", "1.0", "-apikey", "{{ apikey.stdout }}", "-maas", "http://{{ mgmt_ip_address.stdout }}/MAAS", "-period", "30s", "-mappings", "@/mappings/mappings.json", "-always-rename" ]