diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index 656d872..6a6e307 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -46,6 +46,9 @@ jobs:
       - name: Install Helm
         uses: azure/setup-helm@v4
 
+      - name: Run base chart templating with default values
+        run: helm template ci-test charts/azimuth-llm
+
       - name: Set up chart testing
         uses: helm/chart-testing-action@v2
 
@@ -62,13 +65,9 @@ jobs:
       # we need to pull these published images and load them into the kind cluster
       # with the tag correct tag.
       - name: Load tagged container images into kind cluster
-        run: ./kind-images.sh ${{ github.event.pull_request.head.sha }} ${{ env.CLUSTER_NAME }}
+        run: ./kind-images.sh $(git rev-parse --short ${{ github.event.pull_request.head.sha }}) ${{ env.CLUSTER_NAME }}
         working-directory: web-apps
 
-      - name: Add Helm repos for dependencies
-        run: |
-          helm repo add stakater https://stakater.github.io/stakater-charts
-
       # https://github.com/helm/charts/blob/master/test/README.md#providing-custom-test-values
       # Each chart/ci/*-values.yaml file will be treated as a separate test case with it's
       # own helm install/test process.
diff --git a/charts/azimuth-llm/templates/test/end-to-end.yml b/charts/azimuth-llm/templates/test/end-to-end.yml
index a4a5991..e94d4d2 100644
--- a/charts/azimuth-llm/templates/test/end-to-end.yml
+++ b/charts/azimuth-llm/templates/test/end-to-end.yml
@@ -10,7 +10,10 @@ spec:
     spec:
       containers:
       - name: gradio-client-test
-        image: ghcr.io/stackhpc/azimuth-llm-chat-interface:{{ .Values.ui.image.version }}
+        {{- /*
+          Use the chat image since we know this contains the gradio_client package
+        */}}
+        image: {{ printf "ghcr.io/stackhpc/azimuth-llm-chat-ui:%s" (default .Chart.AppVersion .Values.ui.image.tag) }}
         imagePullPolicy: IfNotPresent
         command:
         - python