diff --git a/manifests/site.pp b/manifests/site.pp
index 0289585520..1e43274cec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -242,7 +242,7 @@ node 'eavesdrop.openstack.org' {
     statusbot_nick          => hiera('statusbot_nick', 'username'),
     statusbot_password      => hiera('statusbot_nick_password', 'XXX'),
     statusbot_server        => 'chat.freenode.net',
-    statusbot_channels      => 'edeploy, fuel-dev, heat, magnetodb, murano, openstack, openstack-101, openstack-anvil, openstack-bacon, openstack-barbican, openstack-blazar, openstack-board, openstack-ceilometer, openstack-chef, openstack-cinder, openstack-cloudkeep, openstack-community, openstack-containers, openstack-dev, openstack-dns, openstack-doc, openstack-entropy, openstack-foundation, openstack-gantt, openstack-gate, openstack-hyper-v, openstack-infra, openstack-ironic, openstack-keystone, openstack-manila, openstack-marconi, openstack-meeting, openstack-meeting-3, openstack-meeting-alt, openstack-meniscus, openstack-merges, openstack-metering, openstack-monasca, openstack-neutron, openstack-nova, openstack-opw, openstack-oslo, openstack-packaging, openstack-qa, openstack-raksha, openstack-relmgr-office, openstack-sahara, openstack-sdks, openstack-state-management, openstack-swift, openstack-translation, openstack-trove, packstack-dev, refstack, storyboard, syscompass, tripleo',
+    statusbot_channels      => 'edeploy, fuel-dev, heat, magnetodb, murano, openstack, openstack-101, openstack-anvil, openstack-bacon, openstack-barbican, openstack-blazar, openstack-board, openstack-ceilometer, openstack-chef, openstack-cinder, openstack-cloudkeep, openstack-community, openstack-containers, openstack-dev, openstack-dns, openstack-doc, openstack-entropy, openstack-foundation, openstack-gantt, openstack-gate, openstack-hyper-v, openstack-infra, openstack-ironic, openstack-keystone, openstack-manila, openstack-meeting, openstack-meeting-3, openstack-meeting-alt, openstack-meniscus, openstack-merges, openstack-metering, openstack-monasca, openstack-neutron, openstack-nova, openstack-opw, openstack-oslo, openstack-packaging, openstack-qa, openstack-raksha, openstack-relmgr-office, openstack-sahara, openstack-sdks, openstack-state-management, openstack-swift, openstack-translation, openstack-trove, openstack-zaqar, packstack-dev, refstack, storyboard, syscompass, tripleo',
     statusbot_auth_nicks    => 'jeblair, ttx, fungi, mordred, clarkb, sdague, SergeyLukjanov, jhesketh, lifeless',
     statusbot_wiki_user     => hiera('statusbot_wiki_username', 'username'),
     statusbot_wiki_password => hiera('statusbot_wiki_password', 'XXX'),
diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 5879442c51..2eacf84c53 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -452,15 +452,15 @@ openstack-glance:
     branches:
       - master
 
-openstack-marconi:
+openstack-zaqar:
     events:
       - patchset-created
       - change-merged
       - x-vrif-minus-2
     projects:
-      - openstack/marconi
-      - openstack/marconi-specs
-      - openstack/python-marconiclient
+      - openstack/zaqar
+      - openstack/zaqar-specs
+      - openstack/python-zaqarclient
     branches:
       - master
 
@@ -759,8 +759,8 @@ openstack-merges:
       - openstack/python-tuskarclient
       - openstack-dev/devstack
       - openstack-infra/release-tools
-      - openstack/marconi
-      - openstack/python-marconiclient
+      - openstack/zaqar
+      - openstack/python-zaqarclient
       - openstack/sahara
       - openstack/python-saharaclient
       - openstack/sahara-dashboard
diff --git a/modules/openstack_project/files/accessbot/channels.yaml b/modules/openstack_project/files/accessbot/channels.yaml
index 6d6ca3d48a..96c300f18f 100644
--- a/modules/openstack_project/files/accessbot/channels.yaml
+++ b/modules/openstack_project/files/accessbot/channels.yaml
@@ -87,7 +87,6 @@ channels:
   - name: openstack-ironic
   - name: openstack-keystone
   - name: openstack-manila
-  - name: openstack-marconi
   - name: openstack-meeting
     meetbots:
       - open_stack
@@ -117,6 +116,7 @@ channels:
   - name: openstack-swift
   - name: openstack-translation
   - name: openstack-trove
+  - name: openstack-zaqar
   - name: packstack-dev
   - name: pecanpy
   - name: refstack
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/marconi-specs.config b/modules/openstack_project/files/gerrit/acls/openstack/marconi-specs.config
deleted file mode 100644
index cbe225fe15..0000000000
--- a/modules/openstack_project/files/gerrit/acls/openstack/marconi-specs.config
+++ /dev/null
@@ -1,11 +0,0 @@
-[access "refs/heads/*"]
-abandon = group marconi-specs-core
-label-Code-Review = -2..+2 group marconi-specs-core
-label-Workflow = -1..+1 group marconi-specs-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/marconi.config b/modules/openstack_project/files/gerrit/acls/openstack/marconi.config
deleted file mode 100644
index 7b98cd2e22..0000000000
--- a/modules/openstack_project/files/gerrit/acls/openstack/marconi.config
+++ /dev/null
@@ -1,11 +0,0 @@
-[access "refs/heads/*"]
-abandon = group marconi-core
-label-Code-Review = -2..+2 group marconi-core
-label-Workflow = -1..+1 group marconi-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config
deleted file mode 100644
index 0c9b947526..0000000000
--- a/modules/openstack_project/files/gerrit/acls/openstack/python-marconiclient.config
+++ /dev/null
@@ -1,19 +0,0 @@
-[access "refs/heads/*"]
-abandon = group marconi-core
-label-Code-Review = -2..+2 group marconi-core
-label-Workflow = -1..+1 group marconi-core
-
-[access "refs/heads/proposed/*"]
-abandon = group marconi-milestone
-label-Code-Review = -2..+2 group marconi-milestone
-label-Workflow = -1..+1 group marconi-milestone
-
-[access "refs/tags/*"]
-pushSignedTag = group marconi-ptl
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-zaqarclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-zaqarclient.config
new file mode 100644
index 0000000000..c369a5fa08
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/python-zaqarclient.config
@@ -0,0 +1,14 @@
+[access "refs/heads/*"]
+abandon = group zaqar-core
+label-Code-Review = -2..+2 group zaqar-core
+label-Workflow = -1..+1 group zaqar-core
+
+[access "refs/tags/*"]
+pushSignedTag = group zaqar-ptl
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/zaqar-specs.config b/modules/openstack_project/files/gerrit/acls/openstack/zaqar-specs.config
new file mode 100644
index 0000000000..76f22b6511
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/zaqar-specs.config
@@ -0,0 +1,11 @@
+[access "refs/heads/*"]
+abandon = group zaqar-specs-core
+label-Code-Review = -2..+2 group zaqar-specs-core
+label-Workflow = -1..+1 group zaqar-specs-core
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/zaqar.config b/modules/openstack_project/files/gerrit/acls/openstack/zaqar.config
new file mode 100644
index 0000000000..612619fa97
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/openstack/zaqar.config
@@ -0,0 +1,16 @@
+[access "refs/heads/*"]
+abandon = group zaqar-core
+label-Code-Review = -2..+2 group zaqar-core
+label-Workflow = -1..+1 group zaqar-core
+
+[access "refs/heads/proposed/*"]
+abandon = group zaqar-milestone
+label-Code-Review = -2..+2 group zaqar-milestone
+label-Workflow = -1..+1 group zaqar-milestone
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index c8aa7d1409..cbeee0a015 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -606,7 +606,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-marconi{branch-designator}'
+    name: '{pipeline}-tempest-dsvm-zaqar{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -633,7 +633,7 @@
           ./safe-devstack-vm-gate-wrap.sh
 
           function post_test_hook {{
-              gzip -9 -c /var/log/marconi/queues.log > $WORKSPACE/logs/queues.log.txt.gz
+              gzip -9 -c /var/log/zaqar/queues.log > $WORKSPACE/logs/queues.log.txt.gz
           }}
           export -f post_test_hook
 
@@ -1449,7 +1449,7 @@
       - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
       - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
       - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}'
