diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index f27e3de9..202874ca 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -23,6 +23,7 @@ jobs:
       with:
         name: linux_x86_64_gui_(debug)
         path: build/prefab/full/linux_x86_64_gui
+
   make_linux_x86_64_server_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -40,6 +41,7 @@ jobs:
       with:
         name: linux_x86_64_server_(debug)
         path: build/prefab/full/linux_x86_64_server
+
   make_linux_arm64_gui_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -57,6 +59,7 @@ jobs:
       with:
         name: linux_arm64_gui_(debug)
         path: build/prefab/full/linux_arm64_gui
+
   make_linux_arm64_server_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -74,6 +77,7 @@ jobs:
       with:
         name: linux_arm64_server_(debug)
         path: build/prefab/full/linux_arm64_server
+
   make_mac_x86_64_gui_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -91,6 +95,7 @@ jobs:
       with:
         name: mac_x86_64_gui_(debug)
         path: build/prefab/full/mac_x86_64_gui
+
   make_mac_x86_64_server_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -108,6 +113,7 @@ jobs:
       with:
         name: mac_x86_64_server_(debug)
         path: build/prefab/full/mac_x86_64_server
+
   make_mac_arm64_gui_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -125,6 +131,7 @@ jobs:
       with:
         name: mac_arm64_gui_(debug)
         path: build/prefab/full/mac_arm64_gui
+
   make_mac_arm64_server_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -142,6 +149,7 @@ jobs:
       with:
         name: mac_arm64_server_(debug)
         path: build/prefab/full/mac_arm64_server
+
   make_windows_x86_gui_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -159,6 +167,7 @@ jobs:
       with:
         name: windows_x86_gui_(debug)
         path: build/prefab/full/windows_x86_gui
+
   make_windows_x86_server_debug_build:
     runs-on: ubuntu-latest
     steps:
@@ -176,6 +185,7 @@ jobs:
       with:
         name: windows_x86_server_(debug)
         path: build/prefab/full/windows_x86_server
+
   make_sphinx_docs:
     runs-on: ubuntu-latest
     steps:
@@ -192,4 +202,24 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: sphinx_html_docs
-        path: build/sphinx
\ No newline at end of file
+        path: build/sphinx
+  
+  make_docker_image:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+    - name: Setup build dependencies
+      run: apt install cmake
+    - name: Setup project environment
+      run: make env
+    - name: Make the build
+      run: make docker-save
+    - name: Upload the build
+      uses: actions/upload-artifact@v4
+      with:
+        name: docker_server(release)
+        path: build/docker/bombsquad_server_docker.tar
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 68df7215..9b90f040 100644
--- a/Makefile
+++ b/Makefile
@@ -222,12 +222,6 @@ pcommandbatch_speed_test: env
 
 # Prebuilt binaries for various platforms.
 
-docker-build: assets-cmake
-	$(PCOMMAND) build_docker
-
-docker-run:
-	docker run -it bombsquad_server
-
 # WSL is Linux but running under Windows, so it can target either. By default
 # we want these top level targets (prefab-gui-debug, etc.) to yield native
 # Windows builds from WSL, but this env var can be set to override that.
@@ -1182,6 +1176,26 @@ clion-staging: assets-cmake resources meta
         cmake-modular-server-build cmake-modular-server-binary				\
         cmake-modular-server-clean clion-staging
 
+################################################################################
+#                                                                              #
+#                                  Docker                                      #
+#                                                                              #
+################################################################################
+
+docker-build: assets-cmake
+	$(PCOMMAND) build_docker
+
+docker-run:
+	docker run -it bombsquad_server
+
+docker-save: docker-build
+	mkdir -p build/docker/
+	docker save bombsquad_server -o build/docker/bombsquad_server_docker.tar
+
+docker-clean:
+	rm build/docker/bombsquad_server_docker.tar
+	docker rmi bombsquad_server --force
+	docker system prune
 
 ################################################################################
 #                                                                              #