diff --git a/.github/actions/remove_cluster/action.yml b/.github/actions/remove_cluster/action.yml
index d332825..8e17ae7 100644
--- a/.github/actions/remove_cluster/action.yml
+++ b/.github/actions/remove_cluster/action.yml
@@ -13,7 +13,7 @@ runs:
   steps:
   - name: Delete RonDB Helmchart
     shell: bash
-    run: helm delete --namespace=${{ inputs.namespace }} ${{ inputs.helm_chart }}
+    run: helm delete --namespace=${{ inputs.namespace }} ${{ inputs.helm_chart }} || true
 
   # Can't just use delete Hook, since we want to print the logs of the Pod
   - name: Delete Helm Test Pods
diff --git a/files/scripts/backups/metadata_upload_kubectl.sh b/files/scripts/backups/metadata_upload_kubectl.sh
index 4816811..a9b0785 100755
--- a/files/scripts/backups/metadata_upload_kubectl.sh
+++ b/files/scripts/backups/metadata_upload_kubectl.sh
@@ -6,8 +6,6 @@
 # for everything we want to back up. Root cannot be used over the network.
 set -e
 
-{{ include "rondb.createRcloneConfig" . }}
-
 kubectl exec \
     $MYSQLD_PODNAME \
     -c mysqld \
@@ -23,8 +21,8 @@ kubectl cp \
     -c mysqld $LOCAL_BACKUP_DIR
 ls -la $LOCAL_BACKUP_DIR
 
-{{ include "rondb.backups.defineJobNumberEnv" $ }}
-REMOTE_BACKUP_DIR={{ include "rondb.rcloneBackupRemoteName" . }}:{{ .Values.backups.s3.bucketName }}/{{ include "rondb.takeBackupPathPrefix" . }}/$JOB_NUMBER
+{{ include "rondb.backups.defineBackupIdEnv" $ }}
+REMOTE_BACKUP_DIR={{ include "rondb.rcloneBackupRemoteName" . }}:{{include "rondb.backups.bucketName" (dict "backupConfig" .Values.backups "global" .Values.global)}}/{{ include "rondb.takeBackupPathPrefix" . }}/$BACKUP_ID
 echo && rclone ls $REMOTE_BACKUP_DIR
 echo "Copying backup from $LOCAL_BACKUP_DIR to $REMOTE_BACKUP_DIR"
 rclone move $LOCAL_BACKUP_DIR $REMOTE_BACKUP_DIR
diff --git a/files/scripts/backups/native_upload_kubectl.sh b/files/scripts/backups/native_upload_kubectl.sh
index f99e17b..fa7957e 100755
--- a/files/scripts/backups/native_upload_kubectl.sh
+++ b/files/scripts/backups/native_upload_kubectl.sh
@@ -10,9 +10,9 @@ wait_pids=()
 NUM_NODE_GROUPS={{ .Values.clusterSize.numNodeGroups }}
 NUM_REPLICAS={{ .Values.clusterSize.activeDataReplicas }}
 
-{{ include "rondb.backups.defineJobNumberEnv" $ }}
-SOURCE_DIR=/home/hopsworks/data/ndb/backups/BACKUP/BACKUP-$JOB_NUMBER
-REMOTE_BACKUP_DIR={{ include "rondb.rcloneBackupRemoteName" . }}:{{ .Values.backups.s3.bucketName }}/{{ include "rondb.takeBackupPathPrefix" . }}/$JOB_NUMBER
+{{ include "rondb.backups.defineBackupIdEnv" $ }}
+SOURCE_DIR=/home/hopsworks/data/ndb/backups/BACKUP/BACKUP-$BACKUP_ID
+REMOTE_BACKUP_DIR={{ include "rondb.rcloneBackupRemoteName" . }}:{{ include "rondb.backups.bucketName" (dict "backupConfig" .Values.backups "global" .Values.global) }}/{{ include "rondb.takeBackupPathPrefix" . }}/$BACKUP_ID
 
 echo "Uploading backups from '$SOURCE_DIR' to object storage $REMOTE_BACKUP_DIR in parallel"
 for ((g = 0; g < NUM_NODE_GROUPS; g++)); do
@@ -85,3 +85,93 @@ if [ "$FAILED" = true ]; then
     exit 1
 fi
 echo ">>> Succeeded uploading all backups"
+
+{{ $configMap := include "rondb.backups.metadataStore.configMapName" . }}
+{{- if $configMap }}
+
+MAX_KEYS=5000
+MAX_SIZE_BYTES=900000
+BASE_CONFIGMAP={{ $configMap }}
+
+get_active_configmap(){
+    kubectl get cm -n {{ .Release.Namespace }} -l "app=backups-metadata,service=rondb,managed-by=cronjob,active=active" -o jsonpath='{.items[0].metadata.name}' 2>/dev/null || true
+}
+
+log_stderr(){
+    echo "$*" >&2
+}
+
+create_configmap_if_missing() {
+  local name="$1"
+  if ! kubectl get configmap "$name" -n {{ .Release.Namespace }} >/dev/null 2>&1; then
+    log_stderr "Creating ConfigMap $name"
+    kubectl create configmap "$name" -n {{ .Release.Namespace }} >/dev/null 2>&1
+    kubectl label configmap "$name" -n {{ .Release.Namespace }} app=backups-metadata service=rondb managed-by=cronjob active=active --overwrite >/dev/null 2>&1
+  fi
+}
+
+rotate_if_needed() {
+  local cm="$1"
+
+  local key_count size_bytes
+  key_count=$(kubectl get configmap "$cm" -n {{ .Release.Namespace }} -o json | jq '.data | length')
+  size_bytes=$(kubectl get configmap "$cm" -n {{ .Release.Namespace }} -o json | jq -r '.data' | wc -c)
+
+  log_stderr "ConfigMap: $cm | Keys=$key_count | Size=${size_bytes}B"
+
+  if (( key_count >= MAX_KEYS )) || (( size_bytes >= MAX_SIZE_BYTES )); then
+    log_stderr "Threshold exceeded, rotating ConfigMap..."
+    local suffix next_suffix new_cm
+    suffix="${cm#$BASE_CONFIGMAP-}"
+    if [[ "$suffix" =~ ^[0-9]+$ ]]; then
+      next_suffix=$((suffix + 1))
+    else
+      next_suffix=1
+    fi
+    new_cm="${BASE_CONFIGMAP}-${next_suffix}"
+
+    # Create and label the new ConfigMap
+    create_configmap_if_missing "$new_cm"
+
+    # Remove active label from old configmap
+    kubectl label configmap "$cm" -n {{ .Release.Namespace }} active- --overwrite >/dev/null 2>&1  || true
+
+    log_stderr "Rotated to new ConfigMap: $new_cm"
+    echo "$new_cm"
+  else
+    echo "$cm"
+  fi
+}
+
+ACTIVE_CM=$(get_active_configmap)
+if [[ -z "$ACTIVE_CM" ]]; then
+  ACTIVE_CM="$BASE_CONFIGMAP"
+  echo "No active ConfigMap found. Creating $ACTIVE_CM ..."
+  create_configmap_if_missing "$ACTIVE_CM"
+fi
+
+ACTIVE_CM=$(rotate_if_needed "$ACTIVE_CM")
+
+# Build backup metadata info json
+echo "Updating backup metadata on ConfigMap $ACTIVE_CM "
+START_TS=$(stat -c %Y {{ include "rondb.backups.backupIdFile" . }} | awk '{printf "%.3f", $1}')
+END_TS=$(date +%s.%3N)
+
+DURATION_MS=$(awk -v start="$START_TS" -v end="$END_TS" 'BEGIN { printf "%.0f", (end - start) * 1000 }')
+
+START_TIME=$(date -u -d @"${START_TS%.*}" +"%Y-%m-%dT%H:%M:%S").$(printf "%03d" "${START_TS#*.}")Z
+END_TIME=$(date -u -d @"${END_TS%.*}" +"%Y-%m-%dT%H:%M:%S").$(printf "%03d" "${END_TS#*.}")Z
+
+STATE="SUCCESS"
+
+PATCH_JSON=$(cat <<EOF
+{
+  "data": {
+    "$BACKUP_ID": "{\"start_time\":\"$START_TIME\",\"end_time\":\"$END_TIME\",\"duration_ms\":$DURATION_MS,\"state\":\"$STATE\",\"path\":\"{{ include "rondb.backups.pathScheme" . }}/{{ include "rondb.backups.bucketName" (dict "backupConfig" .Values.backups "global" .Values.global) }}/{{ include "rondb.takeBackupPathPrefix" . }}/$BACKUP_ID\"}"
+  }
+}
+EOF
+)
+
+kubectl patch configmap "$ACTIVE_CM" -n {{ .Release.Namespace }} --type merge -p "$PATCH_JSON"
+{{- end }}
\ No newline at end of file
diff --git a/templates/backups/create.yaml b/templates/backups/create.yaml
index 06eb543..ef0f07e 100644
--- a/templates/backups/create.yaml
+++ b/templates/backups/create.yaml
@@ -1,16 +1,17 @@
 # Copyright (c) 2024-2025 Hopsworks AB. All rights reserved.
 
