diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index af6b82a1..ec62e44c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM jc21/nginx-proxy-manager-base:armhf
+FROM jc21/nginx-proxy-manager-base:latest-armhf
 
 MAINTAINER Jamie Curnow <jc@jc21.com>
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
diff --git a/Jenkinsfile b/Jenkinsfile
index 55d971ee..dd643dab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
   agent any
   environment {
     IMAGE_NAME          = "nginx-proxy-manager"
-    BASE_IMAGE_NAME     = "jc21/nginx-proxy-manager-base:v2"
+    BASE_IMAGE_NAME     = "jc21/nginx-proxy-manager-base:latest"
     TEMP_IMAGE_NAME     = "nginx-proxy-manager-build_${BUILD_NUMBER}"
     TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
     TAG_VERSION         = getPackageVersion()
diff --git a/README.md b/README.md
index 46bb8cd9..e82ce0bb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-2.0.6-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.0.7-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 
diff --git a/doc/DOCKERHUB.md b/doc/DOCKERHUB.md
index a5bd8230..1021eacc 100644
--- a/doc/DOCKERHUB.md
+++ b/doc/DOCKERHUB.md
@@ -2,7 +2,7 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-2.0.6-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.0.7-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 
diff --git a/package.json b/package.json
index e2dd3dcf..9268cb57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nginx-proxy-manager",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "A beautiful interface for creating Nginx endpoints",
   "main": "src/backend/index.js",
   "devDependencies": {