diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index d39b8d2e3f..94a1122aa0 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -52,73 +52,6 @@
       - openstack/openstack-helm-infra
     nodeset: openstack-helm-single-node
 
-- job:
-    name: openstack-helm-keystone
-    parent: openstack-helm-chart-deploy
-    run: tools/gate/playbooks/osh-gate-runner.yaml
-    vars:
-      osh_params:
-        openstack_release: newton
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-      gate_scripts:
-        - ./tools/deployment/common/install-packages.sh
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-- job:
-    name: openstack-helm-keystone-pike-ubuntu_xenial
-    parent: openstack-helm-keystone
-    vars:
-      osh_params:
-        openstack_release: pike
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-keystone-queens-ubuntu_xenial
-    parent: openstack-helm-keystone
-    vars:
-      osh_params:
-        openstack_release: queens
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-keystone-rocky-ubuntu_xenial
-    parent: openstack-helm-keystone
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-keystone-rocky-ubuntu_bionic
-    parent: openstack-helm-keystone
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-- job:
-    name: openstack-helm-keystone-rocky-opensuse_15
-    parent: openstack-helm-keystone
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: opensuse
-        container_distro_version: '15'
-- job:
-    name: openstack-helm-keystone-stein-ubuntu_bionic
-    parent: openstack-helm-keystone
-    vars:
-      osh_params:
-        openstack_release: stein
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-
 - job:
     name: openstack-helm-keystone-ldap
     parent: openstack-helm-chart-deploy
@@ -140,143 +73,6 @@
         - ./tools/deployment/component/common/ldap.sh
         - ./tools/deployment/component/keystone/keystone.sh
 
-- job:
-    name: openstack-helm-glance
-    parent: openstack-helm-chart-deploy
-    run: tools/gate/playbooks/osh-gate-runner.yaml
-    vars:
-      osh_params:
-        openstack_release: newton
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-      gate_scripts:
-        - ./tools/deployment/common/install-packages.sh
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/glance/glance.sh
-- job:
-    name: openstack-helm-glance-pike-ubuntu_xenial
-    parent: openstack-helm-glance
-    vars:
-      osh_params:
-        openstack_release: pike
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-glance-queens-ubuntu_xenial
-    parent: openstack-helm-glance
-    vars:
-      osh_params:
-        openstack_release: queens
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-glance-rocky-ubuntu_xenial
-    parent: openstack-helm-glance
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-glance-rocky-ubuntu_bionic
-    parent: openstack-helm-glance
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-- job:
-    name: openstack-helm-glance-rocky-opensuse_15
-    parent: openstack-helm-glance
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: opensuse
-        container_distro_version: '15'
-- job:
-    name: openstack-helm-glance-stein-ubuntu_bionic
-    parent: openstack-helm-glance
-    vars:
-      osh_params:
-        openstack_release: stein
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-
-- job:
-    name: openstack-helm-heat
-    parent: openstack-helm-chart-deploy
-    run: tools/gate/playbooks/osh-gate-runner.yaml
-    vars:
-      osh_params:
-        openstack_release: newton
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-      gate_scripts:
-        - ./tools/deployment/common/install-packages.sh
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/heat/heat.sh
-- job:
-    name: openstack-helm-heat-pike-ubuntu_xenial
-    parent: openstack-helm-heat
-    vars:
-      osh_params:
-        openstack_release: pike
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-heat-queens-ubuntu_xenial
-    parent: openstack-helm-heat
-    vars:
-      osh_params:
-        openstack_release: queens
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-heat-rocky-ubuntu_xenial
-    parent: openstack-helm-heat
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: ubuntu
-        container_distro_version: xenial
-- job:
-    name: openstack-helm-heat-rocky-ubuntu_bionic
-    parent: openstack-helm-heat
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-- job:
-    name: openstack-helm-heat-rocky-opensuse_15
-    parent: openstack-helm-heat
-    vars:
-      osh_params:
-        openstack_release: rocky
-        container_distro_name: opensuse
-        container_distro_version: '15'
-- job:
-    name: openstack-helm-heat-stein-ubuntu_bionic
-    parent: openstack-helm-heat
-    vars:
-      osh_params:
-        openstack_release: stein
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-
 - job:
     name: openstack-helm-cinder
     parent: openstack-helm-chart-deploy
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5019b2ba8d..ace88fcc40 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -61,32 +61,8 @@
         - openstack-helm-compute-kit
     periodic:
       jobs:
-        # Keystone jobs that are replicated in compute-kit
-        - openstack-helm-keystone
-        - openstack-helm-keystone-pike-ubuntu_xenial
-        - openstack-helm-keystone-queens-ubuntu_xenial
-        - openstack-helm-keystone-rocky-ubuntu_xenial
-        - openstack-helm-keystone-rocky-ubuntu_bionic
-        - openstack-helm-keystone-rocky-opensuse_15
-        - openstack-helm-keystone-stein-ubuntu_bionic
         # Keystone job that exersizes feature gate
         - openstack-helm-keystone-ldap
-        # Glance jobs that are replicated in compute-kit
-        - openstack-helm-glance
-        - openstack-helm-glance-pike-ubuntu_xenial
-        - openstack-helm-glance-queens-ubuntu_xenial
-        - openstack-helm-glance-rocky-ubuntu_xenial
-        - openstack-helm-glance-rocky-ubuntu_bionic
-        - openstack-helm-glance-rocky-opensuse_15
-        - openstack-helm-glance-stein-ubuntu_bionic
-        # Heat jobs that are replicated in compute-kit
-        - openstack-helm-heat
-        - openstack-helm-heat-pike-ubuntu_xenial
-        - openstack-helm-heat-queens-ubuntu_xenial
-        - openstack-helm-heat-rocky-ubuntu_xenial
-        - openstack-helm-heat-rocky-ubuntu_bionic
-        - openstack-helm-heat-rocky-opensuse_15
-        - openstack-helm-heat-stein-ubuntu_bionic
         # Unique periodic jobs
         - openstack-helm-multinode-temp-ubuntu
         - openstack-helm-ironic-ubuntu