diff --git a/heat/Chart.yaml b/heat/Chart.yaml
index 9eaa83f95d..ebb0c7a400 100644
--- a/heat/Chart.yaml
+++ b/heat/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Heat
 name: heat
-version: 0.2.10
+version: 0.2.11
 home: https://docs.openstack.org/heat/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
 sources:
diff --git a/heat/values_overrides/ocata-ubuntu_xenial.yaml b/heat/values_overrides/ocata-ubuntu_xenial.yaml
deleted file mode 100644
index 0f4e7a07b0..0000000000
--- a/heat/values_overrides/ocata-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-heat:
-  images:
-    tags:
-      bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      db_drop: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      ks_user: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      ks_service: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      ks_endpoints: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      heat_db_sync: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      heat_api: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      heat_cfn: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      heat_cloudwatch: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      heat_engine: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      heat_engine_cleaner: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-      heat_purge_deleted: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-...
diff --git a/heat/values_overrides/pike-ubuntu_xenial.yaml b/heat/values_overrides/pike-ubuntu_xenial.yaml
deleted file mode 100644
index a193013725..0000000000
--- a/heat/values_overrides/pike-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    heat_db_sync: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    heat_api: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    heat_cfn: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    heat_engine: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    heat_engine_cleaner: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    heat_purge_deleted: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-...
diff --git a/heat/values_overrides/queens-ubuntu_xenial.yaml b/heat/values_overrides/queens-ubuntu_xenial.yaml
deleted file mode 100644
index 6637feeeaa..0000000000
--- a/heat/values_overrides/queens-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    heat_db_sync: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    heat_api: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    heat_cfn: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    heat_engine: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    heat_engine_cleaner: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    heat_purge_deleted: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-...
diff --git a/heat/values_overrides/rocky-opensuse_15.yaml b/heat/values_overrides/rocky-opensuse_15.yaml
deleted file mode 100644
index 9cc287cd42..0000000000
--- a/heat/values_overrides/rocky-opensuse_15.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    heat_db_sync: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    heat_api: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    heat_cfn: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    heat_engine: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    heat_engine_cleaner: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    heat_purge_deleted: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-...
diff --git a/heat/values_overrides/rocky-ubuntu_bionic.yaml b/heat/values_overrides/rocky-ubuntu_bionic.yaml
deleted file mode 100644
index 81ec0fadc1..0000000000
--- a/heat/values_overrides/rocky-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    heat_db_sync: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    heat_api: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    heat_cfn: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    heat_engine: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    heat_engine_cleaner: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    heat_purge_deleted: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-...
diff --git a/heat/values_overrides/rocky-ubuntu_xenial.yaml b/heat/values_overrides/rocky-ubuntu_xenial.yaml
deleted file mode 100644
index 781866e07e..0000000000
--- a/heat/values_overrides/rocky-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    heat_db_sync: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    heat_api: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    heat_cfn: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    heat_engine: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    heat_engine_cleaner: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    heat_purge_deleted: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-...
diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml
index 0162568239..af00406f35 100644
--- a/releasenotes/notes/heat.yaml
+++ b/releasenotes/notes/heat.yaml
@@ -17,4 +17,5 @@ heat:
   - 0.2.8 Update htk requirements repo
   - 0.2.9 Enable taint toleration for Openstack services
   - 0.2.10 Updated naming for subchart compatibility
+  - 0.2.11 Remove old releases values override in heat
 ...