diff --git a/Dockerfile b/Dockerfile
index 5a6e8ac..4501cd2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,17 @@ ARG PIHOLE_ARCH
 ENV PIHOLE_ARCH "${PIHOLE_ARCH}"
 ARG PIHOLE_TAG
 ENV PIHOLE_TAG "${PIHOLE_TAG}"
+ARG CORE_VERSION
+ENV CORE_VERSION "${CORE_VERSION}"
+ARG WEB_VERSION
+ENV WEB_VERSION "${WEB_VERSION}"
+ARG FTL_VERSION
+ENV FTL_VERSION "${FTL_VERSION}"
 ARG S6_ARCH
 ARG S6_VERSION
 ENV S6OVERLAY_RELEASE "https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz"
 
 COPY install.sh /usr/local/bin/install.sh
-COPY VERSIONS /etc/pi-hole-versions
 ENV PIHOLE_INSTALL /etc/.pihole/automated\ install/basic-install.sh
 
 RUN bash -ex install.sh 2>&1 && \
diff --git a/VERSIONS b/VERSIONS
deleted file mode 100644
index 4af1363..0000000
--- a/VERSIONS
+++ /dev/null
@@ -1,3 +0,0 @@
-CORE_VERSION=v5.4
-WEB_VERSION=v5.6
-FTL_VERSION=v5.9
diff --git a/build.yml b/build.yml
index 96fe62e..9b1d61a 100644
--- a/build.yml
+++ b/build.yml
@@ -4,6 +4,9 @@ version: "3.7"
 x-common-args: &common-args
   PIHOLE_VERSION: ${PIHOLE_VERSION}
   PIHOLE_TAG: ${PIHOLE_TAG}
+  CORE_VERSION: ${CORE_VERSION}
+  WEB_VERSION: ${WEB_VERSION}
+  FTL_VERSION: ${FTL_VERSION}
   NAME: pihole/pihole
   MAINTAINER: adam@diginc.us
   S6_VERSION: v2.1.0.2
diff --git a/gh-actions-test.sh b/gh-actions-test.sh
index 6d603ae..1bb7c5b 100755
--- a/gh-actions-test.sh
+++ b/gh-actions-test.sh
@@ -26,6 +26,9 @@ docker run --rm \
     --env ARCH_IMAGE="${ARCH_IMAGE}" \
     --env DEBIAN_VERSION="${DEBIAN_VERSION}" \
     --env GIT_TAG="${GIT_TAG}" \
+    --env CORE_VERSION="${CORE_VERSION}" \
+    --env WEB_VERSION="${WEB_VERSION}" \
+    --env FTL_VERSION="${FTL_VERSION}" \
     ${enter} image_pipenv
 
 mkdir -p ".gh-workspace/${DEBIAN_VERSION}/"
diff --git a/install.sh b/install.sh
index e608807..a3daeab 100644
--- a/install.sh
+++ b/install.sh
@@ -3,31 +3,10 @@
 mkdir -p /etc/pihole/
 mkdir -p /var/run/pihole
 
-# Source versions file
-source /etc/pi-hole-versions
-
-CORE_REMOTE_REPO=https://github.com/pi-hole/pi-hole
 CORE_LOCAL_REPO=/etc/.pihole
-WEB_REMOTE_REPO=https://github.com/pi-hole/adminLTE
 WEB_LOCAL_REPO=/var/www/html/admin
-setupVars=/etc/pihole/setupVars.conf
 
-fetch_release_metadata() {
-    local directory="$1"
-    local version="$2"
-    pushd "$directory"
-    git fetch -t
-    git remote set-branches origin '*'
-    git fetch --depth 10
-    #if version number begins with a v, it's a version number
-    if [[ $version == v* ]]; then
-        git checkout master
-        git reset --hard "$version"
-    else # else treat it as a branch
-        git checkout "$version"
-    fi
-    popd
-}
+setupVars=/etc/pihole/setupVars.conf
 
 apt-get update
 apt-get install --no-install-recommends -y curl procps ca-certificates git
@@ -38,16 +17,6 @@ ln -s `which echo` /usr/local/bin/whiptail
 curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
 mv /init /s6-init
 
-# clone the remote repos to their local destinations
-git clone "${CORE_REMOTE_REPO}" "${CORE_LOCAL_REPO}"
-fetch_release_metadata "${CORE_LOCAL_REPO}" "${CORE_VERSION}"
-
-git clone "${WEB_REMOTE_REPO}" "${WEB_LOCAL_REPO}"
-fetch_release_metadata "${WEB_LOCAL_REPO}" "${WEB_VERSION}"
-
-# FTL uses a local version file for the installer to determine which version we want
-echo "${FTL_VERSION}" > /etc/pihole/ftlbranch
-
 # Preseed variables to assist with using --unattended install
 {
   echo "PIHOLE_INTERFACE=eth0"
@@ -67,12 +36,22 @@ export PIHOLE_SKIP_OS_CHECK=true
 
 ln -s /bin/true /usr/local/bin/service
 # Run the installer in unattended mode using the preseeded variables above and --reconfigure so that local repos are not updated
-bash -ex "./${PIHOLE_INSTALL}" --unattended --reconfigure
+curl -sSL https://install.pi-hole.net | bash -sex -- --unattended
+
 rm /usr/local/bin/service
 
 # IPv6 support for nc openbsd better than traditional
 apt-get install -y --force-yes netcat-openbsd
 
+# Source the Pi-hole install script to make use of the fetch_checkout_pull_branch functions as calling pihole checkout directly does not work hre
+PH_TEST="true" . "${PIHOLE_INSTALL}"
+
+[ -n "${CORE_VERSION}" ] && fetch_checkout_pull_branch ${CORE_LOCAL_REPO} "${CORE_VERSION}" && RELOAD=1
+[ -n "${WEB_VERSION}" ] && fetch_checkout_pull_branch ${WEB_LOCAL_REPO} "${WEB_VERSION}" # No need to reload when checking out a new web branch
+[ -n "${FTL_VERSION}" ] && echo "${FTL_VERSION}" > /etc/pihole/ftlbranch && RELOAD=1
+
+[ -n "${RELOAD}" ] && bash -ex "${PIHOLE_INSTALL}" --unattended --reconfigure
+
 sed -i 's/readonly //g' /opt/pihole/webpage.sh
 sed -i '/^WEBPASSWORD/d' /etc/pihole/setupVars.conf