diff --git a/roles/charm-publish/tasks/main.yaml b/roles/charm-publish/tasks/main.yaml
index cc6e2a7f..7821f1e9 100644
--- a/roles/charm-publish/tasks/main.yaml
+++ b/roles/charm-publish/tasks/main.yaml
@@ -6,9 +6,13 @@
     download_artifact_api: "https://zuul.opendev.org/api/tenant/{{ zuul.tenant }}"
     download_artifact_query: "change={{ zuul.change }}&patchset={{ zuul.patchset }}&pipeline=gate"
 
+- name: Set charm name fact
+  set_fact:
+    charm_name: "{{ (zuul.job | default('')).removeprefix('publish-charm-') }}"
+
 - name: Get relevant charm build jobs
   set_fact:
-    relevant_charm_build_jobs: "{{ build_output.json | selectattr('job_name', 'match', '^charm-build-.*$') | map(attribute='job_name') | list }}"
+    relevant_charm_build_jobs: "{{ build_output.json | selectattr('job_name', 'match', '^charm-build-'+ charm_name +'.*$') | map(attribute='job_name') | list }}"
 
 - name: Print relevant build jobs
   debug:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 930aee97..a022a715 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -399,10 +399,198 @@
       test_dir: tests/misc
 
 - job:
-    name: publish-charms
+    name: publish-charm-aodh-k8s
     description: |
-      Publish all the charms built in the gate
-      pipeline.
+      Publish aodh-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-barbican-k8s
+    description: |
+      Publish barbican-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-ceilometer-k8s
+    description: |
+      Publish ceilometer-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-cinder-ceph-k8s
+    description: |
+      Publish cinder-ceph-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-cinder-k8s
+    description: |
+      Publish cinder-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-designate-bind-k8s
+    description: |
+      Publish designate-bind-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-designate-k8s
+    description: |
+      Publish designate-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-glance-k8s
+    description: |
+      Publish glance-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-gnocchi-k8s
+    description: |
+      Publish gnocchi-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-heat-k8s
+    description: |
+      Publish heat-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-horizon-k8s
+    description: |
+      Publish horizon-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-keystone-k8s
+    description: |
+      Publish keystone-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-keystone-ldap-k8s
+    description: |
+      Publish keystone-ldap-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-magnum-k8s
+    description: |
+      Publish magnum-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-neutron-k8s
+    description: |
+      Publish neutron-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-nova-k8s
+    description: |
+      Publish nova-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-octavia-k8s
+    description: |
+      Publish octavia-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-openstack-exporter-k8s
+    description: |
+      Publish openstack-exporter-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-openstack-hypervisor
+    description: |
+      Publish openstack-hypervisor built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-ovn-central-k8s
+    description: |
+      Publish ovn-central-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-ovn-relay-k8s
+    description: |
+      Publish ovn-relay-k8s built in gate pipeline.
+    run: playbooks/charm/publish.yaml
+    secrets:
+      - charmhub_token
+    timeout: 3600
+
+- job:
+    name: publish-charm-placement-k8s
+    description: |
+      Publish placement-k8s built in gate pipeline.
     run: playbooks/charm/publish.yaml
     secrets:
       - charmhub_token
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 30f0883b..93e240f3 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -131,8 +131,50 @@
 - project-template:
     name: charm-publish-jobs
     description: |
-      The set of publish jobs for the OpenStack Sunbeam Charms
+        The set of publish jobs for the OpenStack Sunbeam Charms
     promote:
-      jobs:
-        - publish-charms:
-            nodeset: ubuntu-jammy
+        jobs:
+            - publish-charm-keystone-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-glance-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-nova-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-placement-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-neutron-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-ovn-central-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-ovn-relay-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-cinder-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-cinder-ceph-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-horizon-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-heat-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-octavia-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-aodh-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-ceilometer-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-gnocchi-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-barbican-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-magnum-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-designate-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-designate-bind-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-keystone-ldap-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-openstack-exporter-k8s:
+                nodeset: ubuntu-jammy
+            - publish-charm-openstack-hypervisor:
+                nodeset: ubuntu-jammy