-{{ if .Values.backups.enabled -}}
+{{ if include "rondb.backups.isEnabled" . -}}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: create-backup
+  name: create-rondb-backup
   namespace: {{ .Release.Namespace }}
 spec:
-  schedule: {{ .Values.backups.schedule | quote}}
+  schedule: {{ include "rondb.backups.schedule" . | quote}}
   concurrencyPolicy: Forbid
   jobTemplate:
     spec:
+      backoffLimit: 0
       template:
         metadata:
           labels:
@@ -20,7 +21,7 @@ spec:
 {{- include "rondb.nodeSelector" (dict "nodeSelector" $.Values.nodeSelector.backup) | indent 10 }}
 {{- include "rondb.tolerations" (dict "tolerations" $.Values.tolerations.backup) | indent 10 }}
           serviceAccountName: rondb-backups-sa
-          restartPolicy: OnFailure
+          restartPolicy: Never
           initContainers:
 {{ include "rondb.apiInitContainer" . | indent 10 }}
           - name: backup-metadata
@@ -32,10 +33,6 @@ spec:
             - |
 {{ tpl (.Files.Get "files/scripts/backups/metadata_upload_kubectl.sh") . | indent 14 }}
             env:
-            - name: JOB_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
             - name: MYSQLD_PODNAME
               value: {{ include "rondb.mysqldPodname" . }}
             # On MySQLd Pod:
@@ -43,27 +40,16 @@ spec:
               value: /tmp/backup
             - name: LOCAL_BACKUP_DIR
               value: /home/hopsworks/schemata
-            - name: RCLONE_MOUNT_FILEPATH
-              value: &rawRCloneConf /home/hopsworks/rclone-raw.conf
             # This will be read by rclone
             - name: RCLONE_CONFIG
               value: /home/hopsworks/rclone.conf
-{{- if eq $.Values.backups.objectStorageProvider "s3" }}
-            - name: ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-{{- toYaml .Values.backups.s3.keyCredentialsSecret | nindent 18 }}
-                  optional: true
-            - name: SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-{{- toYaml .Values.backups.s3.secretCredentialsSecret | nindent 18 }}
-                  optional: true
-{{- end }}
+{{- include "rondb.backup.credentials" (dict "backupConfig" $.Values.backups "namespace" $.Release.Namespace "global" $.Values.global) | indent 12 }}
             volumeMounts:
             - name: rclone-configs
-              mountPath: *rawRCloneConf
+              mountPath: /home/hopsworks/rclone.conf
               subPath: rclone.conf
+            - name: backup-id
+              mountPath: /home/hopsworks/backup-id
           # RonDB contains a native backup protocol, which is launched through
           # the mgm client. It essentially causes every datanode to create a binary
           # backup that it stores locally.
@@ -74,15 +60,15 @@ spec:
             - /bin/bash
             - -c
             - |
-{{- include "rondb.backups.defineJobNumberEnv" $ | indent 14 }}
-              ndb_mgm --ndb-connectstring=$MGM_CONNECTSTRING -e "START BACKUP $JOB_NUMBER SNAPSHOTEND WAIT COMPLETED"
+{{- include "rondb.backups.defineBackupIdEnv" $ | indent 14 }}
+              ndb_mgm --ndb-connectstring=$MGM_CONNECTSTRING -e "START BACKUP $BACKUP_ID SNAPSHOTEND WAIT COMPLETED"
             env:
-            - name: JOB_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
             - name: MGM_CONNECTSTRING
               value: {{ include "rondb.mgmdHostname" . }}:1186
+            volumeMounts:
+            - name: backup-id
+              mountPath: /home/hopsworks/backup-id
+              readOnly: true
           containers:
           - name: upload-native-backups
             image: {{ include "image_address" (dict "image" $.Values.images.toolbox) }}
@@ -93,14 +79,15 @@ spec:
             - -c
             - |
 {{ tpl (.Files.Get "files/scripts/backups/native_upload_kubectl.sh") . | indent 14 }}
-            env:
-            - name: JOB_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
+            volumeMounts:
+            - name: backup-id
+              mountPath: /home/hopsworks/backup-id
+              readOnly: true
           volumes:
           - name: rclone-configs
             configMap:
               name: rclone-configs
+          - name: backup-id
+            emptyDir: {}
 ---
 {{- end -}}
diff --git a/templates/backups/restore.yaml b/templates/backups/restore.yaml
index 24c8bfc..e31b4d8 100644
--- a/templates/backups/restore.yaml
+++ b/templates/backups/restore.yaml
@@ -1,6 +1,6 @@
 # Copyright (c) 2024-2025 Hopsworks AB. All rights reserved.
 
