diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 00000000..6af6ad1b
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,9 @@
+name: Docker build
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  docker:
+    uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
+    with:
+      runner: ubuntu-latest
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
new file mode 100644
index 00000000..3056aca7
--- /dev/null
+++ b/.github/workflows/dockerhub.yml
@@ -0,0 +1,17 @@
+name: Docker Hub build
+on:
+  push:
+    branches:
+      - develop
+      - master
+      - "release/*"
+    tags:
+      - "carma-system-*"
+jobs:
+  dockerhub:
+    uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+    with:
+      runner: ubuntu-latest
diff --git a/Dockerfile b/Dockerfile
index 1ae71c13..a1f0cd0c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN wget -q https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a27
 	rm openjdk-21.0.1_linux-x64_bin.tar.gz && \
 	mv jdk-21.0.1 /opt/jdk
 # download apache tomcat
-RUN wget -q https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.83/bin/apache-tomcat-9.0.83.tar.gz && \
+RUN wget -q https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.83/bin/apache-tomcat-9.0.83.tar.gz && \
 	tar -xzf apache-tomcat-9.0.83.tar.gz && \
 	rm apache-tomcat-9.0.83.tar.gz && \
 	mv apache-tomcat-9.0.83 tomcat && \
@@ -40,7 +40,7 @@ RUN gcc -c -std=c11 -fPIC -Wall -I /opt/jdk/include/ -I /opt/jdk/include/linux/
 WORKDIR /tmp
 RUN find ./cc/src -name "*.java" > sources.txt && \
 	mkdir -p tomcat/webapps/carmacloud/ROOT/WEB-INF/classes && \
-	/opt/jdk/bin/javac -cp tomcat/lib/servlet-api.jar:cc/lib/commons-compress-1.18.jar:cc/lib/javax.json.jar:cc/lib/json-20210307.jar:cc/lib/keccakj.jar:cc/lib/log4j-api-2.16.0.jar:cc/lib/vector_tile.jar -d tomcat/webapps/carmacloud$
+	/opt/jdk/bin/javac -cp tomcat/lib/servlet-api.jar:cc/lib/commons-compress-1.18.jar:cc/lib/javax.json.jar:cc/lib/json-20210307.jar:cc/lib/keccakj.jar:cc/lib/log4j-api-2.16.0.jar:cc/lib/vector_tile.jar -d tomcat/webapps/carmacloud$ && \
 	rm sources.txt && \
 	/opt/jdk/bin/java -cp tomcat/webapps/carmacloud/ROOT/WEB-INF/classes/:tomcat/lib/servlet-api.jar cc.ws.UserMgr ccadmin admin_testpw > tomcat/webapps/carmacloud/user.csv && \
 	echo "JAVA_HOME=/opt/jdk" > tomcat/bin/setenv.sh && \