diff --git a/global/schemas/pegleg/SoftwareVersions/v1.yaml b/global/schemas/pegleg/SoftwareVersions/v1.yaml
index 96d705b9c..93bb8a4dd 100644
--- a/global/schemas/pegleg/SoftwareVersions/v1.yaml
+++ b/global/schemas/pegleg/SoftwareVersions/v1.yaml
@@ -806,6 +806,17 @@ data:
                   type: string
                 reference:
                   type: string
+            compute-utility:
+              type: object
+              properties:
+                type:
+                  type: string
+                location:
+                  type: string
+                subpath:
+                  type: string
+                reference:
+                  type: string
             etcdctl-utility:
               type: object
               properties:
@@ -1032,6 +1043,13 @@ data:
                   type: string
                 image_repo_sync:
                   type: string
+            compute-utility:
+              type: object
+              properties:
+                compute_utility:
+                  type: string
+                image_repo_sync:
+                  type: string
             etcdctl-utility:
               type: object
               properties:
diff --git a/global/software/charts/utilities/chart-group.yaml b/global/software/charts/utilities/chart-group.yaml
index 2f2cbbc50..8a07dbc5f 100644
--- a/global/software/charts/utilities/chart-group.yaml
+++ b/global/software/charts/utilities/chart-group.yaml
@@ -14,4 +14,5 @@ data:
     - calicoctl-utility
 #    - ceph-utility-config
 #    - ceph-utility
+    - compute-utility
     - etcdctl-utility
diff --git a/global/software/charts/utilities/compute-utility.yaml b/global/software/charts/utilities/compute-utility.yaml
new file mode 100644
index 000000000..27cf3b31d
--- /dev/null
+++ b/global/software/charts/utilities/compute-utility.yaml
@@ -0,0 +1,77 @@
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: compute-utility
+  layeringDefinition:
+    abstract: false
+    layer: global
+  labels:
+    name: compute-utility-global
+    component: utility
+  storagePolicy: cleartext
+  substitutions:
+    # Chart source
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .charts.utility.compute-utility
+      dest:
+        path: .source
+    # Images
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .images.utility.compute-utility
+      dest:
+        path: .values.images.tags
+data:
+  chart_name: compute-utility
+  release: compute-utility
+  namespace: utility
+  protected:
+    continue_processing: true
+  wait:
+    timeout: 600
+    labels:
+      release_group: airship-compute-utility
+  install:
+   no_hooks: false
+  upgrade:
+   no_hooks: false
+  values:
+    labels:
+      utility:
+        node_selector_key: utility
+        node_selector_value: enabled
+    manifests:
+      configmap_bin: true
+      configmap_etc_client: true
+      configmap_etc_sudoers: true
+      deployment_utility: true
+  dependencies:
+    - compute-utility-htk
+...
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: compute-utility-htk
+  layeringDefinition:
+    abstract: false
+    layer: global
+  storagePolicy: cleartext
+  substitutions:
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .charts.utility.compute-utility-htk
+      dest:
+        path: .source
+data:
+  chart_name: compute-utility-htk
+  release: compute-utility-htk
+  namespace: compute-utility-htk
+  values: {}
+  dependencies: []
+...
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index a74b1fc6e..2eaac4bd8 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -562,6 +562,16 @@ data:
         reference: ef58054dff356334cdbfd96f04dc7c149768c76d
         subpath: helm-toolkit
         type: git
+      compute-utility:
+        location: https://opendev.org/airship/porthole
+        reference: 2de4ed3da8d0c49d33fcab5817f3f8dff5bcd5f9
+        subpath: charts/compute-utility
+        type: git
+      compute-utility-htk:
+        location: https://opendev.org/openstack/openstack-helm-infra
+        reference: ef58054dff356334cdbfd96f04dc7c149768c76d
+        subpath: helm-toolkit
+        type: git
       etcdctl-utility:
         location: https://opendev.org/airship/porthole
         reference: cb5d6cfba3541b48cdc1a494cd04cc8ac3fd86c8
@@ -1061,6 +1071,9 @@ data:
       ceph-utility:
         ceph_utility: quay.io/airshipit/porthole-ceph-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial
         image_repo_sync: docker.io/docker:18.09.02
+      compute-utility:
+        compute_utility: quay.io/airshipit/porthole-compute-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial
+        image_repo_sync: docker.io/docker:18.09.02
       etcdctl-utility:
         etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:8a08f26f4ae409d985c0c123e293a1ac7ccd3a8b-ubuntu_xenial
         image_repo_sync: docker.io/docker:18.09.02