diff --git a/.ci/pack-container b/.ci/pack-container
index 1f917ba..4652490 100755
--- a/.ci/pack-container
+++ b/.ci/pack-container
@@ -3,6 +3,6 @@ set -Eeuo pipefail
 
 export HOME=$(pwd)
 
-buildah build -f wwp-repo/container/Containerfile -t quay.io/blasthavers/worldwideportal:latest
+buildah --root containers build -f wwp-repo/container/Containerfile -t quay.io/blasthavers/worldwideportal:latest
 echo "$CONTAINER_REGISTRY_KEY" | buildah login --password-stdin --username blasthavers quay.io
-buildah push quay.io/blasthavers/worldwideportal:latest
+buildah --root containers push quay.io/blasthavers/worldwideportal:latest
diff --git a/.concourse.yml b/.concourse.yml
index 5bfbce9..12e8a74 100644
--- a/.concourse.yml
+++ b/.concourse.yml
@@ -7,6 +7,8 @@ jobs:
     plan:
     - get: wwp-repo
       trigger: true
+    - get: wwp-server-repo
+      trigger: true
     - task: build
       config:
         platform: linux
@@ -24,6 +26,22 @@ jobs:
           - name: wwpapp
         run:
           path: wwp-repo/.ci/build
+    - task: build-server
+      config:
+        platform: linux
+        image_resource:
+          type: registry-image
+          source:
+            repository: quay.io/blasthavers/trunkrs
+        inputs:
+          - name: wwp-server-repo
+        caches:
+          - path: target
+          - path: .cargo
+        outputs:
+          - name: wwpserver
+        run:
+          path: wwp-server-repo/.ci/build
     - task: packcontainer
       privileged: true
       config:
@@ -34,7 +52,10 @@ jobs:
             repository: quay.io/buildah/stable
         inputs:
           - name: wwpapp
+          - name: wwpserver
           - name: wwp-repo
+        caches:
+          - name: containers
         params:
           CONTAINER_REGISTRY_KEY: ((container_registry_key))
         run:
@@ -47,3 +68,10 @@ resources:
     source:
       uri: https://git.blastmud.org/blasthavers/worldwideportal.git
       branch: main
+  - name: wwp-server-repo
+    type: git
+    check_every: never
+    webhook_token: ((webhook_token))
+    source:
+      uri: https://git.blastmud.org/blasthavers/worldwideportal-server.git
+      branch: main
diff --git a/container/Containerfile b/container/Containerfile
index b11a0da..62107db 100644
--- a/container/Containerfile
+++ b/container/Containerfile
@@ -1,2 +1,4 @@
-FROM debian:bookworm-slim
+FROM alpine:3.20.3    
 COPY wwpapp /frontendstatic
+COPY wwpserver/worldwideportal-server /bin/worldwideportal-server
+ENTRYPOINT ["/bin/worldwideportal-server"]