diff --git a/2025-eScience/infrastructure/dry-run/config.toml b/2025-eScience/infrastructure/dry-run/config.toml
index 6ca7b51..a90109e 100644
--- a/2025-eScience/infrastructure/dry-run/config.toml
+++ b/2025-eScience/infrastructure/dry-run/config.toml
@@ -39,7 +39,7 @@ use_nginx = true
 hub_container_image = "jupyterhub/k8s-hub"
 hub_container_tag = "4.2.0"
 spawner_container_image = "ghcr.io/llnl/reproducible-benchmarking-spawn"
-spawner_container_tag = "escience-2025"
+spawner_container_tag = "hpcic-2025"
 spawner_image_entrypoint = "/entrypoint.sh 32"
 cpu_min = "32"
 cpu_max = "32"
@@ -47,7 +47,7 @@ mem_min = "64G"
 mem_max = "64G"
 provide_extra_shmem = true
 init_container_image = "ghcr.io/llnl/reproducible-benchmarking-init"
-init_container_tag = "escience-2025"
+init_container_tag = "hpcic-2025"
 init_image_entrypoint = "/entrypoint.sh"
 
 [aws."utility scripts"]
diff --git a/2025-eScience/infrastructure/dry-run/helm-config.yaml b/2025-eScience/infrastructure/dry-run/helm-config.yaml
index 987a48c..d445eb3 100644
--- a/2025-eScience/infrastructure/dry-run/helm-config.yaml
+++ b/2025-eScience/infrastructure/dry-run/helm-config.yaml
@@ -64,7 +64,7 @@ singleuser:
   #   5) Copy any necessary local scripts or files and ensure proper permissions
   image:
     name: ghcr.io/llnl/reproducible-benchmarking-spawn
-    tag: "escience-2025"
+    tag: "hpcic-2025"
     pullPolicy: Always
   # Specify the minimum (i.e., guarantee) and maximum (i.e., limit) amount of resources per user
   cpu:
@@ -106,7 +106,7 @@ singleuser:
   #    chown -R 1000 /home/jovyan
   initContainers:
     - name: init-tutorial-service
-      image: ghcr.io/llnl/reproducible-benchmarking-init:escience-2025
+      image: ghcr.io/llnl/reproducible-benchmarking-init:hpcic-2025
       command: ["/entrypoint.sh"]
       imagePullPolicy: Always
   storage:
diff --git a/2025-eScience/infrastructure/production/config.toml b/2025-eScience/infrastructure/production/config.toml
index 7243c94..abf4230 100644
--- a/2025-eScience/infrastructure/production/config.toml
+++ b/2025-eScience/infrastructure/production/config.toml
@@ -39,7 +39,7 @@ use_nginx = true
 hub_container_image = "jupyterhub/k8s-hub"
 hub_container_tag = "4.2.0"
 spawner_container_image = "ghcr.io/llnl/reproducible-benchmarking-spawn"
-spawner_container_tag = "escience-2025"
+spawner_container_tag = "hpcic-2025"
 spawner_image_entrypoint = "/entrypoint.sh 32"
 cpu_min = "32"
 cpu_max = "32"
@@ -47,7 +47,7 @@ mem_min = "64G"
 mem_max = "64G"
 provide_extra_shmem = true
 init_container_image = "ghcr.io/llnl/reproducible-benchmarking-init"
-init_container_tag = "escience-2025"
+init_container_tag = "hpcic-2025"
 init_image_entrypoint = "/entrypoint.sh"
 
 [aws."utility scripts"]
diff --git a/2025-eScience/infrastructure/production/helm-config.yaml b/2025-eScience/infrastructure/production/helm-config.yaml
index 6fecb7a..a373732 100644
--- a/2025-eScience/infrastructure/production/helm-config.yaml
+++ b/2025-eScience/infrastructure/production/helm-config.yaml
@@ -64,7 +64,7 @@ singleuser:
   #   5) Copy any necessary local scripts or files and ensure proper permissions
   image:
     name: ghcr.io/llnl/reproducible-benchmarking-spawn
-    tag: "escience-2025"
+    tag: "hpcic-2025"
     pullPolicy: Always
   # Specify the minimum (i.e., guarantee) and maximum (i.e., limit) amount of resources per user
   cpu:
@@ -106,7 +106,7 @@ singleuser:
   #    chown -R 1000 /home/jovyan
   initContainers:
     - name: init-tutorial-service
-      image: ghcr.io/llnl/reproducible-benchmarking-init:escience-2025
+      image: ghcr.io/llnl/reproducible-benchmarking-init:hpcic-2025
       command: ["/entrypoint.sh"]
       imagePullPolicy: Always
   storage: