diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 65bd132..180d9c8 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -25,6 +25,7 @@ apache_vhosts: >-
   }}
 
 docker_add_repo: True
+docker_install_compose_plugin: False
 docker_users:
   - 'gballan'
 
diff --git a/inventory/group_vars/continuous_integration.yml b/inventory/group_vars/continuous_integration.yml
deleted file mode 100644
index c67b998..0000000
--- a/inventory/group_vars/continuous_integration.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-docker_install_compose_plugin: False
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 671266b..cf5b05b 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -1,3 +1,11 @@
+[ci_servers]
+ci-v2 ansible_host=ci-v2.int.metaunix.net
+
+[ci_runners]
+ci-v2-arm1 ansible_host=ci-v2-arm1.int.metaunix.net
+ci-v2-arm2 ansible_host=ci-v2-arm2.int.metaunix.net
+ci-v2-arm3 ansible_host=ci-v2-arm3.int.metaunix.net
+
 [control]
 mustafar ansible_host=mustafar
 
@@ -22,8 +30,5 @@ mustafar ansible_host=mustafar
 ns3 ansible_host=ns3.int.metaunix.net
 ns4 ansible_host=ns4.int.metaunix.net
 
-[continuous_integration]
-ci-v2 ansible_host=ci-v2.int.metaunix.net
-ci-v2-arm1 ansible_host=ci-v2-arm1.int.metaunix.net
-ci-v2-arm2 ansible_host=ci-v2-arm2.int.metaunix.net
-ci-v2-arm3 ansible_host=ci-v2-arm3.int.metaunix.net
+[serial_ttyd]
+pitty ansible_host=10.7.10.175
diff --git a/playbooks/docker.yml b/playbooks/docker.yml
index 4fe76af..a05fd19 100644
--- a/playbooks/docker.yml
+++ b/playbooks/docker.yml
@@ -2,7 +2,8 @@
 
 - name: Install and configure Docker
   hosts:
-    - continuous_integration
+    - ci_servers
+    - ci_runners
   become: True
 
   roles: