diff --git a/charts/gitjobs/templates/server_deployment.yaml b/charts/gitjobs/templates/server_deployment.yaml
index 65c4baa6..dac98e24 100644
--- a/charts/gitjobs/templates/server_deployment.yaml
+++ b/charts/gitjobs/templates/server_deployment.yaml
@@ -28,7 +28,9 @@ spec:
         - {{- include "chart.checkDbIsReadyInitContainer" . | nindent 10 }}
         {{- if .Release.IsInstall }}
         - name: check-dbmigrator-run
-          image: "bitnami/kubectl:{{ template "chart.KubernetesVersion" . }}"
+          {{ $kubeVersion := include "chart.KubernetesVersion" . }}
+          {{ $kubectlImageVersion := ternary "1.33" $kubeVersion (semverCompare ">=1.34.0-0" (printf "%s.0" $kubeVersion)) }}
+          image: "docker.io/bitnamilegacy/kubectl:{{ $kubectlImageVersion }}"
           imagePullPolicy: IfNotPresent
           command: ['kubectl', 'wait', '--namespace={{ .Release.Namespace }}', '--for=condition=complete', 'job/{{ include "chart.resourceNamePrefix" . }}dbmigrator-install', '--timeout=60s']
         {{- end }}
diff --git a/charts/gitjobs/values.yaml b/charts/gitjobs/values.yaml
index 76086c2e..d963c55a 100644
--- a/charts/gitjobs/values.yaml
+++ b/charts/gitjobs/values.yaml
@@ -170,7 +170,7 @@ postgresql:
     password: postgres
     database: gitjobs
   image:
-    repository: bitnami/postgresql
+    repository: bitnamilegacy/postgresql
     tag: 17.2.0-debian-12-r3
   postgresqlDataDir: /data/pgdata
   primary: