diff --git a/Makefile b/Makefile
index 0a6f9a30f9..ac74a245c6 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ chromium_multi: node_base_multi
 	cd ./NodeChromium && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-chromium:$(TAG_VERSION) .
 
 firefox_multi: node_base_multi
-	cd ./NodeFirefox && docker buildx build -f Dockerfile.arm64 --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-firefox:$(TAG_VERSION) .
+	cd ./NodeFirefox && docker buildx build -f Dockerfile.multi-arch --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/node-firefox:$(TAG_VERSION) .
 
 standalone_firefox_multi: firefox_multi
 	cd ./Standalone && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) --build-arg BASE=node-firefox -t $(NAME)/standalone-firefox:$(TAG_VERSION) .
diff --git a/NodeChromium/Dockerfile.ubuntubad b/NodeChromium/Dockerfile.ubuntubad
deleted file mode 100644
index dc8a4b5884..0000000000
--- a/NodeChromium/Dockerfile.ubuntubad
+++ /dev/null
@@ -1,38 +0,0 @@
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
-# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-FROM local-seleniarm/node-base:4.0.0-rc-2-prerelease-20210930
-LABEL authors=james
-
-USER root
-
-RUN apt-get update && apt-get install curl wget \
-   && curl http://ftp.cn.debian.org/debian/pool/main/c/chromium/chromium_90.0.4430.212-1_arm64.deb -o chromium.deb
-   
-RUN ls chromium.deb && apt install -f ./chromium.deb
-
-# Install Chromium Arm64
-#RUN echo "deb http://http.us.debian.org/debian/ testing non-free contrib main" >> /etc/apt/sources.list \
-#RUN 
-#  && apt-get update -qqy \
-  # && apt-get -qqy install chromium=89.0.4389.82-1 \
-#  && apt-get -qqy install chromium=94.0.4606.54 \
-#  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#=================================
-# Chromium Launch Script Wrapper
-#=================================
-COPY wrap_chromium_binary /opt/bin/wrap_chromium_binary
-RUN /opt/bin/wrap_chromium_binary
-
-#============================================
-# Chromium webdriver
-#============================================
-RUN apt-get update -qqy \
-  && apt-get -qqy install chromium-driver \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-
-USER 1200
-
diff --git a/NodeChromium/generate.sh b/NodeChromium/generate.sh
deleted file mode 100755
index 8267ce323c..0000000000
--- a/NodeChromium/generate.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-VERSION=$1
-NAMESPACE=$2
-AUTHORS=$3
-
-echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
-echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
-echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
-echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
-echo FROM ${NAMESPACE}/node-base:${VERSION} >> ./Dockerfile
-echo LABEL authors="$AUTHORS" >> ./Dockerfile
-echo "" >> ./Dockerfile
-cat ./Dockerfile.txt >> ./Dockerfile
diff --git a/NodeFirefox/Dockerfile.arm64 b/NodeFirefox/Dockerfile.multi-arch
similarity index 100%
rename from NodeFirefox/Dockerfile.arm64
rename to NodeFirefox/Dockerfile.multi-arch
diff --git a/NodeFirefox/README.md b/NodeFirefox/README.md
index 29dd840652..c0b0ef1c64 100644
--- a/NodeFirefox/README.md
+++ b/NodeFirefox/README.md
@@ -1,59 +1,28 @@
-## Building NodeFirefox and StandaloneFirefox for ARM64
+## Building Multi-arch NodeFirefox and StandaloneFirefox
 
-I haven't located a geckdriver binary for Debian, so we'll build it from source. Unfortunately, the build step cannot yet be automated. Trying to run it as part of a docker build or even using docker exec causes the build to fail for reasons unknown to me.
+There are two Dockerfiles in NodeFirefox. `Dockerfile` is from the upstream repository for building the standard, official amd64 images. To build `seleniarm/node-firefox` for arm64 or armv7l (or possibly amd64 as well), we use the `Dockerfile.multi-arch` file.
 
-As a result, I split the build process into various steps:
+The easiest way to build the image is to use `make`. See examples below:
 
-### Step 0
 
-Make sure the local-seleniarm/base:latest and local-seleniarm/node-base:latest have been built using the command that builds all of the other images. If you haven't yet done this, run this from the root of the repository.
+**To build node/firefox for arm64:**
 
 ```
-$ sh build.sh
+$ NAME=local-seleniarm VERSION=4.5.0 BUILD_DATE=$(date '+%Y%m%d') PLATFORMS=linux/arm64 BUILD_ARGS=--load make firefox_multi
 ```
 
