diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index 532031b..a334a66 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -4,6 +4,8 @@
 whisk_logs_dir: "{{ openwhisk_tmp_dir }}/wsklogs"
 docker_registry: ""
 docker_dns: ""
+runtimes_bypass_pull_for_local_images: true
+invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"
 
 db_prefix: whisk_local_
 
@@ -20,11 +22,10 @@
 apigw_auth_pwd: ""
 apigw_host_v2: "http://{{ groups['apigateway']|first }}:{{apigateway.port.api}}/v2"
 
-controller_arguments: '-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098'
-invoker_arguments: "{{ controller_arguments }}"
-
 invoker_allow_multiple_instances: true
 
+env_hosts_dir: "{{ playbook_dir }}/environments/local"
+
 runtimes_manifest:
   defaultImagePrefix: "openwhisk"
   defaultImageTag: "latest"
diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts
index 6a7f5d5..4715e55 100644
--- a/ansible/environments/local/hosts
+++ b/ansible/environments/local/hosts
@@ -10,7 +10,7 @@
 controller0         ansible_host=172.17.0.1 ansible_connection=local
 
 [kafkas]
-172.17.0.1          ansible_host=172.17.0.1 ansible_connection=local
+kafka0              ansible_host=172.17.0.1 ansible_connection=local
 
 [zookeepers:children]
 kafkas