diff --git a/playbooks/proposal/propose-project-config-update.yaml b/playbooks/proposal/propose-project-config-update.yaml
new file mode 100644
index 0000000000..e82ea8700d
--- /dev/null
+++ b/playbooks/proposal/propose-project-config-update.yaml
@@ -0,0 +1,7 @@
+- hosts: all
+  tasks:
+
+    - name: Propose constraints update
+      command: "./tools/propose_projects_yaml_update.sh"
+      args:
+        chdir: "src/{{ zuul.project.canonical_name }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f1f15a3b53..7bb33f9bd5 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -244,6 +244,11 @@
     dependencies:
       - release-openstack-python
 
+- job:
+    name: propose-project-config-update
+    parent: propose-updates
+    run: playbooks/proposal/propose-project-config-update
+
 - semaphore:
     name: wheel-mirror
     max: 1
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 71faae63ca..a8e70711f7 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -48,9 +48,52 @@
 
 - project:
     name: openstack-infra/project-config
+    templates:
+      - bindep-fallback
+      - merge-check
     check:
       jobs:
-        - project-config-check-main-yaml
+        - build-openstack-specs-site
+        - openstack-tox-linters:
+            files:
+              - ^.*\.sh$
+              - ^.*\.py$
+              - bindep.txt
+              - other-requirements.txt
+              - test-requirements.txt
+              - tox.ini
+        - project-config-dib
+        - project-config-gerrit
+        - project-config-grafyaml
+        - project-config-infra-docs-index
+        - project-config-irc-access
+        - project-config-nodepool
         - zuul-migrate:
             files:
               - zuul/mapping.yaml
+    gate:
+      queue: project-config
+      jobs:
+        - build-openstack-specs-site
+        - openstack-tox-linters:
+            files:
+              - ^.*\.sh$
+              - ^.*\.py$
+              - bindep.txt
+              - other-requirements.txt
+              - test-requirements.txt
+              - tox.ini
+        - project-config-dib
+        - project-config-gerrit
+        - project-config-grafyaml
+        - project-config-infra-docs-index
+        - project-config-irc-access
+        - project-config-nodepool
+    post:
+      jobs:
+        - publish-openstack-python-docs-infra-index
+        - publish-openstack-specs-site
+    periodic:
+      jobs:
+        - propose-project-config-update
+        - project-config-build-openafs-centos
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 733913f885..5a148e51d0 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2698,97 +2698,11 @@ jobs:
   - name: gate-bashate-devstack
     voting: false
 
-  - name: gate-project-config-irc-access
-    files:
-      - 'bindep.txt'
-      - 'accessbot/channels.yaml'
-      - 'gerritbot/channels.yaml'
-      - 'other-requirements.txt'
-      - 'tools/check_irc_access.py'
-      - 'tools/check_channels_yaml.sh'
-      - 'tools/irc_tests.py'
-      - 'tools/normalize_channels_yaml.py'
-      - 'tools/projectconfig_yamllib.py'
-      - 'tox.ini'
-
-  - name: gate-project-config-jenkins-project
-    files:
-      - 'bindep.txt'
-      - 'jenkins/jobs/.*'
-      - 'other-requirements.txt'
-      - 'tools/jenkins-projects-checks.py'
-      - 'tox.ini'
-
-  - name: ^gate-project-config-linters-ubuntu-xenial$
-    files:
-      - '^.*\.sh$'
-      - '^.*\.py$'
-      - 'bindep.txt'
-      - 'other-requirements.txt'
-      - 'test-requirements.txt'
-      - 'tox.ini'
-
-  - name: gate-infra-docs-index
-    files:
-      - 'bindep.txt'
-      - 'docs-site/.*'
-      - 'other-requirements.txt'
-      - 'tox.ini'
-
-  - name: gate-generate-specs-site
-    files:
-      - 'bindep.txt'
-      - 'specs/.*'
-      - 'other-requirements.txt'
-      - 'tox.ini'
-
-  - name: gate-project-config-grafyaml
-    files:
-      - '^grafana/.*$'
-      - 'bindep.txt'
-      - 'other-requirements.txt'
-      - 'tools/grafyaml-validate.sh'
-      - 'tox.ini'
-
-  - name: gate-project-config-dib
-    files:
-      - '^nodepool/elements/.*$'
-      - 'bindep.txt'
-      - 'other-requirements.txt'
-      - 'tox.ini'
-
-  - name: gate-project-config-gerrit
-    files:
-      - '^gerrit/acls/.*$'
-      - 'bindep.txt'
-      - 'check_valid_gerrit_projects.py'
-      - 'gerrit/projects.yaml'
-      - 'other-requirements.txt'
-      - 'tools/check_projects_yaml_alphabetized.sh'
-      - 'tools/check_valid_gerrit_config.sh'
-      - 'tox.ini'
-
-  - name: gate-project-config-nodepool
-    files:
-      - '^nodepool/nodepool.yaml'
-      - 'bindep.txt'
-      - 'other-requirements.txt'
-      - 'tox.ini'
-
   - name: ^gate-bindep-bindep-fallback.*$
     # Add explicit branch so that this overrides earlier
     # restrictions.
     branch: master
 
-  - name: ^gate-project-config-bindep-fallback.*$
-    # Add explicit branch so that this overrides earlier
-    # restrictions.
-    branch: master
-    files:
-      - 'bindep.txt'
-      - 'jenkins/data/bindep-fallback.txt'
-      - 'other-requirements.txt'
-
   - name: ^gate-i18n-tox-doc-publish-docs.*$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/publish-docs/i18n/latest
 
@@ -4280,39 +4194,6 @@ projects:
     experimental:
       - gate-dsvm-os-loganalyze-nv
 
-  - name: openstack-infra/project-config
-    template:
-      - name: bindep-fallback
-      - name: merge-check
-    check:
-      - gate-project-config-gerrit
-      - gate-project-config-grafyaml
-      - gate-project-config-layout
-      - gate-project-config-linters-ubuntu-xenial
-      - gate-project-config-irc-access
-      - gate-project-config-jenkins-project
-      - gate-project-config-nodepool
-      - gate-infra-docs-index
-      - gate-generate-specs-site
-      - gate-project-config-dib
-    gate:
-      - gate-project-config-gerrit
-      - gate-project-config-grafyaml
-      - gate-project-config-layout
-      - gate-project-config-linters-ubuntu-xenial
-      - gate-project-config-irc-access
-      - gate-project-config-nodepool
-      - gate-project-config-jenkins-project
-      - gate-infra-docs-index
-      - gate-generate-specs-site
-      - gate-project-config-dib
-    post:
-      - publish-infra-docs-index
-      - publish-specs-site
-    periodic:
-      - propose-project-config-update
-      - periodic-package-afs-centos7
-
   - name: openstack-infra/project-config-example
     template:
       - name: merge-check