-Before proceeding, verify that local-seleniarm/base:latest and local-seleniarm/node-base:latest exist by using `docker image ls`.
+**To build standalone/firefox for arm64:**
 
-
-### Step 1
-
-In Step 1, we'll build the geckodriver. The geckodriver must be built specifically for Debian and specifically for the ARM64 platform, and we'll use an intermediate, throwaway Debian container to automatically setup the build environment by installing all of the needed dependencies. Once the build environment is setup, we'll need to manually run the compile step. To start this process, run the following command from the NodeFirefox working directory:
-
-```
-$ cd NodeFirefox
-$ sh build-step-1.sh   # This installs dependencies and drops you into a container bash shell
-```
-
-Once the dependencies are installed, we'll automatically drop into the container's shell in the `/opt/geckodriver` directory. At this stage, run this command:
-
-```
-$ sh build-geckodriver-arm64.sh
 ```
-
-This uses Rust and cargo to build geckodriver. Afterwards, the script copies the binary to `/media/share` on the host. The script then moves it to the NodeFirefox directory where it will be copied into the NodeFirefox image in the next step.  Once built, exit the container:
-
+$ NAME=local-seleniarm VERSION=4.5.0 BUILD_DATE=$(date '+%Y%m%d') PLATFORMS=linux/arm64 BUILD_ARGS=--load make standalone_firefox_multi
 ```
-$ exit
-```
-
-Before proceeding to the next step, verify the geckodriver binary is inside the NodeFirefox folder.
-
-
-### Step 2
-
-At this stage, we're ready to build both NodeFirefox and StandaloneFirefox. To build these images, run the following command:
-
-```
-$ sh build-step-2.sh
-```
-
-After this completes, we see all of the container images, both with the latest tag and today's date, using `docker image ls`.
 
+NOTE: Replace PLATFORMS environment variable with `linux/arm/v7` for armv7l/armhf, or `linux/amd64` for amd64.
 
-## Running the StandaloneFirefox image
+## Running the standalone image
 
 ```
-$ docker run --rm -it --shm-size 3g -p 4444:4444 -p 5900:5900 -p 7900:7900 local-seleniarm/standalone-firefox:latest
+$ docker run --rm -it --shm-size 2g -p 4444:4444 -p 5900:5900 -p 7900:7900 local-seleniarm/standalone-firefox:latest
 ```
 
 As with the x86_64 images from upstream, this also includes noVNC on port 7900, which we can access via http://localhost:7900
diff --git a/NodeFirefox/build-and-deploy-firefox-multi-arch.sh b/NodeFirefox/build-and-deploy-firefox-multi-arch.sh
deleted file mode 100644
index 000d61717c..0000000000
--- a/NodeFirefox/build-and-deploy-firefox-multi-arch.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-DOCKERDEB=false   # if using Docker Desktop, set to false
-
-
-# if [[ $DOCKERDEB == true ]]
-# then
-#     echo 'Getting geckodriver binary from the Docker Debian VM...'
-#     sh get-geckodriver.sh
-# else
-#     echo 'Getting geckodriver from /media/host...'
-#     cp /media/host/geckodriver .
-# fi
-
-echo 'Generate the Dockerfile.arm64...'
-BUILD_DATE=$(date +'%Y%m%d')
-VERSION=4.1.2
-NAMESPACE=seleniarm
-AUTHORS=SeleniumHQ,sj26,jamesmortensen
-ARCH=linux/arm64,linux/amd64,linux/arm/v7
-
-echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
-echo "# NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED." >> ./Dockerfile
-echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
-echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
-echo FROM ${NAMESPACE}/node-base:${VERSION}-${BUILD_DATE} >> ./Dockerfile
-echo LABEL authors="$AUTHORS" >> ./Dockerfile
-echo "" >> ./Dockerfile
-cat ./Dockerfile.arm64 >> ./Dockerfile
-
-
-
-echo "Building Seleniarm/NodeFirefox:$VERSION-$BUILD_DATE"
-docker buildx build --push --platform $ARCH -f Dockerfile -t $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE .
-#docker tag $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE $NAMESPACE/node-firefox:latest
-
-# Generate the Seleniarm/StandaloneFirefox Dockerfile
-cd ../Standalone && sh generate.sh StandaloneFirefox node-firefox $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS
-cd ../StandaloneFirefox
-
-echo "Building Seleniarm/StandaloneFirefox:$VERSION-$BUILD_DATE"
-docker buildx build --push --platform $ARCH -f Dockerfile -t $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE .
-#docker tag $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE $NAMESPACE/standalone-firefox:latest
-
-
-# Remove geckodriver image and dependencies if build is successful, since it's 4.9GB!
-# docker image rm local-seleniarm/geckodriver-arm64:$VERSION-$BUILD_DATE
diff --git a/README.md b/README.md
index 347156d944..3a489f6e69 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,32 @@
 
 [![seleniumhq-community](https://circleci.com/gh/seleniumhq-community/docker-seleniarm.svg?style=shield)](https://app.circleci.com/pipelines/github/seleniumhq-community/docker-seleniarm)
 
-Selenium container images are available on [Docker Hub](https://hub.docker.com/u/seleniarm):
+This is a fork of [SeleniumHQ/docker-selenium](https://github.com/SeleniumHQ/docker-selenium) for building and maintaining docker-selenium ARM images. This fork is inspired by and based on changes from [sj26/docker-selenium](https://github.com/sj26/docker-selenium) and [rows/docker-selenium](https://github.com/rows/docker-selenium). 
+
+NOTE: If you only need the Intel/amd64 images, please see the official upstream [SeleniumHQ/docker-selenium](https://github.com/SeleniumHQ/docker-selenium) repository for best results.
+
+## Running the ARM Container Images
+
+The primary motivation for creating this fork and updating the images was so I can use the noVNC client on the latest Selenium versions on the Mac M1, an arm64 architecture. To use noVNC, make sure you open port 7900, and visit localhost:7900 in your browser.
+
+The images are also successfully tested on AWS graviton nodes, resulting in better price-performance ratio and lower carbon footprint.
+
+To start the standalone container images, run:
+
+![Chromium](https://raw.githubusercontent.com/alrra/browser-logos/main/src/chromium/chromium_24x24.png) Chromium
+```
+$ docker run --rm -it -p 4444:4444 -p 5900:5900 -p 7900:7900 --shm-size 2g seleniarm/standalone-chromium:latest
+```
+> NOTE: Google does not build Chrome for Linux ARM platforms. Instead, docker-seleniarm uses the open source Chromium browser instead, which _is_ built for ARM.
+
+![Firefox](https://raw.githubusercontent.com/alrra/browser-logos/main/src/firefox/firefox_24x24.png) Firefox
+```
+$ docker run --rm -it -p 4444:4444 -p 5900:5900 -p 7900:7900 --shm-size 2g seleniarm/standalone-firefox:latest
+```
+
+Use your traditional VNC client via port 5900, and noVNC in the browser via port 7900.
+
+The following multi-arch Seleniarm container images are available on [Docker Hub](https://hub.docker.com/u/seleniarm):
 
 - [Standalone Chromium](https://hub.docker.com/r/seleniarm/standalone-chromium)
 - [Standalone Firefox](https://hub.docker.com/r/seleniarm/standalone-firefox)
@@ -10,44 +35,50 @@ Selenium container images are available on [Docker Hub](https://hub.docker.com/u
 - [Node Firefox](https://hub.docker.com/r/seleniarm/node-firefox)
 - [Selenium Hub](https://hub.docker.com/r/seleniarm/hub)
 
-For other images, see the next section to build them yourself.
+The other upstream images are not yet supported for multi-arch, but you can try and build them yourself.
 
-## Only Building the Images
+> NOTE: Google does not build Chrome for ARM on Linux. Instead, we use Chromium ARM.
 
-If you want to build the images locally, without pushing to any registry, then use the build.sh script in the root of the project directory.
+## Building the ARM Images
 
-The Standalone folder is the base for all Standalone${browser} images and includes a script that starts the selenium server in standalone mode. 
-The NodeBase folder is the base for all Node${browser} images and includes a script that starts the selenium server in node mode.
+The entire build process is managed via a Makefile. If you want to build the images locally, without pushing to any registry, then use `make`. 
 
-Inside build.sh are environment variables which are used to tag the built images. If changing the Selenium version, note that you must also edit the Base/Dockerfile and change which selenium-server version is downloaded via wget.  The Chromium version is set in NodeChromium/Dockerfile.txt.
+### Structure of container images:
 
-The build.sh script only builds the standalone images, node images, and the hub.  You are welcome to try and build and test the other images, if you need them.
+- The Standalone folder is the base for all Standalone${browser} images and includes a script that starts the selenium server in standalone mode. 
+- The NodeBase folder is the base for all Node${browser} images and includes a script that starts the selenium server in node mode.
 
-To build the images, run build.sh from the root directory of this repo, and specify your architecture, either arm64, arm/v7, or amd64:
+To build with a different version of Chromium, change it in NodeChromium/Dockerfile.
 
-```
-$ ./build.sh arm64    # or arm/v7 or amd64
-```
+The multi-arch Seleniarm images are only built for the standalone and node browser images, and the hub.  You are welcome to try and build and test the other images, if you need them.
 
-This is a fork of [SeleniumHQ/docker-selenium](https://github.com/SeleniumHQ/docker-selenium) and based on changes from [sj26/docker-selenium](https://github.com/sj26/docker-selenium) and [rows/docker-selenium](https://github.com/rows/docker-selenium).
+To build the images, run the following make command from the root directory of this repo, and specify your architecture, either arm64, arm/v7, or amd64:
 
-Multi-arch images are located at https://hub.docker.com/u/seleniarm
+**To build all arm64 images:**
+```
+$ NAME=local-seleniarm VERSION=4.5.0 BUILD_DATE=$(date '+%Y%m%d') PLATFORMS=linux/arm64 BUILD_ARGS=--load make build_multi
+```
 
-The primary motivation for creating this fork and updating the images is so I can use the noVNC client on Selenium 4.0.0 on the Mac M1, an arm64 architecture. To use noVNC, make sure you open port 7900, and visit localhost:7900 in your browser.
+**To build standalone/firefox for arm64:**
 
-The images are also successfully tested on AWS graviton nodes, resulting in better price-performance ratio and lower carbon footprint.
+```
+$ NAME=local-seleniarm VERSION=4.5.0 BUILD_DATE=$(date '+%Y%m%d') PLATFORMS=linux/arm64 BUILD_ARGS=--load make standalone_firefox_multi
+```
 
-To start the container image, run:
+**To build standalone/chromium for arm64:**
 
 ```
-$ docker run --rm -it -p 4444:4444 -p 5900:5900 -p 7900:7900 --shm-size 3g local-seleniarm/standalone-chromium:latest
+$ NAME=local-seleniarm VERSION=4.5.0 BUILD_DATE=$(date '+%Y%m%d') PLATFORMS=linux/arm64 BUILD_ARGS=--load make standalone_chromium_multi
 ```
 
-Use your traditional VNC client via port 5900, and noVNC in the browser via port 7900.
+To build for armv7l/armhf, replace PLATFORMS environment variable with `linux/arm/v7` like so:
 
+```
+$ NAME=local-seleniarm VERSION=4.5.0 BUILD_DATE=$(date '+%Y%m%d') PLATFORMS=linux/arm/v7 BUILD_ARGS=--load make standalone_chromium_multi
+```
 
 ----
-The official documentation from seleniumHQ begins here:
+# -- The official documentation from seleniumHQ begins here --
 ----
 
 
diff --git a/build-and-deploy-multi-arch.sh b/build-and-deploy-multi-arch.sh
deleted file mode 100644
index 7f43a1ee68..0000000000
--- a/build-and-deploy-multi-arch.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-BUILD_DATE=$(date +'%Y%m%d')
-VERSION="${VERSION:-4.1.3}"
-NAMESPACE="${NAMESPACE:-seleniarm}"
-AUTHORS=SeleniumHQ,sj26,jamesmortensen
-ARCH=linux/arm64,linux/amd64,linux/arm/v7
-
-echo "Register architectures via aptman/qus (QEMU User Static)...\n"
-
-docker run --rm -it --privileged aptman/qus -- -r
-docker run --rm -it --privileged aptman/qus -s -- -p
-
-echo "Build multi-arch images and push to Docker Hub...\n"
-
-cd ./Base && docker buildx build --push --platform $ARCH -t $NAMESPACE/base:$VERSION-$BUILD_DATE .
-echo $PWD
-cd ../Hub && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --push --platform $ARCH -t $NAMESPACE/hub:$VERSION-$BUILD_DATE .
-
-cd ../NodeBase && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --push --platform $ARCH -t $NAMESPACE/node-base:$VERSION-$BUILD_DATE .
-# && sed 's/chromium=.*/chromium=91.0.4472.124/' Dockerfile > Dockerfile \
-cd ../NodeChromium && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --push --platform $ARCH -t $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE .
-cd ../NodeFirefox && sh generate-arm.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --push --platform $ARCH -t $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE .
-
-cd ../Standalone && sh generate.sh StandaloneChromium node-chromium $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && cd ../StandaloneChromium \
-   && docker buildx build --push --platform $ARCH -t $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE .
-
-cd ../Standalone && sh generate.sh StandaloneFirefox node-firefox $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && cd ../StandaloneFirefox \
-   && docker buildx build --push --platform $ARCH -t $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE .
-
-cd ..
-
-echo "multi-arch: $ARCH"
-echo "Build base, node-base, hub, node-chromium, node-firefox, standalone-chromium, and standalone-firefox...\n"
-#echo "Tagging builds...\n"
-
-# docker tag $NAMESPACE/base:$VERSION-$BUILD_DATE $NAMESPACE/base:latest
-# docker tag $NAMESPACE/hub:$VERSION-$BUILD_DATE $NAMESPACE/hub:latest
-# docker tag $NAMESPACE/node-base:$VERSION-$BUILD_DATE $NAMESPACE/node-base:latest
-# docker tag $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE $NAMESPACE/node-chromium:latest
-# docker tag $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE $NAMESPACE/standalone-chromium:latest
-
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 0b0f0c3fa8..0000000000
--- a/build.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash -x
-
-BUILD_DATE=$(date +'%Y%m%d')
-VERSION="${VERSION:-4.1.2}"
-NAMESPACE="${NAMESPACE:-local-seleniarm}"
-AUTHORS=SeleniumHQ,sj26,jamesmortensen
-
-if [ "$1" == "arm64" ] || [ "$1" == "amd64" ] || [ "$1" == "arm/v7" ]; then
-   echo "Building images for platform $1"
-   PLATFORM=linux/$1
-else
-   echo "Run build.sh script as one of the following options:"
-   echo ""
-   echo "sh build.sh arm64"
-   echo "sh build.sh arm/v7"
-   echo "sh build.sh amd64"
-   exit;
-fi
-
-
-cd ./Base && docker buildx build --platform $PLATFORM -t $NAMESPACE/base:$VERSION-$BUILD_DATE .
-echo $PWD
-cd ../Hub && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --platform $PLATFORM -t $NAMESPACE/hub:$VERSION-$BUILD_DATE .
-
-cd ../NodeBase && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --platform $PLATFORM -t $NAMESPACE/node-base:$VERSION-$BUILD_DATE .
-cd ../NodeChromium && sh generate.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --platform $PLATFORM -t $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE .
-cd ../NodeFirefox && sh generate-arm.sh $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && docker buildx build --platform $PLATFORM -t $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE .
-
-cd ../Standalone && sh generate.sh StandaloneChromium node-chromium $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && cd ../StandaloneChromium \
-   && docker buildx build --platform $PLATFORM -t $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE .
-
-cd ../Standalone && sh generate.sh StandaloneFirefox node-firefox $VERSION-$BUILD_DATE $NAMESPACE $AUTHORS \
-   && cd ../StandaloneFirefox \
-   && docker buildx build --platform $PLATFORM -t $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE .
-
-cd ..
-
-echo "Build base, node-base, hub, node-chromium, node-firefox, standalone-chromium, and standalone-firefox...\n"
-echo "Tagging builds...\n"
-
-docker tag $NAMESPACE/base:$VERSION-$BUILD_DATE $NAMESPACE/base:latest
-docker tag $NAMESPACE/hub:$VERSION-$BUILD_DATE $NAMESPACE/hub:latest
-docker tag $NAMESPACE/node-base:$VERSION-$BUILD_DATE $NAMESPACE/node-base:latest
-docker tag $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE $NAMESPACE/node-chromium:latest
-docker tag $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE $NAMESPACE/node-firefox:latest
-docker tag $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE $NAMESPACE/standalone-chromium:latest
-docker tag $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE $NAMESPACE/standalone-firefox:latest
-
-echo "Testing the images...\n"
-USE_RANDOM_USER_ID=false VERSION=$VERSION BUILD_DATE=$BUILD_DATE NAME=$NAMESPACE SKIP_BUILD=true make test_multi_arch
-
diff --git a/push-images-to-dockerhub.sh b/push-images-to-dockerhub.sh
deleted file mode 100644
index 2e70ac72fd..0000000000
--- a/push-images-to-dockerhub.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-BUILD_DATE=$(date +'%Y%m%d')
-VERSION=4.1.0
-NAMESPACE=seleniarm
-
-
-docker push seleniarm/base:$VERSION-$BUILD_DATE
-docker push seleniarm/hub:$VERSION-$BUILD_DATE
-docker push seleniarm/node-base:$VERSION-$BUILD_DATE
-docker push seleniarm/node-chromium:$VERSION-$BUILD_DATE
-docker push seleniarm/node-firefox:$VERSION-$BUILD_DATE
-docker push seleniarm/standalone-chromium:$VERSION-$BUILD_DATE
-docker push seleniarm/standalone-firefox:$VERSION-$BUILD_DATE
-
-docker push seleniarm/base:latest
-docker push seleniarm/hub:latest
-docker push seleniarm/node-base:latest
-docker push seleniarm/node-chromium:latest
-docker push seleniarm/node-firefox:latest
-docker push seleniarm/standalone-chromium:latest
-docker push seleniarm/standalone-firefox:latest
-
diff --git a/retag-latest-images-as-today.sh b/retag-latest-images-as-today.sh
deleted file mode 100644
index a032e7495f..0000000000
--- a/retag-latest-images-as-today.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# This script retags all of the latest images with the current date tag, in case we want to rebuild images
-# without rebuilding from scratch.
-
-BUILD_DATE=$(date +'%Y%m%d')
-VERSION=4.0.0
-NAMESPACE=local-seleniarm
-
-docker tag $NAMESPACE/base:latest $NAMESPACE/base:$VERSION-$BUILD_DATE 
-docker tag $NAMESPACE/hub:latest $NAMESPACE/hub:$VERSION-$BUILD_DATE 
-docker tag $NAMESPACE/node-base:latest $NAMESPACE/node-base:$VERSION-$BUILD_DATE 
-docker tag $NAMESPACE/node-chromium:latest $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE 
-docker tag $NAMESPACE/standalone-chromium:latest $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE 
-
-docker tag $NAMESPACE/node-firefox:latest $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE 
-docker tag $NAMESPACE/standalone-firefox:latest $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE 
diff --git a/tag-images-for-dockerhub.sh b/tag-images-for-dockerhub.sh
deleted file mode 100644
index e77e7bbc74..0000000000
--- a/tag-images-for-dockerhub.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-# This script tags all of the latest images with seleniarm, for deploying to Docker Hub.
-
-BUILD_DATE=$(date +'%Y%m%d')
-VERSION=4.0.0
-LOCAL_NAMESPACE=local-seleniarm
-NAMESPACE=seleniarm
-
-docker tag $LOCAL_NAMESPACE/base:latest $NAMESPACE/base:latest 
-docker tag $LOCAL_NAMESPACE/base:$VERSION-$BUILD_DATE $NAMESPACE/base:$VERSION-$BUILD_DATE 
-
-docker tag $LOCAL_NAMESPACE/hub:latest $NAMESPACE/hub:latest 
-docker tag $LOCAL_NAMESPACE/hub:$VERSION-$BUILD_DATE $NAMESPACE/hub:$VERSION-$BUILD_DATE 
-
-docker tag $LOCAL_NAMESPACE/node-base:latest $NAMESPACE/node-base:latest 
-docker tag $LOCAL_NAMESPACE/node-base:$VERSION-$BUILD_DATE $NAMESPACE/node-base:$VERSION-$BUILD_DATE 
-
-docker tag $LOCAL_NAMESPACE/node-chromium:latest $NAMESPACE/node-chromium:latest 
-docker tag $LOCAL_NAMESPACE/node-chromium:$VERSION-$BUILD_DATE $NAMESPACE/node-chromium:$VERSION-$BUILD_DATE 
-
-docker tag $LOCAL_NAMESPACE/standalone-chromium:latest $NAMESPACE/standalone-chromium:latest 
-docker tag $LOCAL_NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE $NAMESPACE/standalone-chromium:$VERSION-$BUILD_DATE 
-
-docker tag $LOCAL_NAMESPACE/node-firefox:latest $NAMESPACE/node-firefox:latest 
-docker tag $LOCAL_NAMESPACE/node-firefox:$VERSION-$BUILD_DATE $NAMESPACE/node-firefox:$VERSION-$BUILD_DATE 
-
-docker tag $LOCAL_NAMESPACE/standalone-firefox:latest $NAMESPACE/standalone-firefox:latest 
-docker tag $LOCAL_NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE $NAMESPACE/standalone-firefox:$VERSION-$BUILD_DATE