diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml
index 6193e575b8..3c3982d725 100644
--- a/library/common/Chart.yaml
+++ b/library/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: A library chart for iX Official Catalog
 type: library
-version: 1.0.0
+version: 1.0.1
 appVersion: v1
 annotations:
   title: Common Library Chart
diff --git a/library/common/docs/README.md b/library/common/docs/README.md
index 0b8a0da87f..a5a654a609 100644
--- a/library/common/docs/README.md
+++ b/library/common/docs/README.md
@@ -148,7 +148,7 @@ podOptions:
   tolerations: []
   runtimeClassName: ""
   automountServiceAccountToken: false
-  terminationGracePeriodSeconds: 120
+  terminationGracePeriodSeconds: 30
 ```
 
 ---
diff --git a/library/common/templates/app_functions/_postgres.tpl b/library/common/templates/app_functions/_postgres.tpl
index d2d7a9952a..87e0ac6077 100644
--- a/library/common/templates/app_functions/_postgres.tpl
+++ b/library/common/templates/app_functions/_postgres.tpl
@@ -12,6 +12,7 @@ resources (required): Resources for the postgres container
   {{- $name := .name | default "postgres" -}}
   {{- $secretName := (required "Postgres - Secret Name is required" .secretName) -}}
   {{- $backupPath := .backupPath | default "/postgres_backup" -}}
+  {{- $ixChartContext := .ixChartContext -}}
   {{- $resources := (required "Postgres - Resources are required" .resources) }}
 {{ $name }}:
   enabled: true
@@ -57,8 +58,21 @@ resources (required): Resources for the postgres container
               - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2; done"
     initContainers:
     {{- include "ix.v1.common.app.permissions" (dict "UID" 999 "GID" 999) | nindent 6 }}
+{{- $enableBackupJob := false -}}
+{{- if hasKey $ixChartContext "isUpgrade" -}}
+  {{- if $ixChartContext.isUpgrade -}}
+    {{- $enableBackupJob = true -}}
+  {{- end -}}
+{{- else -}}
+  {{/*
+    If the key is not present in ixChartContext,
+    means we are outside SCALE (Probably CI),
+    let upgrade job run
+  */}}
+  {{- $enableBackupJob = true -}}
+{{- end }}
 postgresbackup:
-  enabled: true
+  enabled: {{ $enableBackupJob }}
   type: Job
   annotations:
     "helm.sh/hook": pre-upgrade
@@ -100,3 +114,35 @@ postgresbackup:
     initContainers:
     {{- include "ix.v1.common.app.permissions" (dict "UID" 999 "GID" 999 "type" "init") | nindent 6 }}
 {{- end -}}
+
+{{/* Returns a postgres-wait container for waiting for postgres to be ready */}}
+{{/* Call this template:
+{{ include "ix.v1.common.app.postgresWait" (dict "name" "postgres-wait" "secretName" "postgres-creds") }}
+
+name (optional): Name of the postgres-wait container (default: postgres-wait)
+secretName (required): Name of the secret containing the postgres credentials
+*/}}
+
+{{- define "ix.v1.common.app.postgresWait" -}}
+  {{- $name := .name | default "postgres-wait" -}}
+  {{- $secretName := (required "Postgres-Wait - Secret Name is required" .secretName) }}
+{{ $name }}:
+  enabled: true
+  type: init
+  imageSelector: postgresImage
+  envFrom:
+    - secretRef:
+        name: {{ $secretName }}
+  resources:
+    limits:
+      cpu: 500m
+      memory: 256Mi
+  command: bash
+  args:
+    - -c
+    - |
+      echo "Waiting for postgres to be ready"
+      until pg_isready -h ${POSTGRES_HOST} -U ${POSTGRES_USER} -d ${POSTGRES_DB}; do
+        sleep 2
+      done
+{{- end -}}
diff --git a/library/common/values.yaml b/library/common/values.yaml
index b0ad70630c..95fdac02cb 100644
--- a/library/common/values.yaml
+++ b/library/common/values.yaml
@@ -94,7 +94,7 @@ podOptions:
   tolerations: []
   runtimeClassName: ""
   automountServiceAccountToken: false
-  terminationGracePeriodSeconds: 120
+  terminationGracePeriodSeconds: 30
 
 # -- (docs/notes.md)
 notes: