diff --git a/charts/mysqlclient-utility/templates/bin/_start.sh.tpl b/charts/mysqlclient-utility/templates/bin/_start.sh.tpl
index 4defdc00..4026d46d 100644
--- a/charts/mysqlclient-utility/templates/bin/_start.sh.tpl
+++ b/charts/mysqlclient-utility/templates/bin/_start.sh.tpl
@@ -28,7 +28,7 @@ root logger by oslo-rootwrap module, imported in _openstack-utility-rootwrap.tpl
 These lines will get rid of duplicate logs, generated because of the formatter
 attached by oslo-rootwrap.
 */}}
-sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
-sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py
\ No newline at end of file
+sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
+sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
+sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
+sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py
diff --git a/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl b/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl
index 4a1ee1ad..3682d1a7 100644
--- a/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl
+++ b/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 {{/*
 Copyright 2019 The Openstack-Helm Authors.
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/charts/mysqlclient-utility/values.yaml b/charts/mysqlclient-utility/values.yaml
index 06270863..10be6d08 100644
--- a/charts/mysqlclient-utility/values.yaml
+++ b/charts/mysqlclient-utility/values.yaml
@@ -24,7 +24,7 @@ release_group: null
 
 images:
   tags:
-    mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest'
+    mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic'
     image_repo_sync: docker.io/docker:18.09.02
   pull_policy: IfNotPresent
   local_registry:
diff --git a/images/mysqlclient-utility/Dockerfile.ubuntu_xenial b/images/mysqlclient-utility/Dockerfile.ubuntu_bionic
similarity index 86%
rename from images/mysqlclient-utility/Dockerfile.ubuntu_xenial
rename to images/mysqlclient-utility/Dockerfile.ubuntu_bionic
index ed6cd21e..56d3eb41 100644
--- a/images/mysqlclient-utility/Dockerfile.ubuntu_xenial
+++ b/images/mysqlclient-utility/Dockerfile.ubuntu_bionic
@@ -1,4 +1,4 @@
-ARG FROM=ubuntu:16.04
+ARG FROM=docker.io/ubuntu:bionic
 FROM ${FROM}
 
 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@@ -12,24 +12,21 @@ RUN set -xe && \
     sed -i '/nobody/d' /etc/passwd && \
     echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd && \
     apt-get update && \
-    apt-get dist-upgrade -y && \
     apt-get install -y \
       bash \
       moreutils \
       mysql-client \
-      python-oslo.rootwrap \
+      python3 \
+      python3-pip \
       python3-oslo.rootwrap \
-      screen \
       sudo \
-      rsyslog \
-      vim && \
+      rsyslog && \
     sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf && \
     apt-get clean -y && \
     rm -rf \
       /tmp/* \
       /var/cache/debconf/* \
       /var/lib/apt/lists/* \
-      /var/log/* \
       /var/tmp/*
 
 CMD ["/bin/bash"]
diff --git a/zuul.d/mysqlclient-utility.yaml b/zuul.d/mysqlclient-utility.yaml
index a49841ca..cb19c4ec 100644
--- a/zuul.d/mysqlclient-utility.yaml
+++ b/zuul.d/mysqlclient-utility.yaml
@@ -17,7 +17,7 @@
     parent: &parent airship-porthole-images
     vars:
       image_name: &image_name porthole-mysqlclient-utility
-      distro_suffix: &distro_suffix ubuntu_xenial
+      distro_suffix: &distro_suffix ubuntu_bionic
     files:
       - ^charts/mysqlclient-utility/.*$
       - ^images/mysqlclient-utility/.*$