diff --git a/tripleo_ansible/inventory/01-site b/tripleo_ansible/inventory/01-site
index e2bf1600b..2e51a9cfb 100644
--- a/tripleo_ansible/inventory/01-site
+++ b/tripleo_ansible/inventory/01-site
@@ -1,11 +1,14 @@
-# allovercloud group is needed by tripleo_ssh_known_hosts
-[allovercloud:children]
-overcloud
-
-# primary_role_name used by some plays to target the primary role first
-[primary_role_name:children]
-
-[overcloud:children]
-Compute
-
-[Compute]
+---
+all:
+  children:
+    # allovercloud group is needed by tripleo_ssh_known_hosts
+    allovercloud:
+      children:
+        overcloud:
+    # primary_role_name used by some plays to target the primary role first
+    primary_role_name:
+      children:
+    overcloud:
+      children:
+        Compute:
+    Compute:
diff --git a/tripleo_ansible/inventory/02-computes b/tripleo_ansible/inventory/02-computes
index 78fe3c12f..17b2fd713 100644
--- a/tripleo_ansible/inventory/02-computes
+++ b/tripleo_ansible/inventory/02-computes
@@ -3,6 +3,7 @@ Compute:
     # Add additional computes here, and optionally drop localhost.
     # Add host vars under the host_vars dir.
     localhost:
+      ansible_connection: local
   vars:
     service_net_map:
       nova_api_network: internal_api
diff --git a/tripleo_ansible/inventory/host_vars/localhost b/tripleo_ansible/inventory/host_vars/localhost
index 1ab0f84bd..dc94d4980 100644
--- a/tripleo_ansible/inventory/host_vars/localhost
+++ b/tripleo_ansible/inventory/host_vars/localhost
@@ -1,6 +1,4 @@
 ---
-
-ansible_connection: local
 ctlplane_ip: 192.168.24.100
 internal_api_ip: 192.168.24.2
 tenant_ip: 192.168.24.2