diff --git a/gerrit/acls/stackforge/dragonflow.config b/gerrit/acls/openstack/dragonflow.config
similarity index 100%
rename from gerrit/acls/stackforge/dragonflow.config
rename to gerrit/acls/openstack/dragonflow.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 722267bfdc..6d522ef1ac 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -894,6 +894,8 @@
   groups:
     - openstack-manuals
   description: OpenStack Documentation Specifications
+- project: openstack/dragonflow
+  description: SDN based Distributed Virtual Router for OpenStack Neutron
 - project: openstack/futurist
   description: A collection of async functionality and additions from the future.
   groups:
@@ -1563,8 +1565,6 @@
   description: Style checker for sphinx (or other) rst documentation.
 - project: stackforge/dox
   description: Run tests in a docker container
-- project: stackforge/dragonflow
-  description: SDN based Distributed Virtual Router for OpenStack Neutron
 - project: stackforge/drbd-devstack
   description: Devstack plugin to configure the DRBD backend.
 - project: stackforge/driverlog
diff --git a/jenkins/jobs/dragonflow.yaml b/jenkins/jobs/dragonflow.yaml
index e1e67868ee..0c8a2a43ae 100644
--- a/jenkins/jobs/dragonflow.yaml
+++ b/jenkins/jobs/dragonflow.yaml
@@ -30,9 +30,9 @@
           # Because we are testing a non standard project, add
           # our project repository. This makes zuul do the right
           # reference magic for testing changes.
-          export PROJECTS="stackforge/dragonflow $PROJECTS"
+          export PROJECTS="openstack/dragonflow $PROJECTS"
 
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow https://git.openstack.org/stackforge/dragonflow"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow https://git.openstack.org/openstack/dragonflow"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_DRAGONFLOW=True"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"ML2_L3_PLUGIN=dragonflow.neutron.services.l3.l3_controller_plugin.ControllerL3ServicePlugin"
 
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 67e87906da..4e97bc1837 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -131,6 +131,21 @@
     jobs:
       - specs-jobs
 
+- project:
+    name: dragonflow
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - python-jobs
+      - pypi-jobs
+      - '{pipeline}-tempest-dsvm-dragonflow{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+
 - project:
     name: gantt
     node: 'bare-precise || bare-trusty'
@@ -3970,21 +3985,6 @@
       - python-jobs
       - pypi-jobs
 
-- project:
-    name: dragonflow
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-    doc-publisher-site: docs.openstack.org
-
-    jobs:
-      - python-jobs
-      - pypi-jobs
-      - '{pipeline}-tempest-dsvm-dragonflow{branch-designator}':
-          pipeline: check
-          node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
-          branch-override: default
-
 - project:
     name: drbd-devstack
     node: 'bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 66adfcca17..2ab5c8841f 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1633,6 +1633,15 @@ projects:
     gate:
       - gate-designate-specs-python27
 
+  - name: openstack/dragonflow
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: publish-to-pypi
+      - name: check-requirements
+    check:
+      - check-tempest-dsvm-dragonflow
+
   - name: openstack/gantt
     template:
       - name: merge-check
@@ -5702,15 +5711,6 @@ projects:
       - gate-dox-pep8
       - gate-dox-python27
 
-  - name: stackforge/dragonflow
-    template:
-      - name: merge-check
-      - name: python-jobs
-      - name: publish-to-pypi
-      - name: check-requirements
-    check:
-      - check-tempest-dsvm-dragonflow
-
   - name: stackforge/drbd-devstack
     template:
       - name: merge-check