diff --git a/gerrit/acls/x/devstack-plugin-nfs.config b/gerrit/acls/openstack/devstack-plugin-nfs.config
similarity index 100%
rename from gerrit/acls/x/devstack-plugin-nfs.config
rename to gerrit/acls/openstack/devstack-plugin-nfs.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index bcfbef38b8..52d3363a14 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -2851,6 +2851,8 @@
 - project: openstack/devstack-plugin-kafka
   description: DevStack plugin to configure Kafka.
   acl-config: /home/gerrit2/acls/openstack/oslo.messaging.config
+- project: openstack/devstack-plugin-nfs
+  description: DevStack plugin to configure NFS backend.
 - project: openstack/devstack-plugin-open-cas
   description: DevStack plugin to configure open-cas.
 - project: openstack/devstack-plugin-pika
@@ -6480,8 +6482,6 @@
 - project: x/devstack-plugin-mariadb
   description: A DevStack plugin that allows ubuntu users to use MariaDB flavor
     as the database backend
-- project: x/devstack-plugin-nfs
-  description: DevStack plugin to configure NFS backend.
 - project: x/devstack-plugin-sheepdog
   description: RETIRED, DevStack plugin to configure Sheepdog backend.
   acl-config: /home/gerrit2/acls/openstack/retired.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index e05a7b3b71..7b8159f3f8 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1297,6 +1297,7 @@ openstack-qa:
     - openstack/devstack-gate
     - openstack/devstack-plugin-ceph
     - openstack/devstack-plugin-cookiecutter
+    - openstack/devstack-plugin-nfs
     - openstack/devstack-plugin-open-cas
     - openstack/devstack-tools
     - openstack/eslint-config-openstack
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index f194be6374..439f97ad9f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -5118,20 +5118,6 @@
       jobs:
         - openstack-tox-bashate
 
-- project:
-    name: x/devstack-plugin-nfs
-    check:
-      jobs:
-        - openstack-tox-bashate
-        - legacy-tempest-dsvm-full-devstack-plugin-nfs:
-            voting: false
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^setup.cfg$
-    gate:
-      jobs:
-        - openstack-tox-bashate
-
 - project:
     name: x/devstack-plugin-tar-installer
     check:
diff --git a/zuul/main.yaml b/zuul/main.yaml
index 11e42a3569..b16a5ad73c 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -494,6 +494,7 @@
           - openstack/devstack-plugin-container
           - openstack/devstack-plugin-cookiecutter
           - openstack/devstack-plugin-kafka
+          - openstack/devstack-plugin-nfs
           - openstack/devstack-plugin-open-cas
           - openstack/devstack-plugin-pika
           - openstack/devstack-plugin-zmq
@@ -1180,7 +1181,6 @@
           - x/devstack-plugin-hdfs
           - x/devstack-plugin-libvirt-qemu
           - x/devstack-plugin-mariadb
-          - x/devstack-plugin-nfs
           - x/devstack-plugin-tar-installer
           - x/devstack-plugin-vmax
           - x/distil