-{{ if .Values.restoreFromBackup.backupId -}}
+{{ if include "rondb.restoreFromBackup.backupId" . -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -145,7 +145,7 @@ spec:
         - name: MGMD_HOST
           value: {{ include "rondb.mgmdHostname" . }}
         - name: BACKUP_ID
-          value: {{ .Values.restoreFromBackup.backupId | int | quote }}
+          value: {{ include "rondb.restoreFromBackup.backupId" . | quote }}
         resources:
           limits:
             cpu: {{ .Values.resources.limits.cpus.restore }}
@@ -200,27 +200,14 @@ spec:
         - name: MGMD_HOST
           value: {{ include "rondb.mgmdHostname" . }}
         - name: BACKUP_ID
-          value: {{ .Values.restoreFromBackup.backupId | int | quote }}
-{{- if eq $.Values.restoreFromBackup.objectStorageProvider "s3" }}
-        - name: ACCESS_KEY_ID
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.restoreFromBackup.s3.keyCredentialsSecret | nindent 14 }}
-              optional: true
-        - name: SECRET_ACCESS_KEY
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.restoreFromBackup.s3.secretCredentialsSecret | nindent 14 }}
-              optional: true
-{{- end }}
-        - name: RCLONE_MOUNT_FILEPATH
-          value: {{ include "rondb.rawRCloneConf" $ }}
+          value: {{ include "rondb.restoreFromBackup.backupId" . | quote }}
+{{- include "rondb.backup.credentials" (dict "backupConfig" $.Values.restoreFromBackup "namespace" $.Release.Namespace "global" $.Values.global) | indent 8 }}
         # This will be read by rclone
         - name: RCLONE_CONFIG
           value: /home/hopsworks/rclone.conf
         volumeMounts:
         - name: rclone-configs
-          mountPath: {{ include "rondb.rawRCloneConf" $ }}
+          mountPath: /home/hopsworks/rclone.conf
           subPath: rclone.conf
         resources:
           limits:
@@ -272,7 +259,7 @@ spec:
         - name: MGMD_HOST
           value: {{ include "rondb.mgmdHostname" . }}
         - name: BACKUP_ID
-          value: {{ .Values.restoreFromBackup.backupId | int | quote }}
+          value: {{ include "rondb.restoreFromBackup.backupId" . | quote }}
         resources:
           limits:
             cpu: {{ .Values.resources.limits.cpus.restore }}
@@ -309,7 +296,7 @@ spec:
           echo "Successfully removed native backup ID $BACKUP_ID from data node Pods"
         env:
         - name: BACKUP_ID
-          value: {{ .Values.restoreFromBackup.backupId | int | quote }}
+          value: {{ include "rondb.restoreFromBackup.backupId" . | quote }}
         resources:
           limits:
             cpu: {{ .Values.resources.limits.cpus.restore }}
diff --git a/templates/backups/shared.yaml b/templates/backups/shared.yaml
index 13ffe80..5f5db04 100644
--- a/templates/backups/shared.yaml
+++ b/templates/backups/shared.yaml
@@ -1,6 +1,6 @@
 # Copyright (c) 2024-2025 Hopsworks AB. All rights reserved.
 
-{{ if or .Values.backups.enabled .Values.restoreFromBackup.backupId }}
+{{ if or (include "rondb.backups.isEnabled" .) (include "rondb.restoreFromBackup.backupId" .) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -9,38 +9,10 @@ metadata:
 data:
     rclone.conf: |
         [{{ include "rondb.rcloneRestoreRemoteName" . }}]
-{{- if eq $.Values.restoreFromBackup.objectStorageProvider "s3" }}
-        type = s3
-        provider = {{ .Values.restoreFromBackup.s3.provider }}
-        access_key_id = REG_ACCESS_KEY_ID
-        secret_access_key = REG_SECRET_ACCESS_KEY
-        env_auth = false
-        region = {{ .Values.restoreFromBackup.s3.region }}
-{{- if .Values.restoreFromBackup.s3.serverSideEncryption }}
-        server_side_encryption = {{ .Values.restoreFromBackup.s3.serverSideEncryption }}
-{{- end }}
-        storage_class = STANDARD
-{{- if .Values.restoreFromBackup.s3.endpoint }}
-        endpoint = {{ .Values.restoreFromBackup.s3.endpoint }}
-{{- end }}
-{{- end }}
+{{ include "rondb.rcloneConfig" (dict "backupConfig" .Values.restoreFromBackup "global" .Values.global) | nindent 8}}
 
         [{{ include "rondb.rcloneBackupRemoteName" . }}]
-{{- if eq $.Values.backups.objectStorageProvider "s3" }}
-        type = s3
-        provider = {{ .Values.backups.s3.provider }}
-        access_key_id = REG_ACCESS_KEY_ID
-        secret_access_key = REG_SECRET_ACCESS_KEY
-        env_auth = false
-        region = {{ .Values.backups.s3.region }}
-{{- if .Values.backups.s3.serverSideEncryption }}
-        server_side_encryption = {{ .Values.backups.s3.serverSideEncryption }}
-{{- end }}
-        storage_class = STANDARD
-{{- if .Values.backups.s3.endpoint }}
-        endpoint = {{ .Values.backups.s3.endpoint }}
-{{- end }}
-{{- end }}
+{{ include "rondb.rcloneConfig" (dict "backupConfig" .Values.backups "global" .Values.global) | nindent 8}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -82,4 +54,9 @@ rules:
 {{- end }}
 {{- end }}
     - {{ include "rondb.mysqldPodname" . }}
+{{- if include "rondb.backups.metadataStore.configMapName" $ }}
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    verbs: ["create", "get", "list", "patch"]
+{{- end }}
 {{- end }}
diff --git a/templates/mysqlds/_helpers.tpl b/templates/mysqlds/_helpers.tpl
index d922289..2c50f23 100644
--- a/templates/mysqlds/_helpers.tpl
+++ b/templates/mysqlds/_helpers.tpl
@@ -70,7 +70,7 @@
     echo "Waiting for {{ include "rondb.mysqldSetupJobName" . }} Job to have completed"
 
 {{- $waitTimeoutMinutes := .Values.timeoutsMinutes.singleSetupMySQLds }}
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" . }}
     {{- $waitTimeoutMinutes := (add $waitTimeoutMinutes .Values.timeoutsMinutes.restoreNativeBackup) }}
 {{- end }}
     (
diff --git a/templates/mysqlds/binlog_servers.yaml b/templates/mysqlds/binlog_servers.yaml
index a036ac3..9d028e0 100644
--- a/templates/mysqlds/binlog_servers.yaml
+++ b/templates/mysqlds/binlog_servers.yaml
@@ -67,7 +67,7 @@ spec:
 {{- if .Values.priorityClass }}
       priorityClassName: {{ .Values.priorityClass | quote }}
 {{- end  }}
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" . }}
       # We need to wait for the restore Job
       serviceAccountName: {{ include "rondb.serviceAccount.restoreWatcher" . }}
 {{- end }}
diff --git a/templates/mysqlds/setup_job.yaml b/templates/mysqlds/setup_job.yaml
index 1e8b2c2..32a0719 100644
--- a/templates/mysqlds/setup_job.yaml
+++ b/templates/mysqlds/setup_job.yaml
@@ -21,7 +21,7 @@ spec:
         rondbService: {{ include "rondb.labels.rondbService.setup-mysqld" $ }}
     spec:
       restartPolicy: Never
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" . }}
       serviceAccountName: {{ include "rondb.serviceAccount.restoreWatcher" . }}
 {{- end }}
 {{- include "rondb.PodSecurityContext" $ | indent 6 }}
@@ -32,7 +32,7 @@ spec:
       priorityClassName: {{ .Values.priorityClass | quote }}
 {{- end  }}
       initContainers:
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" . }}
       - name: download-mysql-metadata
         image: {{ include "image_address" (dict "image" $.Values.images.toolbox) }}
         imagePullPolicy: {{ $.Values.imagePullPolicy }}
@@ -43,44 +43,28 @@ spec:
         - |
           set -e
 
-{{ include "rondb.createRcloneConfig" . | indent 10 }}
 
-{{- if eq $.Values.restoreFromBackup.objectStorageProvider "s3" }}
-          REMOTE_BACKUP_DIR={{ include "rondb.rcloneRestoreRemoteName" . }}:{{ $.Values.restoreFromBackup.s3.bucketName }}/{{ include "rondb.restoreBackupPathPrefix" . }}/$BACKUP_ID
-{{- end }}
+          REMOTE_BACKUP_DIR={{ include "rondb.rcloneRestoreRemoteName" . }}:{{ include "rondb.backups.bucketName" (dict "backupConfig" $.Values.restoreFromBackup "global" $.Values.global) }}/{{ include "rondb.restoreBackupPathPrefix" . }}/$BACKUP_ID
           rclone copy --include "*.sql" $REMOTE_BACKUP_DIR/ $LOCAL_BACKUP_DIR/
 
           (set -x; ls -la $LOCAL_BACKUP_DIR)
           echo "Successfully downloaded MySQL metadata"
         env:
-        - name: RCLONE_MOUNT_FILEPATH
-          value: {{ include "rondb.rawRCloneConf" . }}
         # This will be read by rclone
         - name: RCLONE_CONFIG
           value: /home/hopsworks/rclone.conf
-{{- if eq $.Values.restoreFromBackup.objectStorageProvider "s3" }}
-        - name: ACCESS_KEY_ID
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.restoreFromBackup.s3.keyCredentialsSecret | nindent 14 }}
-              optional: true
-        - name: SECRET_ACCESS_KEY
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.restoreFromBackup.s3.secretCredentialsSecret | nindent 14 }}
-              optional: true
-{{- end }}
+{{- include "rondb.backup.credentials" (dict "backupConfig" $.Values.restoreFromBackup "namespace" $.Release.Namespace "global" $.Values.global) | indent 8 }}
         - name: POD_NAME
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
         - name: BACKUP_ID
