diff --git a/.github/workflows/helm-release-manual.yaml b/.github/workflows/helm-release-manual.yaml
new file mode 100644
index 000000000..215437205
--- /dev/null
+++ b/.github/workflows/helm-release-manual.yaml
@@ -0,0 +1,65 @@
+name: Manual Publish Helm Chart
+
+defaults:
+  run:
+    working-directory: deployments/kubernetes/charts/clowder2
+
+on:
+  workflow_dispatch:
+    inputs:
+      force:
+        description: "Force push the chart even if it already exists (true/false)"
+        type: boolean
+        default: true
+
+env:
+  MAIN_REPO: clowder-framework/clowder2
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Helm Repositories
+        run: |
+          helm repo add bitnami-legacy https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
+          helm repo add ncsa https://opensource.ncsa.illinois.edu/charts
+          helm repo update
+          helm dep update
+
+      - name: Determine Chart Version & Changelog
+        id: release_info
+        run: |
+          version="$(awk '/^version:/ { print $2 }' Chart.yaml)"
+          changelog="$(sed -e "1,/^### ${version}/d" -e "/^###/,\$d" -e '/^$/d' README.md)"
+          changelog="${changelog//'%'/'%25'}"
+          changelog="${changelog//$'\n'/'%0A'}"
+          changelog="${changelog//$'\r'/'%0D'}"
+          echo "version=${version}" >> $GITHUB_ENV
+          echo "changelog=${changelog}" >> $GITHUB_ENV
+          echo "version: ${version}"
+          echo "changelog: ${changelog}"
+
+      - name: Debug GitHub Metadata
+        run: |
+          echo "Manual dispatch workflow triggered"
+          echo "github.repository: ${{ github.repository }}"
+          echo "chart version: ${{ env.version }}"
+
+      - name: Validate Helm Template
+        run: helm template .
+
+      - name: Publish Helm Chart to NCSA OpenSource
+        if: github.repository == env.MAIN_REPO
+        uses: bsord/helm-push@v4.1.0
+        with:
+          username: ${{ secrets.HELM_USERNAME }}
+          password: ${{ secrets.HELM_PASSWORD }}
+          registry-url: "https://opensource.ncsa.illinois.edu/charts"
+          chart-folder: "deployments/kubernetes/charts/clowder2"
+          force: ${{ github.event.inputs.force }}
diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
index e1cc696dd..d6804e1ce 100644
--- a/.github/workflows/helm-release.yaml
+++ b/.github/workflows/helm-release.yaml
@@ -16,15 +16,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Get dependencies
         run: |
           helm repo add bitnami-legacy https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-          helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add ncsa https://opensource.ncsa.illinois.edu/charts
+          helm repo update
           helm dep update
 
       - name: Get release info
diff --git a/deployments/kubernetes/charts/clowder2/Chart.lock b/deployments/kubernetes/charts/clowder2/Chart.lock
index d675f46bd..f1ba6cf72 100644
--- a/deployments/kubernetes/charts/clowder2/Chart.lock
+++ b/deployments/kubernetes/charts/clowder2/Chart.lock
@@ -15,4 +15,4 @@ dependencies:
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami/
   version: 13.4.1
 digest: sha256:21d18d2cca8db612841c7d9ee1bade697171d353524ed5cab6f24c91cc774e2f
-generated: "2025-11-13T15:27:27.006227-06:00"
+generated: "2025-11-14T15:11:06.914559-06:00"
diff --git a/deployments/kubernetes/charts/clowder2/Chart.yaml b/deployments/kubernetes/charts/clowder2/Chart.yaml
index bf986de82..71901ebd7 100644
--- a/deployments/kubernetes/charts/clowder2/Chart.yaml
+++ b/deployments/kubernetes/charts/clowder2/Chart.yaml
@@ -13,7 +13,7 @@ description: >
 # 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.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.9.3
+version: 1.9.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/deployments/kubernetes/charts/clowder2/values.yaml b/deployments/kubernetes/charts/clowder2/values.yaml
index ba4a709b5..d02adf3da 100644
--- a/deployments/kubernetes/charts/clowder2/values.yaml
+++ b/deployments/kubernetes/charts/clowder2/values.yaml
@@ -80,6 +80,10 @@ geoserver:
 # MINIO
 # ----------------------------------------------------------------------
 minio:
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/minio
+    tag: "2023.12.23"
   enabled: true
 
   # login to minio
@@ -130,6 +134,10 @@ minio:
 mongodb:
   # either mongodb is installed as part of this chart, or you need to
   # specify the mongodb uri
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/mongodb
+    tag: "5.0.10"
   enabled: true
   #uri: mongobd://server:27017/database
   database: clowder2
@@ -150,6 +158,10 @@ mongodb:
 # RABBITMQ
 # ----------------------------------------------------------------------
 rabbitmq:
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/rabbitmq
+    tag: "3.10.8"
   # either rabbitmq is installed as part of this chart, or you need to
   # specify the rabbitmq uri. If neither is specified rabbitmq will not
   # be used by clowder.
@@ -219,6 +231,10 @@ extractors:
 # ELASTICSEARCH
 # ----------------------------------------------------------------------
 elasticsearch:
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/elasticsearch
+    tag: "8.12.2"
   clusterName: clowder2
 
   master:
@@ -230,11 +246,21 @@ elasticsearch:
        storageClass: csi-cinder-sc-retain
        size: 8Gi
 
+  sysctlImage:
+    enabled: true
+    registry: docker.io
+    repository: bitnamilegacy/os-shell
+    tag: 12-debian-12-r16
+
 # ----------------------------------------------------------------------
 # KEYCLOAK
 # ----------------------------------------------------------------------
 keycloak:
   httpRelativePath: /keycloak/
+  image:
+    registry: docker.io
+    repository: bitnamilegacy/keycloak
+    tag: "20.0.5"
 
   auth:
     adminUser: admin
@@ -249,6 +275,10 @@ keycloak:
     type: ClusterIP
 
   postgresql:
+    image:
+      registry: docker.io
+      repository: bitnamilegacy/postgresql
+      tag: "15.5.0"
     auth:
       username: keycloak
       password: password