diff --git a/bitnami/mysql/5/Dockerfile b/bitnami/mysql/5/Dockerfile
index 1bee2d9829ef..65e3bf3dbc17 100644
--- a/bitnami/mysql/5/Dockerfile
+++ b/bitnami/mysql/5/Dockerfile
@@ -1,15 +1,15 @@
-FROM bitnami/minideb-extras:jessie-r19
+FROM bitnami/minideb-extras:jessie-r22
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
-RUN install_packages libaio1 libc6 libgcc1 libncurses5 libnuma1 libsasl2-2 libssl1.0.0 libstdc++6 libtinfo5 zlib1g
-RUN bitnami-pkg unpack mysql-5.7.19-0 --checksum e58169bd914a57bf1d0208607e25e3532a2526110990bb82ed53c70c20e27a12
+RUN install_packages libaio1 libnuma1 libssl1.0.0 zlib1g
+RUN bitnami-pkg unpack mysql-5.7.20-0 --checksum a49ce3e50f997c4aba932266d2b42dde6b382545b74f3dbe87cdd594ae21d2e7
 
 COPY rootfs /
 
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="mysql" \
-    BITNAMI_IMAGE_VERSION="5.7.19-r0" \
+    BITNAMI_IMAGE_VERSION="5.7.20-r0" \
     MYSQL_DATABASE="" \
     MYSQL_MASTER_HOST="" \
     MYSQL_MASTER_PORT_NUMBER="" \
diff --git a/bitnami/mysql/5/rootfs/app-entrypoint.sh b/bitnami/mysql/5/rootfs/app-entrypoint.sh
index 19fb46150065..d524c264693f 100755
--- a/bitnami/mysql/5/rootfs/app-entrypoint.sh
+++ b/bitnami/mysql/5/rootfs/app-entrypoint.sh
@@ -4,7 +4,6 @@
 . /opt/bitnami/base/helpers
 
 print_welcome_page
-check_for_updates &
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
   . /init.sh
diff --git a/bitnami/mysql/circle.yml b/bitnami/mysql/circle.yml
index f18edaf985cb..187f61e78342 100644
--- a/bitnami/mysql/circle.yml
+++ b/bitnami/mysql/circle.yml
@@ -16,6 +16,10 @@ jobs:
       - checkout
       - setup_remote_docker:
           version: 17.06.0-ce
+      - run:
+          name: Upgrade system packages (workaround - https://github.com/docker-library/docker/issues/72)
+          command: |
+            apk upgrade --no-cache
       - run:
           name: Install dependencies
           command: |
@@ -47,8 +51,13 @@ jobs:
               curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-development-image.sh | bash -
             fi
 
-deployment:
-  release:
-    tag: /^[0-9].*-r[0-9]+$/
-    commands:
-      - echo "workaround make tags run in 2.0 - https://discuss.circleci.com/t/git-tag-deploys-in-2-0/9493/8"
+workflows:
+  version: 2
+  build-and-deploy:
+    jobs:
+      - build:
+          filters:
+            branches:
+              only: /.*/
+            tags:
+              only: /^[0-9].*-r[0-9]+$/