diff --git a/Makefile b/Makefile
index abe0cf44f..8b56e9bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -250,6 +250,7 @@ install-lagoon-core: install-minio
 		--set autoIdler.enabled=false \
 		--set backupHandler.enabled=false \
 		--set broker.image.repository=$(IMAGE_REGISTRY)/broker \
+		--set apiSidecarHandler.image.repository=$(IMAGE_REGISTRY)/api-sidecar-handler \
 		--set insightsHandler.enabled=false \
 		--set keycloak.image.repository=$(IMAGE_REGISTRY)/keycloak \
 		--set keycloakDB.image.repository=$(IMAGE_REGISTRY)/keycloak-db \
diff --git a/charts/lagoon-build-deploy/Chart.yaml b/charts/lagoon-build-deploy/Chart.yaml
index a156a86f8..de94a4b68 100644
--- a/charts/lagoon-build-deploy/Chart.yaml
+++ b/charts/lagoon-build-deploy/Chart.yaml
@@ -16,7 +16,7 @@ kubeVersion: ">= 1.25.0-0"
 
 type: application
 
-version: 0.28.0
+version: 0.29.0
 
 appVersion: v0.15.6
 
diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml
index 48d23d8cd..c895e130c 100644
--- a/charts/lagoon-core/Chart.yaml
+++ b/charts/lagoon-core/Chart.yaml
@@ -46,3 +46,5 @@ annotations:
       description: update values for local development
     - kind: changed
       description: bump minimum Kubernetes version to 1.25
+    - kind: changed
+      description: added api-sidecar-handler container to api and webhooks2tasks
diff --git a/charts/lagoon-core/ci/linter-values.yaml b/charts/lagoon-core/ci/linter-values.yaml
index b4b7f49dd..c8916ba45 100644
--- a/charts/lagoon-core/ci/linter-values.yaml
+++ b/charts/lagoon-core/ci/linter-values.yaml
@@ -49,6 +49,10 @@ apiRedis:
     requests:
       cpu: "10m"
 
+apiSidecarHandler:
+  image:
+    repository: uselagoon/api-sidecar-handler
+
 actionsHandler:
   replicaCount: 1
   image:
@@ -216,8 +220,8 @@ natsService:
 natsConfig:
   users:
     lagoonRemote:
-    - user: ci-ssh-portal
-      password: ci-password
+      - user: ci-ssh-portal
+        password: ci-password
   tls:
     secretData:
       ca.crt: |
diff --git a/charts/lagoon-core/ci/testlagoon-main-override.yaml b/charts/lagoon-core/ci/testlagoon-main-override.yaml
index 88b92cab4..802010051 100644
--- a/charts/lagoon-core/ci/testlagoon-main-override.yaml
+++ b/charts/lagoon-core/ci/testlagoon-main-override.yaml
@@ -12,6 +12,10 @@ apiRedis:
   image:
     repository: testlagoon/api-redis
 
+apiSidecarHandler:
+  image:
+    repository: testlagoon/api-sidecar-handler
+
 actionsHandler:
   image:
     repository: testlagoon/actions-handler
diff --git a/charts/lagoon-core/templates/api.deployment.yaml b/charts/lagoon-core/templates/api.deployment.yaml
index 2e4dec379..4d15bed93 100644
--- a/charts/lagoon-core/templates/api.deployment.yaml
+++ b/charts/lagoon-core/templates/api.deployment.yaml
@@ -72,6 +72,27 @@ spec:
         - secretRef:
             name: {{ include "lagoon-core.api.fullname" . }}
       containers:
+      - name: api-sidecar-handler
+        securityContext:
+          {{- toYaml .Values.api.securityContext | nindent 10 }}
+        image: "{{ .Values.apiSidecarHandler.image.repository }}:{{ coalesce .Values.apiSidecarHandler.image.tag .Values.imageTag .Chart.AppVersion }}"
+        imagePullPolicy: {{ .Values.apiSidecarHandler.image.pullPolicy }}
+        livenessProbe:
+          httpGet:
+            path: /status
+            port: 3333
+        readinessProbe:
+          httpGet:
+            path: /status
+            port: 3333
+        startupProbe:
+          httpGet:
+            path: /status
+            port: 3333
+          failureThreshold: 60
+          periodSeconds: 10
+        resources:
+          {{- toYaml .Values.api.resources | nindent 10 }}
       - name: api
         securityContext:
           {{- toYaml .Values.api.securityContext | nindent 10 }}
diff --git a/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml b/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml
index d9ee07a5d..d1f294d3c 100644
--- a/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml
+++ b/charts/lagoon-core/templates/webhooks2tasks.deployment.yaml
@@ -30,6 +30,27 @@ spec:
       securityContext:
         {{- toYaml (coalesce .Values.webhooks2tasks.podSecurityContext .Values.podSecurityContext) | nindent 8 }}
       containers:
+      - name: api-sidecar-handler
+        securityContext:
+          {{- toYaml .Values.webhooks2tasks.securityContext | nindent 10 }}
+        image: "{{ .Values.apiSidecarHandler.image.repository }}:{{ coalesce .Values.apiSidecarHandler.image.tag .Values.imageTag .Chart.AppVersion }}"
+        imagePullPolicy: {{ .Values.apiSidecarHandler.image.pullPolicy }}
+        livenessProbe:
+          httpGet:
+            path: /status
+            port: 3333
+        readinessProbe:
+          httpGet:
+            path: /status
+            port: 3333
+        startupProbe:
+          httpGet:
+            path: /status
+            port: 3333
+          failureThreshold: 60
+          periodSeconds: 10
+        resources:
+          {{- toYaml .Values.webhooks2tasks.resources | nindent 10 }}
       - name: webhooks2tasks
         securityContext:
           {{- toYaml .Values.webhooks2tasks.securityContext | nindent 10 }}
diff --git a/charts/lagoon-core/values.yaml b/charts/lagoon-core/values.yaml
index 19308b782..752d7acd1 100644
--- a/charts/lagoon-core/values.yaml
+++ b/charts/lagoon-core/values.yaml
@@ -225,6 +225,13 @@ apiRedis:
     type: ClusterIP
     port: 6379
 
+apiSidecarHandler:
+  image:
+    repository: uselagoon/api-sidecar-handler
+    pullPolicy: Always
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: ""
+
 keycloak:
   # keycloak realm and email settings configuration
   realmSettings:
diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml
index 6d483555c..285c9861d 100644
--- a/charts/lagoon-remote/Chart.yaml
+++ b/charts/lagoon-remote/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.91.0
+version: 0.92.0
 
 dependencies:
 - name: lagoon-build-deploy