diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f634ca..2c0a13c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,12 +43,12 @@ jobs:
       # Docker Web
       - name: Build Docker - Web
         run: |
-          yarn build:web && docker build -t historyhall-web -f packages/deploy/docker/web.dockerfile .
+          yarn build:web && docker build -t historyhall-web -f packages/deploy/docker-web/web.dockerfile .
 
       # Docker Server
       - name: Build Docker - Server
         run: |
-          yarn build:server && docker build -t historyhall-server -f packages/deploy/docker/server.dockerfile .
+          yarn build:server && docker build -t historyhall-server -f packages/deploy/docker-server/server.dockerfile .
 
       # Docker Push
       - name: Push Docker - Web
diff --git a/packages/deploy/docker/package.json b/packages/deploy/docker-common/package.json
similarity index 100%
rename from packages/deploy/docker/package.json
rename to packages/deploy/docker-common/package.json
diff --git a/packages/deploy/docker/server.dockerfile b/packages/deploy/docker-server/server.dockerfile
similarity index 87%
rename from packages/deploy/docker/server.dockerfile
rename to packages/deploy/docker-server/server.dockerfile
index 6a4f539..bdd3d95 100644
--- a/packages/deploy/docker/server.dockerfile
+++ b/packages/deploy/docker-server/server.dockerfile
@@ -10,7 +10,7 @@ RUN mkdir -p /app/packages/server && \
 WORKDIR /app
 
 # Add package.json files
-ADD packages/deploy/docker/package.json /app
+ADD packages/deploy/docker-common/package.json /app
 ADD packages/server/package.json /app/packages/server
 ADD packages/domain/package.json /app/packages/domain
 
@@ -22,7 +22,7 @@ ADD packages/domain/dist/ /app/packages/domain
 ADD packages/server/dist/ /app/packages/server
 ADD packages/domain/dist/ /app/packages/server/node_modules/hh-orion-domain/dist
 
-ADD packages/deploy/docker/server.sh /app
+ADD packages/deploy/docker-web/server.sh /app
 RUN chmod +x server.sh
 
 ENV NODE_ENV production
diff --git a/packages/deploy/docker/server.sh b/packages/deploy/docker-server/server.sh
similarity index 100%
rename from packages/deploy/docker/server.sh
rename to packages/deploy/docker-server/server.sh
diff --git a/packages/deploy/docker/web.conf b/packages/deploy/docker-web/web.conf
similarity index 100%
rename from packages/deploy/docker/web.conf
rename to packages/deploy/docker-web/web.conf
diff --git a/packages/deploy/docker/web.dockerfile b/packages/deploy/docker-web/web.dockerfile
similarity index 51%
rename from packages/deploy/docker/web.dockerfile
rename to packages/deploy/docker-web/web.dockerfile
index 3a4f17f..0596922 100644
--- a/packages/deploy/docker/web.dockerfile
+++ b/packages/deploy/docker-web/web.dockerfile
@@ -1,6 +1,6 @@
-FROM node:iron-bookworm
+FROM nginx:stable-bookworm
 MAINTAINER Shayne Thiessen <shayne@shaynethiessen.com>
 
 ADD packages/web/dist/ /usr/share/nginx/html
 
-COPY packages/deploy/docker/web.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file
+COPY packages/deploy/docker-web/web.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file
diff --git a/packages/deploy/server-release/release.sh b/packages/deploy/server-release/release.sh
new file mode 100755
index 0000000..c472c62
--- /dev/null
+++ b/packages/deploy/server-release/release.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+sudo docker login registry.historyhall.org -u dockerreguser
+
+cp -n ./web/.env.default ./web.env
+cp -n ./server/.env.default ./server.env
+
+cd ./web
+sudo docker compose pull
+sudo docker compose down
+sudo docker compose up -d
+
+cd ./server
+sudo docker compose pull
+sudo docker compose down
+sudo docker compose up -d
\ No newline at end of file
diff --git a/packages/deploy/server-release/server/.env.default b/packages/deploy/server-release/server/.env.default
new file mode 100644
index 0000000..322c5a9
--- /dev/null
+++ b/packages/deploy/server-release/server/.env.default
@@ -0,0 +1,12 @@
+SERVER_PORT=5001
+API_VERSION='0.0.1'
+
+DB_USERNAME=postgres
+DB_PASSWORD=
+DB_DOMAIN=localhost
+DB_SERVER=hh
+DB_PORT=5432
+DB_REJECT_UNAUTHORIZED=false
+DB_LOGGING=true
+
+DEBUG=hh.*
\ No newline at end of file
diff --git a/packages/deploy/server-release/server/assets/test.txt b/packages/deploy/server-release/server/assets/test.txt
new file mode 100644
index 0000000..e69de29
diff --git a/packages/deploy/server-release/server/docker-compose.yml b/packages/deploy/server-release/server/docker-compose.yml
new file mode 100644
index 0000000..6850195
--- /dev/null
+++ b/packages/deploy/server-release/server/docker-compose.yml
@@ -0,0 +1,13 @@
+services:
+  registry:
+    container_name: server
+    restart: always
+    image: registry.historyhall.org/historyhall-server
+    environment:
+      - TZ="America/Winnipeg"
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY="/data"
+    volumes:
+      - ./.env.default:/app/packages/server/.env
+      - ./assets:/app/packages/server/assets
+    expose:
+      - "3001"
\ No newline at end of file
diff --git a/packages/deploy/server-release/web/.env.default b/packages/deploy/server-release/web/.env.default
new file mode 100644
index 0000000..208a97c
--- /dev/null
+++ b/packages/deploy/server-release/web/.env.default
@@ -0,0 +1 @@
+REACT_APP_API_URL=http://localhost:5001/api
\ No newline at end of file
diff --git a/packages/deploy/server-release/web/docker-compose.yml b/packages/deploy/server-release/web/docker-compose.yml
new file mode 100644
index 0000000..9278fcf
--- /dev/null
+++ b/packages/deploy/server-release/web/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3.5'
+
+services:
+  registry:
+    container_name: web
+    restart: always
+    image: registry.historyhall.org/historyhall-web
+    environment:
+      - TZ="America/Winnipeg"
+      - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY="/data"
+      - LETSENCRYPT_HOST=terrene.ca
+      - VIRTUAL_HOST=terrene.ca
+    expose:
+      - "80"
\ No newline at end of file
diff --git a/packages/deploy/server/docker-compose.yml b/packages/deploy/server-setup/docker-compose.yml
similarity index 96%
rename from packages/deploy/server/docker-compose.yml
rename to packages/deploy/server-setup/docker-compose.yml
index efde722..221cbca 100644
--- a/packages/deploy/server/docker-compose.yml
+++ b/packages/deploy/server-setup/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   registry:
     image: registry:latest
diff --git a/packages/deploy/server/historyhall.org b/packages/deploy/server-setup/historyhall.org
similarity index 96%
rename from packages/deploy/server/historyhall.org
rename to packages/deploy/server-setup/historyhall.org
index 42abfef..800e82e 100644
--- a/packages/deploy/server/historyhall.org
+++ b/packages/deploy/server-setup/historyhall.org
@@ -8,6 +8,7 @@ server {
     listen 443;
     listen [::]:443;
     server_name registry.historyhall.org www.registry.historyhall.org;
+    client_max_body_size 5000m;
     location / {
         proxy_pass http://localhost:6000;
         proxy_set_header Host $host;
diff --git a/packages/deploy/server/setup.sh b/packages/deploy/server-setup/setup.sh
similarity index 100%
rename from packages/deploy/server/setup.sh
rename to packages/deploy/server-setup/setup.sh