-          value: {{ .Values.restoreFromBackup.backupId | int | quote }}
+          value: {{ include "rondb.restoreFromBackup.backupId" . | quote }}
         - name: LOCAL_BACKUP_DIR
           value: &metadataBackupDir /home/hopsworks/schemata
         volumeMounts:
         - name: rclone-configs
-          mountPath: {{ include "rondb.rawRCloneConf" . }}
+          mountPath: /home/hopsworks/rclone.conf
           subPath: rclone.conf
         - name: mysql-restore
           mountPath: *metadataBackupDir
@@ -123,7 +107,7 @@ spec:
           mountPath: {{ include "rondb.sqlInitScriptsDir" . }}/{{ include "rondb.helmSqlInitFile" . }}
           subPath: {{ include "rondb.helmSqlInitFile" . }}
 {{- end }}
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" . }}
         # The mount path must be unique; so we cannot mount it directly into the SQL-init directory
         - name: mysql-restore
           mountPath: {{ include "rondb.sqlRestoreScriptsDir" . }}
@@ -166,12 +150,12 @@ spec:
       - name: mysqld-configs
         configMap:
           name: mysqld-configs
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" .}}
       - name: rclone-configs
         configMap:
           name: rclone-configs
 {{- end }}
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" . }}
       - name: mysql-restore
         emptyDir:
           sizeLimit: 100Mi
diff --git a/templates/mysqlds/wait_restore_sa.yaml b/templates/mysqlds/wait_restore_sa.yaml
index b782886..7f52dac 100644
--- a/templates/mysqlds/wait_restore_sa.yaml
+++ b/templates/mysqlds/wait_restore_sa.yaml
@@ -4,7 +4,7 @@
     These are the permissions to allow waiting for the restore-backup
     Job to have completed.
 */}}
-{{- if .Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" . }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
diff --git a/templates/ndbd.yaml b/templates/ndbd.yaml
index c21394d..f35236a 100644
--- a/templates/ndbd.yaml
+++ b/templates/ndbd.yaml
@@ -138,7 +138,7 @@ spec:
     TODO: Since we already have the rclone-listener sidecar, use it to also
         download the backup-to-be-restored.
 */}}
-{{- if $.Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" $ }}
       - name: download-backup-to-restore
         image: {{ include "image_address" (dict "image" $.Values.images.toolbox) }}
         # Setting resources in order to be in QoS class Guaranteed
@@ -166,29 +166,15 @@ spec:
         - name: FILE_SYSTEM_PATH
           value: /home/hopsworks/data/ndb_data
         - name: BACKUP_ID
-          value: {{ $.Values.restoreFromBackup.backupId | int | quote }}
-{{- if eq $.Values.restoreFromBackup.objectStorageProvider "s3" }}
-        - name: ACCESS_KEY_ID
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.restoreFromBackup.s3.keyCredentialsSecret | nindent 14 }}
-              optional: true
-        - name: SECRET_ACCESS_KEY
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.restoreFromBackup.s3.secretCredentialsSecret | nindent 14 }}
-              optional: true
-{{- end }}
-        - name: RCLONE_MOUNT_FILEPATH
-          value: {{ include "rondb.rawRCloneConf" $ }}
-        # This will be read by rclone
+          value: {{ include "rondb.restoreFromBackup.backupId" $ | int | quote }}
+{{- include "rondb.backup.credentials" (dict "backupConfig" $.Values.restoreFromBackup "namespace" $.Release.Namespace "global" $.Values.global) | indent 8 }}
         - name: RCLONE_CONFIG
           value: /home/hopsworks/rclone.conf
         volumeMounts:
         - name: rondb-ndbmtd
           mountPath: /home/hopsworks/data
         - name: rclone-configs