-      - '{pipeline}-tempest-dsvm-marconi{branch-designator}'
+      - '{pipeline}-tempest-dsvm-zaqar{branch-designator}'
       - '{pipeline}-tempest-dsvm-all{branch-designator}'
       - '{pipeline}-tempest-dsvm-coverage{branch-designator}'
       - '{pipeline}-tempest-dsvm-stress{branch-designator}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 0214b108c8..297aa98369 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1294,7 +1294,7 @@
       - python-jobs
 
 - project:
-    name: marconi
+    name: zaqar
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
     node: 'bare-precise || bare-trusty'
@@ -1305,14 +1305,14 @@
       - translation-jobs
 
 - project:
-    name: marconi-specs
+    name: zaqar-specs
     node: bare-precise
 
     jobs:
       - specs-jobs
 
 - project:
-    name: python-marconiclient
+    name: python-zaqarclient
     tarball-site: tarballs.openstack.org
     node: 'bare-precise || bare-trusty'
 
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 593870bece..609ddf4f60 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -308,10 +308,6 @@
 - project: openstack/keystonemiddleware
   description: OpenStack Identity (Keystone) Middleware
   upstream: git://github.com/morganfainberg/keystonemiddleware
-- project: openstack/marconi
-- project: openstack/marconi-specs
-  group: marconi
-  upstream: git://github.com/FlaPer87/marconi-specs.git
 - project: openstack/netconn-api
   group: openstack-api-site
   options:
