diff --git a/Dockerfile_aarch64 b/Dockerfile_aarch64
index d8fc8be..72a28b6 100644
--- a/Dockerfile_aarch64
+++ b/Dockerfile_aarch64
@@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
 ENV FTL_CMD no-daemon
 ENV DNSMASQ_USER root
 
-ENV VERSION v4.2.1
+ENV VERSION v4.2.2
 ENV ARCH aarch64
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.2.1_aarch64"
+LABEL image="pihole/pihole:v4.2.2_aarch64"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 
diff --git a/Dockerfile_amd64 b/Dockerfile_amd64
index 550c859..c9affac 100644
--- a/Dockerfile_amd64
+++ b/Dockerfile_amd64
@@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
 ENV FTL_CMD no-daemon
 ENV DNSMASQ_USER root
 
-ENV VERSION v4.2.1
+ENV VERSION v4.2.2
 ENV ARCH amd64
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.2.1_amd64"
+LABEL image="pihole/pihole:v4.2.2_amd64"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 
diff --git a/Dockerfile_armel b/Dockerfile_armel
index 2e1aa53..fbac05b 100644
--- a/Dockerfile_armel
+++ b/Dockerfile_armel
@@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
 ENV FTL_CMD no-daemon
 ENV DNSMASQ_USER root
 
-ENV VERSION v4.2.1
+ENV VERSION v4.2.2
 ENV ARCH armel
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.2.1_armel"
+LABEL image="pihole/pihole:v4.2.2_armel"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 
diff --git a/Dockerfile_armhf b/Dockerfile_armhf
index 91b6d58..c0dcc42 100644
--- a/Dockerfile_armhf
+++ b/Dockerfile_armhf
@@ -35,11 +35,11 @@ ENV ServerIP 0.0.0.0
 ENV FTL_CMD no-daemon
 ENV DNSMASQ_USER root
 
-ENV VERSION v4.2.1
+ENV VERSION v4.2.2
 ENV ARCH armhf
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.2.1_armhf"
+LABEL image="pihole/pihole:v4.2.2_armhf"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 
diff --git a/VERSION b/VERSION
index 85c71c8..ec151ba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v4.2.1
+v4.2.2
diff --git a/install.sh b/install.sh
index 6e3305e..fd6e309 100755
--- a/install.sh
+++ b/install.sh
@@ -3,9 +3,9 @@
 mkdir -p /etc/pihole/
 mkdir -p /var/run/pihole
 # Production tags with valid web footers
-export CORE_TAG="$(cat /etc/docker-pi-hole-version)"
-# 4.2.1 -> 4.2 since no patch release for web
-export WEB_TAG="${CORE_TAG/.1/}"
+export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
+# Major.Minor for web tag until patches are released for it
+export WEB_VERSION="$(echo ${CORE_VERSION} | grep -Po "v\d+\.\d+")"
 # Only use for pre-production / testing
 export USE_CUSTOM_BRANCHES=false
 
@@ -15,7 +15,8 @@ curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
 mv /init /s6-init
 
 if [[ $USE_CUSTOM_BRANCHES == true ]] ; then
-    CORE_TAG="release/$(cat /etc/docker-pi-hole-version)"
+    CORE_VERSION="hotfix/${CORE_VERSION}"
+    WEB_VERSION="release/v4.2"
 fi
 
 # debconf-apt-progress seems to hang so get rid of it too
@@ -23,7 +24,7 @@ which debconf-apt-progress
 mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress
 
 # Get the install functions
-curl https://raw.githubusercontent.com/pi-hole/pi-hole/${CORE_TAG}/automated%20install/basic-install.sh > "$PIHOLE_INSTALL" 
+curl https://raw.githubusercontent.com/pi-hole/pi-hole/${CORE_VERSION}/automated%20install/basic-install.sh > "$PIHOLE_INSTALL"
 PH_TEST=true . "${PIHOLE_INSTALL}"
 
 # Preseed variables to assist with using --unattended install
@@ -70,19 +71,20 @@ mv "${tmpLog}" /
 if [[ $USE_CUSTOM_BRANCHES == true ]] ; then
     ln -s /bin/true /usr/local/bin/service
     ln -s /bin/true /usr/local/bin/update-rc.d
-    echo y | bash -x pihole checkout core ${CORE_TAG}
-    echo y | bash -x pihole checkout web ${CORE_TAG}
-    echo y | bash -x pihole checkout ftl ${CORE_TAG}
-    # If the v is forgotten: ${CORE_TAG/v/}
+    echo y | bash -x pihole checkout core ${CORE_VERSION}
+    echo y | bash -x pihole checkout web ${WEB_VERSION}
+    echo y | bash -x pihole checkout ftl tweak/overhaul_overTime
+    # If the v is forgotten: ${CORE_VERSION/v/}
     unlink /usr/local/bin/service
     unlink /usr/local/bin/update-rc.d
 else
     # Reset to our tags so version numbers get detected correctly
-    pushd "${PI_HOLE_LOCAL_REPO}"; git reset --hard "${CORE_TAG}"; popd;
-    pushd "${webInterfaceDir}"; git reset --hard "${WEB_TAG}"; popd;
+    pushd "${PI_HOLE_LOCAL_REPO}"; git reset --hard "${CORE_VERSION}"; popd;
+    pushd "${webInterfaceDir}"; git reset --hard "${WEB_VERSION}"; popd;
 fi
 
 sed -i 's/readonly //g' /opt/pihole/webpage.sh
+sed -i '/^WEBPASSWORD/d' /etc/pihole/setupVars.conf
 
 # Replace the call to `updatePiholeFunc` in arg parse with new `unsupportedFunc`
 sed -i $'s/helpFunc() {/unsupportedFunc() {\\\n  echo "Function not supported in Docker images"\\\n  exit 0\\\n}\\\n\\\nhelpFunc() {/g' /usr/local/bin/pihole