diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index bc362860dc..8c9563dd43 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -669,8 +669,8 @@ openstack-manila:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/manila
-      - stackforge/python-manilaclient
+      - openstack/manila
+      - openstack/python-manilaclient
     branches:
       - master
 
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/manila.config b/modules/openstack_project/files/gerrit/acls/openstack/manila.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/manila.config
rename to modules/openstack_project/files/gerrit/acls/openstack/manila.config
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-manilaclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-manilaclient.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/stackforge/python-manilaclient.config
rename to modules/openstack_project/files/gerrit/acls/openstack/python-manilaclient.config
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
index fce6db668c..e4be852d80 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
@@ -17,8 +17,8 @@
           export DEVSTACK_GATE_TIMEOUT=35
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=manila,m-api,m-shr,m-sch
-          export PROJECTS="stackforge/manila $PROJECTS"
-          export PROJECTS="stackforge/python-manilaclient $PROJECTS"
+          export PROJECTS="openstack/manila $PROJECTS"
+          export PROJECTS="openstack/python-manilaclient $PROJECTS"
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
@@ -56,8 +56,8 @@
           export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
-          export PROJECTS="stackforge/manila $PROJECTS"
-          export PROJECTS="stackforge/python-manilaclient $PROJECTS"
+          export PROJECTS="openstack/manila $PROJECTS"
+          export PROJECTS="openstack/python-manilaclient $PROJECTS"
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
@@ -100,8 +100,8 @@
           export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
-          export PROJECTS="stackforge/manila $PROJECTS"
-          export PROJECTS="stackforge/python-manilaclient $PROJECTS"
+          export PROJECTS="openstack/manila $PROJECTS"
+          export PROJECTS="openstack/python-manilaclient $PROJECTS"
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index dcb516ed92..423ca21dee 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -316,6 +316,8 @@
   upstream: git://github.com/morganfainberg/keystonemiddleware
 - project: openstack/kite
   description: A service for managing and distributing message encryption keys.
+- project: openstack/manila
+  description: Shared filesystem management project for OpenStack.
 - project: openstack/netconn-api
   group: openstack-api-site
   options:
@@ -446,6 +448,7 @@
 - project: openstack/python-keystoneclient
 - project: openstack/python-kiteclient
   description: Python bindings to Kite.
+- project: openstack/python-manilaclient
 - project: openstack/python-neutronclient
   docimpact-group: openstack-manuals
 - project: openstack/python-novaclient
@@ -877,9 +880,6 @@
 - project: stackforge/magnetodb
   description: Key-value database service for OpenStack cloud.
   upstream: git://github.com/Mirantis/magnetodb.git
-- project: stackforge/manila
-  description: Shared filesystem management project for OpenStack.
-  upstream: git://github.com/bswartz/manila.git
 - project: stackforge/merlin
   description: Framework for building UIs for OpenStack projects dealing with complex input data
 - project: stackforge/milk
@@ -1141,8 +1141,6 @@
 - project: stackforge/python-magnetodbclient
   description: Python client for MagnetoDB, the key-value database service for OpenStack cloud.
   upstream: git://github.com/aostapenko/python-magnetodbclient
-- project: stackforge/python-manilaclient
-  upstream: git://github.com/bswartz/python-manilaclient.git
 - project: stackforge/python-mistralclient
   description: Python client for Mistral REST API.
   group: mistral
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 13118c9c35..5b349a8596 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1162,6 +1162,28 @@ projects:
     release:
       - kite-tarball
 
+  - name: openstack/manila
+    template:
+      - name: merge-check
+    check:
+      - gate-manila-devstack-dsvm-neutron
+      - gate-manila-docs
+      - gate-manila-pep8
+      - gate-manila-pylint
+      - gate-manila-python26
+      - gate-manila-python27
+      - gate-manila-tempest-dsvm-neutron
+      - gate-manila-tempest-dsvm-neutron-multibackend
+    gate:
+      - gate-manila-devstack-dsvm-neutron
+      - gate-manila-docs
+      - gate-manila-pep8
+      - gate-manila-python26
+      - gate-manila-python27
+    post:
+      - manila-branch-tarball
+      - manila-coverage
+
   - name: openstack/zaqar
     template:
       - name: merge-check
@@ -1633,6 +1655,25 @@ projects:
     gate:
       - gate-python-kiteclient-requirements
 
+  - name: openstack/python-manilaclient
+    template:
+      - name: merge-check
+      - name: python3-jobs
+    check:
+      - gate-python-manilaclient-docs
+      - gate-python-manilaclient-pep8
+      - gate-python-manilaclient-python26
+      - gate-python-manilaclient-python27
+      - gate-manila-tempest-dsvm-neutron
+    gate:
+      - gate-python-manilaclient-docs
+      - gate-python-manilaclient-pep8
+      - gate-python-manilaclient-python26
+      - gate-python-manilaclient-python27
+    post:
+      - python-manilaclient-branch-tarball
+      - python-manilaclient-coverage
+
   - name: openstack/python-zaqarclient
     template:
       - name: merge-check
@@ -4012,28 +4053,6 @@ projects:
     check:
       - logaas-coverage
 
-  - name: stackforge/manila
-    template:
-      - name: merge-check
-    check:
-      - gate-manila-devstack-dsvm-neutron
-      - gate-manila-docs
-      - gate-manila-pep8
-      - gate-manila-pylint
-      - gate-manila-python26
-      - gate-manila-python27
-      - gate-manila-tempest-dsvm-neutron
-      - gate-manila-tempest-dsvm-neutron-multibackend
-    gate:
-      - gate-manila-devstack-dsvm-neutron
-      - gate-manila-docs
-      - gate-manila-pep8
-      - gate-manila-python26
-      - gate-manila-python27
-    post:
-      - manila-branch-tarball
-      - manila-coverage
-
   - name: stackforge/merlin
     template:
       - name: merge-check
@@ -4665,25 +4684,6 @@ projects:
     release:
       - python-magnetodbclient-tarball
 
-  - name: stackforge/python-manilaclient
-    template:
-      - name: merge-check
-      - name: python3-jobs
-    check:
-      - gate-python-manilaclient-docs
-      - gate-python-manilaclient-pep8
-      - gate-python-manilaclient-python26
-      - gate-python-manilaclient-python27
-      - gate-manila-tempest-dsvm-neutron
-    gate:
-      - gate-python-manilaclient-docs
-      - gate-python-manilaclient-pep8
-      - gate-python-manilaclient-python26
-      - gate-python-manilaclient-python27
-    post:
-      - python-manilaclient-branch-tarball
-      - python-manilaclient-coverage
-
   - name: stackforge/python-monascaclient
     template:
       - name: merge-check