diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 7fbba9e44a..4cc68ec9bc 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.2.16
+version: 0.2.17
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 54d23c373e..8031bceabd 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -35,20 +35,20 @@ helm3_hook: true
 
 images:
   tags:
-    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    bootstrap: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
     test: docker.io/xrally/xrally-openstack:2.0.0
-    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    keystone_db_sync: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
-    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    db_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    keystone_db_sync: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal
+    db_drop: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
     rabbit_init: docker.io/rabbitmq:3.7-management
-    keystone_fernet_setup: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
-    keystone_fernet_rotate: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
-    keystone_credential_setup: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
-    keystone_credential_rotate: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
-    keystone_credential_cleanup: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    keystone_api: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
-    keystone_domain_manage: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
+    keystone_fernet_setup: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal
+    keystone_fernet_rotate: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal
+    keystone_credential_setup: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal
+    keystone_credential_rotate: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal
+    keystone_credential_cleanup: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
+    keystone_api: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal
+    keystone_domain_manage: docker.io/openstackhelm/keystone:wallaby-ubuntu_focal
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index 0e86b3ae41..f8c78bc5a2 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -32,4 +32,5 @@ keystone:
   - 0.2.14 Update htk requirements repo
   - 0.2.15 Reduce log chattiness
   - 0.2.16 Remove extra fsGroup
+  - 0.2.17 Update default image references
 ...