@@ -425,7 +421,6 @@
 - project: openstack/python-ironicclient
   description: A python client implementing the Ironic API.
 - project: openstack/python-keystoneclient
-- project: openstack/python-marconiclient
 - project: openstack/python-neutronclient
   docimpact-group: openstack-manuals
 - project: openstack/python-novaclient
@@ -440,6 +435,7 @@
 - project: openstack/python-tuskarclient
   description: Python bindings and CLI to Tuskar.
   upstream: git://github.com/tuskar/python-tuskarclient.git
+- project: openstack/python-zaqarclient
 - project: openstack/qa-specs
   group: tempest
 - project: openstack/requirements
@@ -510,6 +506,9 @@
   group: openstack-api-site
   options:
     - direct-release
+- project: openstack/zaqar
+- project: openstack/zaqar-specs
+  group: zaqar
 - project: stackforge-attic/murano-common
 - project: stackforge-attic/murano-conductor
 - project: stackforge-attic/murano-metadataclient
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 24a90876b4..f8abda9982 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -408,7 +408,7 @@ jobs:
   - name: ^gate-pecan-tox-ceilometer-.*$
     parameter-function: set_node_options_default_trusty
   # IPA image builds need docker which requires trusty
-  - name: ^(gate|check)-.*marconi.*$
+  - name: ^(gate|check)-.*zaqar.*$
     parameter-function: set_node_options_default_trusty
   - name: ironic-python-agent-buildimage-coreos
     parameter-function: set_node_options_default_trusty
@@ -750,7 +750,7 @@ jobs:
     voting: false
   - name: ^(gate|check)-pecan-tox-ironic-stable
     voting: false
-  - name: ^(gate|check)-marconi-python33
+  - name: ^(gate|check)-zaqar-python33
     branch: ^(?!stable/(havana|icehouse)).*$
   - name: gate-tempest-dsvm-ceilometer-mongodb
     voting: false
@@ -1099,33 +1099,33 @@ projects:
     gate:
       - gate-keystonemiddleware-python33
 
