diff --git a/barbican/values_overrides/stein-ubuntu_bionic.yaml b/barbican/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..f8bd66e9ee
--- /dev/null
+++ b/barbican/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,12 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
+    scripted_test: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
+    db_init: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
+    barbican_db_sync: "docker.io/openstackhelm/barbican:stein-ubuntu_bionic"
+    db_drop: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
+    ks_user: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
+    ks_service: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
+    ks_endpoints: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
+    barbican_api: "docker.io/openstackhelm/barbican:stein-ubuntu_bionic"
diff --git a/barbican/values_overrides/stein.yaml b/barbican/values_overrides/stein.yaml
new file mode 100644
index 0000000000..3e278010ec
--- /dev/null
+++ b/barbican/values_overrides/stein.yaml
@@ -0,0 +1,6 @@
+conf:
+  policy:
+    secret_project_match: project_id:%(target.secret.project_id)s
+    secret_creator_user: user_id:%(target.secret.creator_id)s
+    container_project_match: project_id:%(target.container.project_id)s
+    container_creator_user: user_id:%(target.container.creator_id)s