diff --git a/.github/workflows/docker-image-publish.yml b/.github/workflows/docker-image-publish.yml
new file mode 100644
index 0000000..8373dcb
--- /dev/null
+++ b/.github/workflows/docker-image-publish.yml
@@ -0,0 +1,31 @@
+name: Docker Image CI - Publish
+
+on:
+  release:
+    types: [published]
+
+  # Manual run
+  workflow_dispatch:
+
+jobs:
+
+  publish:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Docker Hub Login
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
+      run: |
+        echo "$DOCKER_TOKEN" | docker login --username $DOCKER_USERNAME --password-stdin       
+    
+    - name: Build the Docker image
+      run: |
+        bash ./build.sh
+
+    - name: Docker Push
+      run: |
+        docker push -a radstudio/paserver
diff --git a/.github/workflows/docker-image-test.yml b/.github/workflows/docker-image-test.yml
new file mode 100644
index 0000000..b3a75a1
--- /dev/null
+++ b/.github/workflows/docker-image-test.yml
@@ -0,0 +1,19 @@
+name: Docker Image CI - Test
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build the Docker image
+      run: |
+        bash ./build.sh
diff --git a/Dockerfile b/Dockerfile
index 3212e2e..25cad79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,11 +16,7 @@ RUN apt-get update && \
     zlib1g-dev \
     libcurl4-gnutls-dev \
     libncurses5 \
-    libgl1-mesa-dev \
-    libgtk-3-bin \
-    libosmesa-dev \
-    libpython3.10 \
-    xorg
+    libpython3.10
 
 ### Install PAServer
 ADD https://altd.embarcadero.com/releases/studio/23.0/121/1211/LinuxPAServer23.0.tar.gz ./paserver.tar.gz
@@ -39,7 +35,5 @@ RUN chmod +x paserver_docker.sh
 
 # PAServer
 EXPOSE 64211
-# broadwayd
-EXPOSE 8082
 
 CMD ./paserver_docker.sh
diff --git a/README.md b/README.md
index a01ab0c..4d3b228 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Docker script for RAD Studio Linux deployment via PAServer
 - [More information on RAD Studio](https://www.embarcadero.com/products/rad-studio)
 - Other containers: [InterBase](https://github.com/Embarcadero/InterBase-Docker) only, [RAD Server](https://github.com/Embarcadero/pa-radserver-docker), and [RAD Server with InterBase](https://github.com/Embarcadero/pa-radserver-ib-docker)
 
-The image defaults to running **PAServer** on port `64211` with the _password_ `securepass`, and **Broadwayd** on port `8082`
+The image defaults to running **PAServer** on port `64211` with the _password_ `securepass`
 
 The 10.x images use Ubuntu 18.04.6 LTS (Bionic Beaver) while the 11.x images use Ubuntu 22.04.1 LTS (Jammy Jellyfish)
 
@@ -28,7 +28,7 @@ To pull and run the Docker Hub version of PAServer Docker for a non-debug/produc
 ./pull-run-production.sh securepass123
 ```
 
-To run the Docker Hub version of PAServer Docker for a debug/non-production environment use the `pull-run.sh` script
+To run the Docker Hub version of PAServer Docker for a debug/non-production environment use the `run.sh` script
 ```
 ./run.sh
 ```
diff --git a/paserver_docker.sh b/paserver_docker.sh
index 07b0ad8..376c15c 100644
--- a/paserver_docker.sh
+++ b/paserver_docker.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-nohup broadwayd :2 &
-export GDK_BACKEND=broadway
-export BROADWAY_DISPLAY=:2
-
 ./paserver -password=$PA_SERVER_PASSWORD
 status=$?
 if [ $status -ne 0 ]; then
diff --git a/run-production.sh b/run-production.sh
index 1e7bbf0..378e351 100644
--- a/run-production.sh
+++ b/run-production.sh
@@ -5,5 +5,5 @@ if [ "$1" = '' ]; then
     echo "Required arguments: PAServer password";
     echo "ex: run-production.sh securepass";
 else
-    docker run --platform linux/amd64 -d -t -e PA_SERVER_PASSWORD=$1 -p 64211:64211 -p 8082:8082 radstudio/paserver:latest
+    docker run --platform linux/amd64 -d -t -e PA_SERVER_PASSWORD=$1 -p 64211:64211 radstudio/paserver:latest
 fi
diff --git a/run.sh b/run.sh
index e2e2a1e..3b3329d 100644
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 echo "PAServer Password: securepass"
-docker run --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --platform linux/amd64 -it -e PA_SERVER_PASSWORD=securepass -p 64211:64211 -p 8082:8082 radstudio/paserver:latest
+docker run --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --platform linux/amd64 -it -e PA_SERVER_PASSWORD=securepass -p 64211:64211 radstudio/paserver:latest