diff --git a/jenkins/jobs/kolla.yaml b/jenkins/jobs/kolla.yaml
new file mode 100644
index 0000000000..c81e5295ec
--- /dev/null
+++ b/jenkins/jobs/kolla.yaml
@@ -0,0 +1,13 @@
+- job-template:
+    name: '{pipeline}-kolla-functional-f21'
+    node: '{node}'
+
+    builders:
+      - link-logs
+      - net-info
+      - gerrit-git-prep
+      - shell: |
+          'tools/pre-commit-hook'
+
+    publishers:
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index fefb8af521..7107fc3889 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3478,6 +3478,9 @@
     jobs:
       - gate-{name}-bashate
       - gate-{name}-pep8
+      - '{pipeline}-kolla-functional-f21':
+          pipeline: check
+          node: 'devstack-f21'
 
 - project:
     name: kwapi
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fd4ba47cb3..72ab96d0cc 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -901,6 +901,8 @@ jobs:
     branch: ^(?!stable/icehouse).*$
   - name: gate-kolla-bashate
     voting: false
+  - name: check-kolla-functional-f21
+    voting: false
   - name: ^(gate-)?devstack-publish-docs
     branch: ^master
   - name: ^gate-puppet-.*-puppet-beaker-rspec$
@@ -4898,6 +4900,7 @@ projects:
     check:
       - gate-kolla-bashate
       - gate-kolla-pep8
+      - check-kolla-functional-f21
     gate:
       - noop