diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3e2beac..cb91621 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -223,15 +223,15 @@ jobs:
           name: Launch bind container
           command: docker run --name bind -d --net testnet sameersbn/bind:${CIRCLE_TAG:-latest}
       - run:
-          name: Wait for container bootup
+          name: Wait for bootup
           command: sleep 15
       - run:
           name: Container info
-          command: docker ps -a
+          command: docker ps
       - run:
           name: Test image
           command: |
-            docker run --rm --net testnet sameersbn/bind:${CIRCLE_TAG:-latest} host www.google.com bind
+              docker run --rm --net testnet sameersbn/bind:${CIRCLE_TAG:-latest} host www.google.com bind
 
   publish-dockerhub:
     executor: docker/machine
@@ -281,7 +281,7 @@ workflows:
     jobs:
       - shellcheck/check:
           name: shellcheck
-          ignore: SC2086,SC2181
+          ignore: SC2086,SC2181,SC2124
           filters:
             tags:
               only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
diff --git a/Dockerfile b/Dockerfile
index 94679b3..fab5aab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-FROM ubuntu:bionic-20200403 AS add-apt-repositories
+FROM ubuntu:focal-20200423 AS add-apt-repositories
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg \
  && apt-key adv --fetch-keys http://www.webmin.com/jcameron-key.asc \
  && echo "deb http://download.webmin.com/download/repository sarge contrib" >> /etc/apt/sources.list
 
-FROM ubuntu:bionic-20200403
+FROM ubuntu:focal-20200423
 
 LABEL maintainer="sameer@damagehead.com"
 
 ENV BIND_USER=bind \
-    BIND_VERSION=9.11.3 \
+    BIND_VERSION=9.16.1 \
     WEBMIN_VERSION=1.941 \
     DATA_DIR=/data
 
diff --git a/README.md b/README.md
index 6d850b1..e8b731d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Circle CI](https://circleci.com/gh/sameersbn/docker-bind.svg?style=shield)](https://circleci.com/gh/sameersbn/docker-bind) [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/bind/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/bind)
 
-# sameersbn/bind:9.11.3-20200507
+# sameersbn/bind:9.16.1-20200524
 
 - [Introduction](#introduction)
   - [Contributing](#contributing)
@@ -49,7 +49,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/bind)
 
 ```bash
-docker pull sameersbn/bind:9.11.3-20200507
+docker pull sameersbn/bind:9.16.1-20200524
 ```
 
 Alternatively you can build the image yourself.
@@ -66,7 +66,7 @@ Start BIND using:
 docker run --name bind -d --restart=always \
   --publish 53:53/tcp --publish 53:53/udp --publish 10000:10000/tcp \
   --volume /srv/docker/bind:/data \
-  sameersbn/bind:9.11.3-20200507
+  sameersbn/bind:9.16.1-20200524
 ```
 
 *Alternatively, you can use the sample [docker-compose.yml](docker-compose.yml) file to start the container using [Docker Compose](https://docs.docker.com/compose/)*
@@ -85,7 +85,7 @@ You can customize the launch command of BIND server by specifying arguments to `
 docker run --name bind -it --rm \
   --publish 53:53/tcp --publish 53:53/udp --publish 10000:10000/tcp \
   --volume /srv/docker/bind:/data \
-  sameersbn/bind:9.11.3-20200507 -h
+  sameersbn/bind:9.16.1-20200524 -h
 ```
 
 ## Persistence
@@ -124,7 +124,7 @@ To upgrade to newer releases:
   1. Download the updated Docker image:
 
   ```bash
-  docker pull sameersbn/bind:9.11.3-20200507
+  docker pull sameersbn/bind:9.16.1-20200524
   ```
 
   2. Stop the currently running image:
@@ -144,7 +144,7 @@ To upgrade to newer releases:
   ```bash
   docker run -name bind -d \
     [OPTIONS] \
-    sameersbn/bind:9.11.3-20200507
+    sameersbn/bind:9.16.1-20200524
   ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 34ecb97..42643ff 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.11.3-20200507
+9.16.1-20200524
diff --git a/docker-compose.yml b/docker-compose.yml
index e8dd261..c44872e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   bind:
     restart: always
-    image: sameersbn/bind:9.11.3-20200507
+    image: sameersbn/bind:9.16.1-20200524
     ports:
     - "53:53/udp"
     - "53:53/tcp"