diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 6a670fda..760cdb7e 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -35,7 +35,10 @@ jobs:
 
       - name: Run chart-testing (lint)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct lint --config ct.yaml --target-branch ${{ github.event.repository.default_branch }} --validate-maintainers=false
+        run: |
+          # Required for Storm chart due to old version
+          helm repo add bitnami-full-index https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+          ct lint --config ct.yaml --target-branch ${{ github.event.repository.default_branch }} --validate-maintainers=false
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
diff --git a/.github/workflows/scripts/config.json b/.github/workflows/scripts/config.json
index cc8795d8..7b4c9bc1 100644
--- a/.github/workflows/scripts/config.json
+++ b/.github/workflows/scripts/config.json
@@ -155,16 +155,6 @@
           },
           "tests": false
         },
-        {
-          "name": "armada-jobservice",
-          "source": "deployment/jobservice",
-          "destination": "armada",
-          "use_ref_as_version": {
-            "pattern": "^refs/tags/v",
-            "replacement": ""
-          },
-          "tests": false
-        },
         {
           "name": "armada-lookout-v2",
           "source": "deployment/lookout-v2",
diff --git a/storm/Chart.lock b/storm/Chart.lock
index 249e874a..d9e6e064 100644
--- a/storm/Chart.lock
+++ b/storm/Chart.lock
@@ -1,6 +1,9 @@
 dependencies:
 - name: zookeeper
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   version: 6.5.4
-digest: sha256:58887caf583ed996b79fd38c47155ac3257e23780df3b70134430a61cb725ba8
-generated: "2021-03-27T21:30:18.691467-07:00"
\ No newline at end of file
+- name: common
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 2.19.0
+digest: sha256:3dea41e3dd9a2337df13887a23eac20aa4164ff053a1769048f70090f0178f44
+generated: "2024-03-14T12:51:15.951054+01:00"
diff --git a/storm/Chart.yaml b/storm/Chart.yaml
index 5f42b7c2..5aed932f 100755
--- a/storm/Chart.yaml
+++ b/storm/Chart.yaml
@@ -1,24 +1,29 @@
 apiVersion: v2
 appVersion: 2.4.0
-version: 1.2.0
+version: 1.2.1
 description: Apache Storm is a free and open source distributed realtime computation system.
 home: http://storm.apache.org/
 icon: http://storm.apache.org/images/logo.png
 keywords:
-- storm
-- zookeeper
+  - storm
+  - zookeeper
 maintainers:
-- name: of13tch
-- name: stackedsax
-- name: mariannovotny
-- name: jgiannuzzi
-- name: yasram1
+  - name: of13tch
+  - name: stackedsax
+  - name: mariannovotny
+  - name: jgiannuzzi
+  - name: yasram1
 name: storm
 sources:
-- https://github.com/G-Research/charts/tree/master/src/storm
-- https://github.com/apache/storm
+  - https://github.com/G-Research/charts/tree/master/src/storm
+  - https://github.com/apache/storm
 dependencies:
-- name: zookeeper
-  version: ~6.5.2
-  repository: https://charts.bitnami.com/bitnami
-  condition: zookeeper.enabled
\ No newline at end of file
+  - name: zookeeper
+    version: ~6.5.2
+    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+    condition: zookeeper.enabled
+  - name: common
+    repository: oci://registry-1.docker.io/bitnamicharts
+    tags:
+      - bitnami-common
+    version: 2.x.x
diff --git a/storm/charts/common-2.19.0.tgz b/storm/charts/common-2.19.0.tgz
new file mode 100644
index 00000000..999417cc
Binary files /dev/null and b/storm/charts/common-2.19.0.tgz differ
diff --git a/storm/values.yaml b/storm/values.yaml
index 1353e7b5..2d95a6c3 100755
--- a/storm/values.yaml
+++ b/storm/values.yaml
@@ -11,7 +11,7 @@ nimbus:
   replicaCount: 1
   image:
     repository: storm
-    tag: 2.4.0
+    tag: 2.4.0-temurin
     pullPolicy: IfNotPresent
   service:
     name: nimbus
@@ -27,7 +27,7 @@ supervisor:
   replicaCount: 2
   image:
     repository: storm
-    tag: 2.4.0
+    tag: 2.4.0-temurin
     pullPolicy: IfNotPresent
   service:
     name: supervisor
@@ -36,10 +36,10 @@ supervisor:
   resources:
     requests:
       cpu: 1
-      memory: 512 #Mi
+      memory: 512  # Mi
     limits:
       cpu: 2
-      memory: 1024 #Mi
+      memory: 1024  # Mi
   nodeSelector: {}
   tolerations: []
   affinity: {}
@@ -52,19 +52,19 @@ supervisor:
   ## @param extraVolumes Optionally specify extra list of additional volumes for the Supervisor pod(s)
   ## Example use case:
   ## extraVolumes:
-  ## - name: extra-config 
+  ## - name: extra-config
   ##   configMap:
-  ##     name: extra-config 
+  ##     name: extra-config
   ##
   extraVolumes: []
 
   ## @param extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Supervisor container(s)
   ## Example use case:
   ## extraVolumeMounts:
-  ## - name: extra-config 
+  ## - name: extra-config
   ##   mountPath: /opt/config
   ##   readOnly: true
-  ##     
+  ##
   extraVolumeMounts: []
 
 ui:
@@ -72,7 +72,7 @@ ui:
   replicaCount: 1
   image:
     repository: storm
-    tag: 2.4.0
+    tag: 2.4.0-temurin
     pullPolicy: IfNotPresent
   service:
     type: ClusterIP
@@ -92,17 +92,17 @@ persistence:
   # storageClass: "-"
   accessModes:
     - ReadWriteOnce
-  
+
   data:
     size: 1Gi
     annotations: {}
     # existingClaim:
-  
+
   logs:
     size: 1Gi
     annotations: {}
     # existingClaim:
-  
+
   metrics:
     size: 200Mi
     annotations: {}
@@ -112,7 +112,7 @@ zookeeper:
   enabled: true
   replicaCount: 1
   # # if using an external zookeeper, you need to set the server names below
-  # servers: 
+  # servers:
   #  - "example.external.zookeeper1"
   #  - "example.external.zookeeper2"
   #  - "example.external.zookeeper3"
@@ -141,8 +141,8 @@ jmx:
   enabled: false
   config: |-
     rules:
-    - pattern: ".*" 
+    - pattern: ".*"
 
 exporter:
   prometheus:
-    enabled: true
\ No newline at end of file
+    enabled: true