-  - name: openstack/marconi
+  - name: openstack/zaqar
     template:
       - name: python-jobs
       - name: check-requirements
       - name: translation-jobs
     check:
-      - check-tempest-dsvm-marconi
-      - gate-marconi-python33
-      - gate-marconi-pypy
+      - check-tempest-dsvm-zaqar
+      - gate-zaqar-python33
+      - gate-zaqar-pypy
     gate:
-      - gate-tempest-dsvm-marconi
-      - gate-marconi-pypy
+      - gate-tempest-dsvm-zaqar
+      - gate-zaqar-pypy
     post:
-      - marconi-branch-tarball
+      - zaqar-branch-tarball
     pre-release:
-      - marconi-tarball
+      - zaqar-tarball
     release:
-      - marconi-tarball
-      - marconi-docs
+      - zaqar-tarball
+      - zaqar-docs
 
-  - name: openstack/marconi-specs
+  - name: openstack/zaqar-specs
     template:
       - name: specs-jobs
     check:
-      - gate-marconi-specs-python27
+      - gate-zaqar-specs-python27
     gate:
-      - gate-marconi-specs-python27
+      - gate-zaqar-specs-python27
 
   - name: openstack/neutron
     template:
@@ -1522,24 +1522,24 @@ projects:
       - check-tripleo-novabm-overcloud-precise-nonha
       - check-tripleo-novabm-overcloud-f20-nonha
 
-  - name: openstack/python-marconiclient
+  - name: openstack/python-zaqarclient
     template:
       - name: check-requirements
       - name: publish-to-pypi
     check:
-      - gate-python-marconiclient-pep8
-      - gate-python-marconiclient-python26
-      - gate-python-marconiclient-python27
-      - gate-python-marconiclient-python33
-      - gate-python-marconiclient-pypy
+      - gate-python-zaqarclient-pep8
+      - gate-python-zaqarclient-python26
+      - gate-python-zaqarclient-python27
+      - gate-python-zaqarclient-python33
+      - gate-python-zaqarclient-pypy
     gate:
-      - gate-python-marconiclient-pep8
-      - gate-python-marconiclient-python26
-      - gate-python-marconiclient-python27
-      - gate-python-marconiclient-python33
-      - gate-python-marconiclient-pypy
+      - gate-python-zaqarclient-pep8
+      - gate-python-zaqarclient-python26
+      - gate-python-zaqarclient-python27
+      - gate-python-zaqarclient-python33
+      - gate-python-zaqarclient-pypy
     post:
-      - python-marconiclient-branch-tarball
+      - python-zaqarclient-branch-tarball
 
   - name: openstack/python-neutronclient
     template:
@@ -2279,7 +2279,7 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
       - check-tempest-dsvm-cells-full
-      - check-tempest-dsvm-marconi
+      - check-tempest-dsvm-zaqar
       - check-tempest-dsvm-keystonev3-full
       - check-tempest-dsvm-neutron-keystonev3-full
       - check-tempest-dsvm-nova-v3-full
@@ -2558,7 +2558,7 @@ projects:
       - gate-swift-dsvm-functional
     experimental:
       - check-tempest-dsvm-cells-full
-      - check-tempest-dsvm-marconi
+      - check-tempest-dsvm-zaqar
       - gate-grenade-dsvm-forward
       - check-tempest-master-dsvm-full-havana
       - check-tempest-master-dsvm-neutron-havana
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index b5676737a6..78404be9b6 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -52,7 +52,6 @@ class openstack_project::eavesdrop (
         '#openstack-ironic',
         '#openstack-keystone',
         '#openstack-lbaas',
-        '#openstack-marconi',
         '#openstack-meeting',
         '#openstack-meeting-alt',
         '#openstack-meeting-3',
@@ -66,6 +65,7 @@ class openstack_project::eavesdrop (
         '#openstack-security',
         '#openstack-swift',
         '#openstack-trove',
+        '#openstack-zaqar',
         '#storyboard',
         '#tripleo',
     ],