-          mountPath: {{ include "rondb.rawRCloneConf" $ }}
+          mountPath: /home/hopsworks/rclone.conf
           subPath: rclone.conf
 {{- end }}
       - name: mgmd-dependency-check
@@ -334,7 +320,7 @@ spec:
         - name: rondb-ndbmtd-dc
           mountPath: {{ include "rondb.ndbmtd.fileSystemPathDataFiles" $ }}
 {{- end }}
-{{- if $.Values.backups.enabled -}}
+{{- if include "rondb.backups.isEnabled" $ -}}
 {{/* This container is used to receive calls to push backups to object storage */}}
       - name: rclone-listener
         image: {{ include "image_address" (dict "image" $.Values.images.toolbox) }}
@@ -345,7 +331,6 @@ spec:
         - -c
         - |
           set -e
-{{ include "rondb.createRcloneConfig" $ | indent 10 }}
           sleep infinity
         resources:
           # If not specified, requested resources are set to the limits.
@@ -359,20 +344,7 @@ spec:
 {{- end }}
             memory: 300Mi
         env:
-{{- if eq $.Values.backups.objectStorageProvider "s3" }}
-        - name: ACCESS_KEY_ID
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.backups.s3.keyCredentialsSecret | nindent 14 }}
-              optional: true
-        - name: SECRET_ACCESS_KEY
-          valueFrom:
-            secretKeyRef:
-{{- toYaml $.Values.backups.s3.secretCredentialsSecret | nindent 14 }}
-              optional: true
-{{- end }}
-        - name: RCLONE_MOUNT_FILEPATH
-          value: {{ include "rondb.rawRCloneConf" $ }}
+{{- include "rondb.backup.credentials" (dict "backupConfig" $.Values.backups "namespace" $.Release.Namespace "global" $.Values.global) | indent 8 }}
         # This will be read by rclone
         - name: RCLONE_CONFIG
           value: /home/hopsworks/rclone.conf
@@ -380,10 +352,10 @@ spec:
         - name: rondb-ndbmtd
           mountPath: /home/hopsworks/data
         - name: rclone-configs
-          mountPath: {{ include "rondb.rawRCloneConf" $ }}
+          mountPath: /home/hopsworks/rclone.conf
           subPath: rclone.conf
 {{- end }}
-{{- if or $.Values.backups.enabled $.Values.restoreFromBackup.backupId }}
+{{- if or (include "rondb.backups.isEnabled" $) (include "rondb.restoreFromBackup.backupId" $) }}
       volumes:
       - name: rclone-configs
         configMap:
