diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 49df009913..0a8e657fdf 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -237,6 +237,16 @@ openstack-chef:
       - master
       - stable/grizzly
 
+openstack-mistral:
+    events:
+      - patchset-created
+      - change-merged
+      - x-vrif-minus-2
+    projects:
+      - stackforge/mistral
+    branches:
+      - master
+
 murano:
     events:
       - patchset-created
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config b/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config
new file mode 100644
index 0000000000..63ecca5707
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/mistral.config
@@ -0,0 +1,27 @@
+[access "refs/heads/milestone-proposed"]
+        label-Code-Review = -2..+2 group mistral-milestone
+        label-Approved = +0..+1 group mistral-milestone
+        exclusiveGroupPermissions = label-Code-Review label-Approved
+        label-Code-Review = -1..+1 group Registered Users
+[access "refs/heads/stable/*"]
+        label-Code-Review = -2..+2 group mistral-milestone
+        label-Approved = +0..+1 group mistral-milestone
+        exclusiveGroupPermissions = label-Code-Review label-Approved
+        label-Code-Review = -1..+1 group Registered Users
+[access "refs/heads/release-*"]
+        label-Code-Review = -2..+2 group mistral-milestone
+        label-Approved = +0..+1 group mistral-milestone
+        exclusiveGroupPermissions = label-Code-Review label-Approved
+        label-Code-Review = -1..+1 group Registered Users
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group mistral-core
+        label-Approved = +0..+1 group mistral-core
+        workInProgress = group mistral-core
+[access "refs/tags/*"]
+        create = group mistral-milestone
+        pushTag = group mistral-milestone
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true
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 f3879350b9..4bfa10d0cc 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1,3 +1,13 @@
+- project:
+    name: mistral
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+
 - project:
     name: murano-api
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index ccf7426ed5..b8abf411f5 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -309,6 +309,8 @@ jobs:
     voting: false
   - name: gate-python-tuskarclient-python33
     voting: false
+  - name: gate-mistral-python33
+    voting: false
   - name: gate-murano-metadataclient-python33
     voting: false
   - name: gate-murano-common-python33
@@ -2875,6 +2877,29 @@ projects:
     gate:
       - gate-noop
 
+  - name: stackforge/mistral
+    check:
+      - gate-mistral-pep8
+      - gate-mistral-python26
+      - gate-mistral-python27
+      - gate-mistral-python33
+      - gate-mistral-docs
+    gate:
+      - gate-mistral-pep8
+      - gate-mistral-python26
+      - gate-mistral-python27
+      - gate-mistral-docs
+    post:
+      - mistral-branch-tarball
+    pre-release:
+      - mistral-tarball
+    release:
+      - mistral-tarball:
+        - mistral-pypi-upload:
+          - post-mirror-python26
+          - post-mirror-python27
+          - post-mirror-python33
+
   - name: stackforge/murano-agent
     check:
       - gate-noop
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 1c71c28b10..4251ab8922 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -326,6 +326,10 @@
   description: Chef Cookbook - Support Cookbook for Messaging
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   upstream: git://github.com/mattray/cookbook-openstack-ops-messaging.git
+- project: stackforge/mistral
+  description: Task orchestration service for OpenStack cloud.
+  upstream: git://github.com/rakhmerov/mistral.git
+  acl-config: /home/gerrit2/acls/stackforge/mistral.config
 - project: stackforge/murano-agent
   upstream: git://github.com/Mirantis/murano-agent.git
   acl-config: /home/gerrit2/acls/stackforge/murano.config