diff --git a/.github/workflows/preview-helm-charts.yml b/.github/workflows/preview-helm-charts.yml
index 798fb24f..56fa34db 100644
--- a/.github/workflows/preview-helm-charts.yml
+++ b/.github/workflows/preview-helm-charts.yml
@@ -185,8 +185,11 @@ jobs:
         run: |
           RUNTIME_API_VERSION=$(yq '.version' charts/runtime-api/Chart.yaml)
           RUNTIME_API_PREVIEW="${RUNTIME_API_VERSION}-alpha.${{ github.event.pull_request.number }}"
+          REPO_OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          RUNTIME_API_PREVIEW_REPOSITORY="oci://ghcr.io/${REPO_OWNER}/helm-charts"
 
           yq -i "(.dependencies[] | select(.name == \"runtime-api\")).version = \"${RUNTIME_API_PREVIEW}\"" charts/openhands/Chart.yaml
+          yq -i "(.dependencies[] | select(.name == \"runtime-api\")).repository = \"${RUNTIME_API_PREVIEW_REPOSITORY}\"" charts/openhands/Chart.yaml
 
       - name: Update automation dependency version
         if: steps.check.outputs.should_publish == 'true' && matrix.chart.name == 'openhands' && needs.detect-changes.outputs.automation == 'true'
@@ -319,9 +322,12 @@ jobs:
         run: |
           RUNTIME_API_VERSION=$(yq '.version' charts/runtime-api/Chart.yaml)
           RUNTIME_API_PREVIEW="${RUNTIME_API_VERSION}-alpha.${{ github.event.pull_request.number }}"
+          REPO_OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          RUNTIME_API_PREVIEW_REPOSITORY="oci://ghcr.io/${REPO_OWNER}/helm-charts"
 
-          echo "Updating openhands runtime-api dependency to ${RUNTIME_API_PREVIEW}"
+          echo "Updating openhands runtime-api dependency to ${RUNTIME_API_PREVIEW} from ${RUNTIME_API_PREVIEW_REPOSITORY}"
           yq -i "(.dependencies[] | select(.name == \"runtime-api\")).version = \"${RUNTIME_API_PREVIEW}\"" charts/openhands/Chart.yaml
+          yq -i "(.dependencies[] | select(.name == \"runtime-api\")).repository = \"${RUNTIME_API_PREVIEW_REPOSITORY}\"" charts/openhands/Chart.yaml
 
       - name: Update automation dependency version for openhands
         if: matrix.chart.name == 'openhands' && needs.detect-changes.outputs.automation == 'true'
diff --git a/charts/openhands/Chart.lock b/charts/openhands/Chart.lock
index 3688d084..40333950 100644
--- a/charts/openhands/Chart.lock
+++ b/charts/openhands/Chart.lock
@@ -22,7 +22,7 @@ dependencies:
   version: 1.9.0
 - name: runtime-api
   repository: oci://ghcr.io/all-hands-ai/helm-charts
-  version: 0.3.3
+  version: 0.3.4
 - name: automation
   repository: oci://ghcr.io/all-hands-ai/helm-charts
   version: 0.1.8
diff --git a/charts/openhands/Chart.yaml b/charts/openhands/Chart.yaml
index 88389364..377722de 100644
--- a/charts/openhands/Chart.yaml
+++ b/charts/openhands/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 description: OpenHands is an AI-driven autonomous software engineer
 name: openhands
 appVersion: cloud-1.29.1
-version: 0.7.17
+version: 0.7.18
 maintainers:
   - name: rbren
   - name: xingyao
@@ -38,7 +38,7 @@ dependencies:
     condition: replicated.enabled
   - name: runtime-api
     repository: oci://ghcr.io/all-hands-ai/helm-charts
-    version: 0.3.3
+    version: 0.3.4
     condition: runtime-api.enabled
   - name: automation
     repository: oci://ghcr.io/all-hands-ai/helm-charts
diff --git a/charts/runtime-api/Chart.yaml b/charts/runtime-api/Chart.yaml
index b1f54c96..515b191d 100644
--- a/charts/runtime-api/Chart.yaml
+++ b/charts/runtime-api/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: runtime-api
 description: A Helm chart for the FastAPI application
-version: 0.3.3 # Change this to trigger a new helm chart version being published
+version: 0.3.4 # Change this to trigger a new helm chart version being published
 appVersion: "1.0.0"
 dependencies:
   - name: postgresql
diff --git a/charts/runtime-api/templates/_env.yaml b/charts/runtime-api/templates/_env.yaml
index ef68b5be..a8f16a05 100644
--- a/charts/runtime-api/templates/_env.yaml
+++ b/charts/runtime-api/templates/_env.yaml
@@ -3,6 +3,8 @@
 - name: {{ $key }}
   value: {{ $value | quote }}
 {{- end }}
+- name: RUNTIME_IDLE_SECONDS
+  value: {{ .Values.cleanup.idle_seconds | default 1200 | quote }}
 - name: RUNTIME_DEAD_SECONDS
   value: {{ printf "%.0f" .Values.cleanup.dead_seconds | quote }}
 {{- if .Values.runtimeInSameCluster }}
diff --git a/charts/runtime-api/templates/cleanup-cronjob.yaml b/charts/runtime-api/templates/cleanup-cronjob.yaml
index e035b301..edc59a9d 100644
--- a/charts/runtime-api/templates/cleanup-cronjob.yaml
+++ b/charts/runtime-api/templates/cleanup-cronjob.yaml
@@ -39,8 +39,6 @@ spec:
                 value: {{ .Values.database.poolSize.cronjobs | default 2 | quote }}
               - name: DB_MAX_OVERFLOW
                 value: {{ .Values.database.maxOverflow.cronjobs | default 5 | quote }}
-              - name: RUNTIME_IDLE_SECONDS
-                value: {{ .Values.cleanup.idle_seconds | default 1800 | quote }}
             {{- if .Values.ingressBase.enabled }}
             volumeMounts:
               - name: ingress-base-config