diff --git a/templates/shared_templates/_helpers.tpl b/templates/shared_templates/_helpers.tpl
index 767b5ba..204349e 100644
--- a/templates/shared_templates/_helpers.tpl
+++ b/templates/shared_templates/_helpers.tpl
@@ -165,7 +165,7 @@ storageClassName: {{ .Values.resources.requests.storage.classes.binlogFiles | qu
 {{- end }}
 
 {{- define "rondb.container.waitRestore" -}}
-{{- if $.Values.restoreFromBackup.backupId }}
+{{- if include "rondb.restoreFromBackup.backupId" $ }}
 - name: wait-restore-backup
   image: {{ include "image_address" (dict "image" $.Values.images.toolbox) }}
   imagePullPolicy: {{ $.Values.imagePullPolicy }}
@@ -245,24 +245,26 @@ storageClassName: {{ .Values.resources.requests.storage.classes.binlogFiles | qu
 {{ end }}
 {{- end }}
 
+{{- define "rondb.backups.backupIdFile" -}}
+/home/hopsworks/backup-id/id
+{{- end -}}
 
-# Previously JOB_NUMBER=$(echo $JOB_NAME | tr -d '[[:alpha:]]' | tr -d '-' | sed 's/^0*//' | cut -c -9)
-# However, sometimes, the JOB_NAME would not contain an integer
-# Now, we hash the JOB_NAME, remove alphabets and take the first 5 characters
-# echo -n "$JOB_NAME" | sha1sum                     # Hash
-# echo -n "$JOB_NAME" | ... | cut -d ' ' -f 1       # Remove appended whitespace
-# echo -n "$JOB_NAME" | ... | xxd -p                # Hexadecimal hash
-# echo -n "$JOB_NAME" | ... | tr -d '\n'            # Remove newline
-# echo -n "$JOB_NAME" | ... | tr -d '[[:alpha:]]'   # Remove alphabets
-# echo -n "$JOB_NAME" | ... | sed 's/^0*//'         # Remove appended zeroes
-# echo -n "$JOB_NAME" | ... | cut -c 1-5            # Truncate to 5 characters
-{{- define "rondb.backups.defineJobNumberEnv" }}
-JOB_NUMBER=$(echo -n "$JOB_NAME" | sha1sum | cut -d ' ' -f 1 | tr -d '\n' | tr -d '[[:alpha:]]' | sed 's/^0*//' | cut -c 1-5)
-if [ -z "$JOB_NUMBER" ]; then
-    echo "JOB_NUMBER is not set"
-    exit 1
+# Backup Id format $(date +'%y%V%u%H%M')
+# %y Last two digits of the year
+# %V ISO week number (01–53)
+# %u Day of the week (1 = Monday, 7 = Sunday)
+# %H Hour (00–23)
+# %M Minute (00–59)
+{{- define "rondb.backups.defineBackupIdEnv" }}
+BACKUP_FILE={{ include "rondb.backups.backupIdFile" . | quote}}
+if [ -f "$BACKUP_FILE" ]; then
+  BACKUP_ID=$(cat "$BACKUP_FILE")
+  echo "Reusing existing backup ID: $BACKUP_ID"
+else
+  BACKUP_ID=$(date +'%y%V%u%H%M')
+  echo "$BACKUP_ID" > "$BACKUP_FILE"
+  echo "Generated new backup ID: $BACKUP_ID"
 fi
-echo "Job number: $JOB_NUMBER"
 {{- end }}
 
 {{- define "rondb.certManager.certificate.endToEnd" }}
@@ -314,4 +316,173 @@ true
 {{- if and .Values.global .Values.global._hopsworks.externalServices .Values.global._hopsworks.externalServices.rondb .Values.global._hopsworks.externalServices.rondb.external -}}
 true
 {{- end -}}
+{{- end -}}
+
+{{- define "rondb.backup.credentials" -}}
+{{- if or (eq .backupConfig.objectStorageProvider "s3") (include "rondb.global.managedObjectStorage.s3" .) (include "rondb.global.minio" .)}}
+{{- $secretName := "" }}
+{{- $key := "" }}
+{{- $optional := false }}
+{{- if and .backupConfig.s3.keyCredentialsSecret.name .backupConfig.s3.keyCredentialsSecret.key }}
+{{- $secretName = .backupConfig.s3.keyCredentialsSecret.name }}
+{{- $key = .backupConfig.s3.keyCredentialsSecret.key  }}
+{{- $optional = false }}
+{{- else if and (include "rondb.global.managedObjectStorage.s3" .) .global._hopsworks.managedObjectStorage.s3.secret .global._hopsworks.managedObjectStorage.s3.secret.name .global._hopsworks.managedObjectStorage.s3.secret.acess_key_id}}
+{{- $secretName = .global._hopsworks.managedObjectStorage.s3.secret.name }}
+{{- $key = .global._hopsworks.managedObjectStorage.s3.secret.acess_key_id }}
+{{- $optional = false }}
+{{- else if include "rondb.global.minio" . }}
+{{- $secretName = "aws-credentials" }}
+{{- $key = "access-key-id" }}
+{{- $optional = true -}}
+{{- end }}
+{{- if or (lookup "v1" "Secret" .namespace $secretName ) $optional }}
+- name: AWS_ACCESS_KEY_ID
+  valueFrom:
+    secretKeyRef:
+      name: {{ $secretName }}
+      key: {{ $key }}
+      optional: {{ $optional }}
+{{- end }}
+{{- if and .backupConfig.s3.secretCredentialsSecret.name .backupConfig.s3.secretCredentialsSecret.key }}
+{{- $secretName = .backupConfig.s3.secretCredentialsSecret.name }}
+{{- $key = .backupConfig.s3.secretCredentialsSecret.key  }}
+{{- $optional = false }}
+{{- else if and (include "rondb.global.managedObjectStorage.s3" .) .global._hopsworks.managedObjectStorage.s3.secret .global._hopsworks.managedObjectStorage.s3.secret.name .global._hopsworks.managedObjectStorage.s3.secret.secret_key_id}}
+{{- $secretName = .global._hopsworks.managedObjectStorage.s3.secret.name }}
+{{- $key = .global._hopsworks.managedObjectStorage.s3.secret.secret_key_id }}
+{{- $optional = false }}
+{{- else if include "rondb.global.minio" . }}
+{{- $secretName = "aws-credentials" }}
+{{- $key = "secret-access-key" }}
+{{- $optional = true }}
+{{- end }}
+{{- if or (lookup "v1" "Secret" .namespace $secretName) $optional }}
+- name: AWS_SECRET_ACCESS_KEY
+  valueFrom:
+    secretKeyRef:
+      name: {{ $secretName }}
+      key: {{ $key }}
+      optional: {{ $optional }}
+{{- end }}
+{{- end }}
+{{- end -}}
+
+{{- define "rondb.global.managedObjectStorage" -}}
+{{- if and .global .global._hopsworks .global._hopsworks.managedObjectStorage .global._hopsworks.managedObjectStorage.enabled -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{- define "rondb.global.minio" -}}
+{{- if and .global .global._hopsworks .global._hopsworks.minio .global._hopsworks.minio.enabled .global._hopsworks.minio.hopsfs .global._hopsworks.minio.hopsfs.enabled -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{- define "rondb.global.managedObjectStorage.s3" -}}
+{{- if and (include "rondb.global.managedObjectStorage" .) .global._hopsworks.managedObjectStorage.s3  -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{- define "rondb.global.backupsEnabled" -}}
+{{- if and ( or (include  "rondb.global.managedObjectStorage" (dict "global" .Values.global))  (include  "rondb.global.minio" (dict "global" .Values.global))) .Values.global._hopsworks.backups (hasKey .Values.global._hopsworks.backups "enabled" ) -}}
+{{- if .Values.global._hopsworks.backups.enabled -}}
+true
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "rondb.backups.isEnabled" -}}
+{{- if hasKey .Values.backups "enabled" -}}
+{{- if .Values.backups.enabled -}}
+true
+{{- end -}}
+{{- else if include "rondb.global.backupsEnabled" . -}}
+true
+{{- end -}}
+{{- end -}}
+
+# FIXME add a default value
+{{- define "rondb.backups.schedule" -}}
+{{- if and .Values.backups.enabled .Values.backups.schedule -}}
+{{- .Values.backups.schedule -}}
+{{- else if and (include "rondb.global.backupsEnabled" .) .Values.global._hopsworks.backups.schedule -}}
+{{- .Values.global._hopsworks.backups.schedule -}}
+{{- end -}}
+{{- end -}}
+
+# FIXME should be changed when supporting multiple storage backends
+{{- define "rondb.backups.bucketName" -}}
+{{- if .backupConfig.s3.bucketName -}}
+{{- .backupConfig.s3.bucketName -}}
+{{- else if and (include "rondb.global.managedObjectStorage.s3" .) .global._hopsworks.managedObjectStorage.s3.bucket.name -}}
+{{- .global._hopsworks.managedObjectStorage.s3.bucket.name -}}
+{{- else if and (include "rondb.global.minio" .) .global._hopsworks.minio.hopsfs.bucket -}}
+{{- .global._hopsworks.minio.hopsfs.bucket -}}
+{{- else -}}
+{{- fail "Missing bucket name configuration for backups. Please specify the bucket name either in the Rondb subchart or under global._hopsworks.managedObjectStorage." }}
+{{- end -}}
+{{- end -}}
+
+
+{{- define "rondb.rcloneConfig" -}}
+{{- if or (eq .backupConfig.objectStorageProvider "s3") (include "rondb.global.managedObjectStorage.s3" .) }}
+type = s3
+env_auth = true
+storage_class = STANDARD
+{{- if .backupConfig.s3.provider }}
+provider = {{ .backupConfig.s3.provider }}
+{{- else if and .global .global._hopsworks (eq (upper .global._hopsworks.cloudProvider) "AWS")}}
+provider = AWS
+{{- else }}
+provider = Other
+{{- end }}
+{{- if .backupConfig.s3.region }}
+region = {{ .backupConfig.s3.region }}
+{{- else if and (include "rondb.global.managedObjectStorage.s3" .) .global._hopsworks.managedObjectStorage.s3.region }}
+region = {{ .global._hopsworks.managedObjectStorage.s3.region }}
+{{- end }}
+{{- if .backupConfig.s3.serverSideEncryption }}
+server_side_encryption = {{ .backupConfig.s3.serverSideEncryption }}
+{{- else if and (include "rondb.global.managedObjectStorage.s3" .) .global._hopsworks.managedObjectStorage.s3.serverSideEncryption }}
+server_side_encryption = {{ .global._hopsworks.managedObjectStorage.s3.serverSideEncryption }}
+{{- end }}
+{{- if .backupConfig.s3.endpoint }}
+endpoint = {{ .backupConfig.s3.endpoint }}
+{{- else if and (include "rondb.global.managedObjectStorage.s3" .) .global._hopsworks.managedObjectStorage.s3.endpoint }}
+endpoint = {{ .global._hopsworks.managedObjectStorage.s3.endpoint }}
+{{- end }}
+{{- else if include "rondb.global.minio" . }}
+type = s3
+env_auth = true
+storage_class = STANDARD
+region = {{ .global._hopsworks.minio.region }}
+provider = Other
+endpoint = http://minio.service.consul:9000
+{{- end }}
+{{- end -}}
+
+
+{{- define "rondb.restoreFromBackup.backupId" -}}
+{{- if .Values.restoreFromBackup.backupId -}}
+{{- .Values.restoreFromBackup.backupId  -}}
+{{- else if and (include  "rondb.global.managedObjectStorage" (dict "global" .Values.global)) .Values.global._hopsworks.restoreFromBackup .Values.global._hopsworks.restoreFromBackup.backupId -}}
+{{- .Values.global._hopsworks.restoreFromBackup.backupId -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "rondb.backups.metadataStore.configMapName" -}}
+{{- if .Values.backups.metadataConfigmapName -}}
+{{- .Values.backups.metadataConfigmapName  -}}
+{{- else if and (include "rondb.global.backupsEnabled" .) .Values.global._hopsworks.backups.metadataStore.configMap.ronDB -}}
+{{- .Values.global._hopsworks.backups.metadataStore.configMap.ronDB -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "rondb.backups.pathScheme" -}}
+{{- if or (eq .Values.backups.objectStorageProvider "s3") (include "rondb.global.managedObjectStorage.s3" (dict "global" .Values.global)) (include "rondb.global.minio"  (dict "global" .Values.global)) -}}
+{{- "s3:/" -}}
+{{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/templates/shared_templates/_scripts.tpl b/templates/shared_templates/_scripts.tpl
index 4cdc882..dac9a75 100644
--- a/templates/shared_templates/_scripts.tpl
+++ b/templates/shared_templates/_scripts.tpl
@@ -5,42 +5,10 @@ NODE_ID_OFFSET=$(($NODE_GROUP*3))
 NODE_ID=$(($NODE_ID_OFFSET+$POD_ID+1))
 {{- end -}}
 
-{{- define "rondb.createRcloneConfig" -}}
-echo "Location of rclone config file:"
-rclone config file
-
-echo "Templating file $RCLONE_MOUNT_FILEPATH to $RCLONE_CONFIG"
-cp $RCLONE_MOUNT_FILEPATH $RCLONE_CONFIG
-
-# Helper function to escape special characters in the variable
-escape_sed() {
-    echo "$1" | sed -e 's/[\/&]/\\&/g'
-}
-
-{{- if eq $.Values.restoreFromBackup.objectStorageProvider "s3" }}
-# Escape the variables
-ESCAPED_ACCESS_KEY_ID=$(escape_sed "$ACCESS_KEY_ID")
-ESCAPED_SECRET_ACCESS_KEY=$(escape_sed "$SECRET_ACCESS_KEY")
-
-if [[ -z "$ACCESS_KEY_ID" ]]; then
-    # Use IAM Role instead
-    sed -i '/access_key_id/d' "$RCLONE_CONFIG"
-    sed -i '/secret_access_key/d' "$RCLONE_CONFIG"
-    sed -i 's/env_auth.*/env_auth = true/g' "$RCLONE_CONFIG"
-else
-    sed -i "s|REG_ACCESS_KEY_ID|$ESCAPED_ACCESS_KEY_ID|g" "$RCLONE_CONFIG"
-    sed -i "s|REG_SECRET_ACCESS_KEY|$ESCAPED_SECRET_ACCESS_KEY|g" "$RCLONE_CONFIG"
-fi
-{{- end }}
-{{- end }}
-
 {{- define "rondb.mapNewNodesToBackedUpNodes" -}}
-{{ include "rondb.createRcloneConfig" $ }}
 
-{{- if eq $.Values.restoreFromBackup.objectStorageProvider "s3" }}
-REMOTE_NATIVE_BACKUP_DIR={{ include "rondb.rcloneRestoreRemoteName" . }}:{{ $.Values.restoreFromBackup.s3.bucketName }}/{{ include "rondb.restoreBackupPathPrefix" . }}/$BACKUP_ID/rondb
+REMOTE_NATIVE_BACKUP_DIR={{ include "rondb.rcloneRestoreRemoteName" . }}:{{ include "rondb.backups.bucketName" (dict "backupConfig" $.Values.restoreFromBackup "global" $.Values.global) }}/{{ include "rondb.restoreBackupPathPrefix" . }}/$BACKUP_ID/rondb
 echo "Path of remote (native) backup: $REMOTE_NATIVE_BACKUP_DIR"
-{{- end }}
 
 DIRECTORY_NAMES=$(rclone lsd $REMOTE_NATIVE_BACKUP_DIR | awk '{print $NF}')
 OLD_NODE_IDS=($DIRECTORY_NAMES)
diff --git a/templates/shared_templates/_vars.tpl b/templates/shared_templates/_vars.tpl
index e8b10a6..0798ed4 100644
--- a/templates/shared_templates/_vars.tpl
+++ b/templates/shared_templates/_vars.tpl
@@ -38,10 +38,6 @@ backupRemote
 }}
 {{- end -}}
 
-{{- define "rondb.rawRCloneConf" -}}
-/home/hopsworks/rclone-raw.conf
-{{- end -}}
-
 ---
 
 {{- define "rondb.restoreNativeBackupJobname" -}}
diff --git a/test_scripts/lifecycle-test.sh b/test_scripts/lifecycle-test.sh
index 6aa68cc..065e1e5 100755
--- a/test_scripts/lifecycle-test.sh
+++ b/test_scripts/lifecycle-test.sh
@@ -143,6 +143,7 @@ helm upgrade -i $CLUSTER_B_NAME \
     --values $backups_values_file \
     --set "clusterSize.minNumRdrs=0" \
     --set "backups.enabled=true" \
+    --set "backups.schedule='@weekly'"
     --set "priorityClass=$CLUSTER_B_NAME" \
     --set "mysql.credentialsSecretName=$MYSQL_SECRET_NAME" \
     --set "mysql.supplyOwnSecret=true" \
@@ -170,7 +171,7 @@ deleteCluster $CLUSTER_A_NAME
 #########################
 
 kubectl delete job -n $CLUSTER_B_NAME manual-backup || true
-kubectl create job -n $CLUSTER_B_NAME --from=cronjob/create-backup manual-backup
+kubectl create job -n $CLUSTER_B_NAME --from=cronjob/create-rondb-backup manual-backup
 bash .github/wait_job.sh $CLUSTER_B_NAME manual-backup 180
 BACKUP_B_ID=$(getBackupId $CLUSTER_B_NAME)
 echo "BACKUP_B_ID is ${BACKUP_B_ID}"
diff --git a/test_scripts/test_backup_restore.sh b/test_scripts/test_backup_restore.sh
index ddb148e..2001961 100755
--- a/test_scripts/test_backup_restore.sh
+++ b/test_scripts/test_backup_restore.sh
@@ -50,7 +50,7 @@ setupFirstCluster() {
     helm test -n $namespace $RONDB_CLUSTER_NAME --logs --filter name=generate-data
 
     kubectl delete job -n $namespace manual-backup || true
-    kubectl create job -n $namespace --from=cronjob/create-backup manual-backup
+    kubectl create job -n $namespace --from=cronjob/create-rondb-backup manual-backup
     bash .github/wait_job.sh $namespace manual-backup 180
     BACKUP_ID=$(getBackupId $namespace)
     echo "BACKUP_ID is ${BACKUP_ID}"
diff --git a/values.schema.json b/values.schema.json
index 810b751..0e3ffb0 100644
--- a/values.schema.json
+++ b/values.schema.json
@@ -1543,10 +1543,9 @@
                 "backupId": {
                     "description": "The native backup ID for the backup to restore",
                     "type": [
-                        "integer",
+                        "string",
                         "null"
                     ],
-                    "minimum": 1,
                     "default": null
                 },
                 "pathPrefix": {
@@ -1556,9 +1555,10 @@
                 },
                 "objectStorageProvider": {
                     "enum": [
-                        "s3"
+                        "s3",
+                        null
                     ],
-                    "default": "s3"
+                    "default": null
                 },
                 "s3": {
                     "$ref": "#/$defs/s3"
@@ -1587,8 +1587,8 @@
             "description": "Whether, how and how often to run regular backups on the cluster",
             "properties": {
                 "enabled": {
-                    "type": "boolean",
-                    "default": true
+                    "type": ["boolean", "null"],
+                    "default": null
                 },
                 "pathPrefix": {
                     "description": "Prefix of RonDB backup in the configured bucket",
@@ -1597,22 +1597,25 @@
                 },
                 "schedule": {
                     "description": "Cron schedule for backups",
-                    "type": "string",
-                    "default": "@weekly"
+                    "type": ["string", "null"],
+                    "default": null
                 },
                 "objectStorageProvider": {
                     "enum": [
-                        "s3"
+                        "s3",
+                        null
                     ],
-                    "default": "s3"
+                    "default": null
                 },
                 "s3": {
                     "$ref": "#/$defs/s3"
+                },
+                "metadataConfigmapName": {
+                    "description": "The name of the configmap to be used to store the backups metadata information.",
+                    "type": ["string", "null"],
+                    "default": null
                 }
-            },
-            "required": [
-                "enabled"
-            ]
+            }
         },
         "globalReplication": {
             "type": "object",
@@ -1819,8 +1822,8 @@
             "type": "object",
             "properties": {
                 "provider": {
-                    "type": "string",
-                    "default": "AWS"
+                    "type": ["string", "null"],
+                    "default": null
                 },
                 "endpoint": {
                     "type": [
@@ -1830,12 +1833,12 @@
                     "default": null
                 },
                 "bucketName": {
-                    "type": "string",
-                    "default": "rondb-helm"
+                    "type": ["string", "null"],
+                    "default": null
                 },
                 "region": {
-                    "type": "string",
-                    "default": "eu-north-1"
+                    "type": ["string", "null"],
+                    "default": null
                 },
                 "serverSideEncryption": {
                     "enum": [
@@ -1850,16 +1853,16 @@
                     "type": "object",
                     "properties": {
                         "name": {
-                            "type": "string",
+                            "type": ["string", "null"],
                             "description": "Name of the Secret",
                             "minLength": 1,
-                            "default": "aws-credentials"
+                            "default": null
                         },
                         "key": {
-                            "type": "string",
+                            "type": ["string", "null"],
                             "description": "Key in the Secret",
                             "minLength": 1,
-                            "default": "key_id"
+                            "default": null
                         }
                     }
                 },
@@ -1867,16 +1870,16 @@
                     "type": "object",
                     "properties": {
                         "name": {
-                            "type": "string",
+                            "type": ["string", "null"],
                             "description": "Name of the Secret",
                             "minLength": 1,
-                            "default": "aws-credentials"
+                            "default": null
                         },
                         "key": {
-                            "type": "string",
+                            "type": ["string", "null"],
                             "description": "Key in the Secret",
                             "minLength": 1,
-                            "default": "access_key"
+                            "default": null
                         }
                     }
                 }
diff --git a/values.yaml b/values.yaml
index b48fe55..e84c56d 100644
--- a/values.yaml
+++ b/values.yaml
@@ -5,22 +5,23 @@
 # Schema JSON files allow defining restrictions, enums and references.
 # Use script .github/json_to_yaml.py to generate this file.
 backups:
-  enabled: true
-  objectStorageProvider: s3
+  enabled: null
+  objectStorageProvider: null
   pathPrefix: rondb_backup
   s3:
-    bucketName: rondb-helm
+    bucketName: null
     endpoint: null
     keyCredentialsSecret:
-      key: key_id
-      name: aws-credentials
-    provider: AWS
-    region: eu-north-1
+      key: null
+      name: null
+    provider: null
+    region: null
     secretCredentialsSecret:
-      key: access_key
-      name: aws-credentials
+      key: null
+      name: null
     serverSideEncryption: null
-  schedule: '@weekly'
+  schedule: null
+  metadataConfigmapName: null
 benchmarking:
   dbt2:
     numWarehouses: 4
@@ -289,19 +290,19 @@ restoreFromBackup:
   backupId: null
   excludeDatabases: []
   excludeTables: []
-  objectStorageProvider: s3
+  objectStorageProvider: null
   pathPrefix: rondb_backup
   s3:
-    bucketName: rondb-helm
+    bucketName: null
     endpoint: null
     keyCredentialsSecret:
-      key: key_id
-      name: aws-credentials
-    provider: AWS
-    region: eu-north-1
+      key: null
+      name: null
+    provider: null
+    region: null
     secretCredentialsSecret:
-      key: access_key
-      name: aws-credentials
+      key: null
+      name: null
     serverSideEncryption: null
 rondbConfig:
   ActivateRateLimits: 0
diff --git a/values/dummy_lint.yaml b/values/dummy_lint.yaml
index ba2757e..2102cfb 100644
--- a/values/dummy_lint.yaml
+++ b/values/dummy_lint.yaml
@@ -20,6 +20,7 @@ backups:
   enabled: true
   s3:
     endpoint: rondb.com
+    bucketName: test
 benchmarking:
   enabled: true
   sysbench:
@@ -136,12 +137,13 @@ resources:
         default: bla
         diskColumns: foo
 restoreFromBackup:
-  backupId: 1
+  backupId: "1"
   excludeDatabases: *dummyStringArray
   excludeTables: *dummyStringArray
   objectStorageProvider: s3
   s3:
     endpoint: rondb.com
+    bucketName: test
 rondbConfig:
   InitialTablespaceSizeGiB: 1
 serviceAccountAnnotations: *dummyAnnotations