diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 507ec28dd5..04925bb595 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.22
+version: 0.2.23
 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/templates/bin/_fernet-manage.py.tpl b/keystone/templates/bin/_fernet-manage.py.tpl
index 804d7695ec..b796796541 100644
--- a/keystone/templates/bin/_fernet-manage.py.tpl
+++ b/keystone/templates/bin/_fernet-manage.py.tpl
@@ -22,7 +22,6 @@ import logging
 import os
 import pwd
 import re
-import six
 import subprocess  #nosec
 import sys
 import time
@@ -96,7 +95,7 @@ def read_from_files():
 def get_keys_data():
     keys = read_from_files()
     return dict([(key, base64.b64encode(value.encode()).decode())
-                for (key, value) in six.iteritems(keys)])
+                for (key, value) in keys.items()])
 
 
 def write_to_files(data):
@@ -110,7 +109,7 @@ def write_to_files(data):
         gid = grp.getgrnam(KEYSTONE_GROUP).gr_gid
         os.chown(FERNET_DIR, uid, gid)
 
-    for (key, value) in six.iteritems(data):
+    for (key, value) in data.items():
         with open(FERNET_DIR + key, 'w') as f:
             decoded_value = base64.b64decode(value).decode()
             f.write(decoded_value)
diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index a4502bc3bf..67c669e855 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.2.15
+version: 0.2.16
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/bin/_health-probe.py.tpl b/neutron/templates/bin/_health-probe.py.tpl
index faa9702703..1ba4107edb 100644
--- a/neutron/templates/bin/_health-probe.py.tpl
+++ b/neutron/templates/bin/_health-probe.py.tpl
@@ -36,7 +36,7 @@ Usage example for Neutron metadata agent:
 """
 
 import httplib2
-from six.moves import http_client as httplib
+from http import client as httplib
 import json
 import os
 import psutil
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index 13ed5ed0bc..dbd09cf543 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -38,4 +38,5 @@ keystone:
   - 0.2.20 Enable taint toleration for Openstack services
   - 0.2.21 Updated naming for subchart compatibility
   - 0.2.22 Remove older values overrides
+  - 0.2.23 Remove usage of six
 ...
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 31afabd186..1929ee7cf3 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -29,4 +29,5 @@ neutron:
   - 0.2.13 Enable taint toleration for Openstack services
   - 0.2.14 Migrate IP from bridge for auto_bridge_add
   - 0.2.15 Remove unsupported values overrides
+  - 0.2.16 Remove usage of six
 ...