diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml
index e99aacd7..dead851d 100644
--- a/charts/shipyard/values.yaml
+++ b/charts/shipyard/values.yaml
@@ -22,20 +22,18 @@ labels:
   node_selector_key: ucp-control-plane
   node_selector_value: enabled
 
-# Note that this set of images are tested against a pinned version of
-# OpenStack Helm Toolkit (commit_id: 757378fb7f3872961303fd4e4dfb74b7cdfaf194)
 images:
   tags:
     airflow: quay.io/attcomdev/airflow:latest
     shipyard: quay.io/attcomdev/shipyard:latest
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     shipyard_db_init: docker.io/postgres:9.5
     shipyard_db_sync: quay.io/attcomdev/shipyard:latest
     airflow_db_init: docker.io/postgres:9.5
     airflow_db_sync: quay.io/attcomdev/airflow:latest
-    ks_user: docker.io/openstackhelm/heat:newton
-    ks_service: docker.io/openstackhelm/heat:newton
-    ks_endpoints: docker.io/openstackhelm/heat:newton
+    ks_user: docker.io/openstackhelm/heat:ocata
+    ks_service: docker.io/openstackhelm/heat:ocata
+    ks_endpoints: docker.io/openstackhelm/heat:ocata
   pull_policy: "IfNotPresent"
 
 release_group: null