diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 8120a41b7e..70f34562e7 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -24,7 +24,7 @@
   vars:
     # this is actually without admin tenant
     all_tenants: ['cloudintern', 'cloudsig', 'copr', 'coprdev', 'infrastructure',
-      'persistent', 'pythonbots', 'qa', 'scratch', 'transient', 'openshift', 'maintainertest', 'dashost']
+      'persistent', 'pythonbots', 'qa', 'scratch', 'transient', 'openshift', 'maintainertest', 'aos-ci-cd']
 
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
@@ -712,7 +712,7 @@
       - { name: scratch, desc: 'scratch and short term instances' }
       - { name: openshift, desc: 'Tenant for openshift deployment' }
       - { name: maintainertest, desc: 'Tenant for maintainer test machines' }
-      - { name: dashost, desc: 'Tenant for dashost' }
+      - { name: aos-ci-cd, desc: 'Tenant for aos-ci-cd' }
 
 
   ##### USERS #####
@@ -792,11 +792,11 @@
       - { username: asamalik, name: asamalik, tenant: scratch, password: "{{asamalik_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas asamalik') }}" }
       - { username: clime, name: clime, tenant: copr, password: "{{clime_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas clime') }}" }
       - { username: misc, name: misc, tenant: openshift, password: "{{misc_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas misc') }}" }
-      - { username: alivigni, name: alivigni, tenant: dashost, password: "{{alivigni_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas alivigni') }}" }
-      - { username: jbieren, name: jbieren, tenant: dashost, password: "{{jbieren_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas jbieren') }}" }
-      - { username: bpeck, name: bpeck, tenant: dashost, password: "{{bpeck_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas bpeck') }}" }
-      - { username: srallaba, name: srallaba, tenant: dashost, password: "{{srallaba_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas srallaba') }}" }
-      - { username: jburke, name: jburke, tenant: dashost, password: "{{jburke_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas jburke') }}" }
+      - { username: alivigni, name: alivigni, tenant: aos-ci-cd, password: "{{alivigni_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas alivigni') }}" }
+      - { username: jbieren, name: jbieren, tenant: aos-ci-cd, password: "{{jbieren_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas jbieren') }}" }
+      - { username: bpeck, name: bpeck, tenant: aos-ci-cd, password: "{{bpeck_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas bpeck') }}" }
+      - { username: srallaba, name: srallaba, tenant: aos-ci-cd, password: "{{srallaba_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas srallaba') }}" }
+      - { username: jburke, name: jburke, tenant: aos-ci-cd, password: "{{jburke_password}}", public_key: "{{ lookup('pipe', '/srv/web/infra/ansible/scripts/auth-keys-from-fas jburke') }}" }
     tags:
     - openstack_users
 
@@ -821,7 +821,7 @@
       - { user: admin, tenant: scratch }
       - { user: admin, tenant: transient }
       - { user: admin, tenant: maintainertest }
-      - { user: admin, tenant: dashost }
+      - { user: admin, tenant: aos-ci-cd }
       - { user: copr, tenant: coprdev }
       - { user: kevin, tenant: cloudintern }
       - { user: kevin, tenant: cloudsig }
@@ -833,7 +833,7 @@
       - { user: kevin, tenant: scratch }
       - { user: kevin, tenant: transient }
       - { user: kevin, tenant: maintainertest }
-      - { user: kevin, tenant: dashost }
+      - { user: kevin, tenant: aos-ci-cd }
       - { user: msuchy, tenant: cloudintern }
       - { user: msuchy, tenant: cloudsig }
       - { user: msuchy, tenant: coprdev }
@@ -854,7 +854,7 @@
       - { user: puiterwijk, tenant: scratch }
       - { user: puiterwijk, tenant: transient }
       - { user: puiterwijk, tenant: maintainertest }
-      - { user: puiterwijk, tenant: dashost }
+      - { user: puiterwijk, tenant: aos-ci-cd }
       - { user: mizdebsk, tenant: infrastructure }
       - { user: mizdebsk, tenant: transient }
       - { user: clime, tenant: coprdev }
@@ -947,7 +947,7 @@
       - { name: transient, shared: false }
       - { name: openshift, shared: false }
       - { name: maintainertest, shared: false }
-      - { name: dashost, shared: false }
+      - { name: aos-ci-cd, shared: false }
   - name: Create a subnet for all tenants
     neutron_subnet:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
@@ -971,7 +971,7 @@
       - { name: transient, cidr: '172.25.48.1/20', gateway: '172.25.48.1' }
       - { name: openshift, cidr: '172.25.160.1/20', gateway: '172.25.160.1' }
       - { name: maintainertest, cidr: '172.25.180.1/20', gateway: '172.25.180.1' }
-      - { name: dashost, cidr: '172.25.200.1/20', gateway: '172.25.200.1' }
+      - { name: aos-ci-cd, cidr: '172.25.200.1/20', gateway: '172.25.200.1' }
   - name: "Connect router's interface to the TENANT-subnet"
     neutron_router_interface:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
@@ -1079,7 +1079,7 @@
       - { name: transient, prefix: '172.25.48.1/20' }
       - { name: openshift, prefix: '172.25.160.1/20' }
       - { name: maintainertest, prefix: '172.25.180.1/20' }
-      - { name: dashost, prefix: '172.25.200.1/20' }
+      - { name: aos-ci-cd, prefix: '172.25.200.1/20' }
 
   - name: "Create 'web-80-anywhere' security group"
     neutron_sec_group: