diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 813eabf4c0..0a93f8de07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,8 @@ variables:
 stages:
     - optional-builds
     - check-compile
-    - post
+    - build-post
+    - publish
 
 before_script:
     - source $HOME/.cargo/env
@@ -90,30 +91,30 @@ security:
 
 # --
 
-# -- post build
+# -- build-post
 
 unittests:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
         - veloren-docker
     script:
         - echo "Workaround, cargo tests fails due some rust files are already deleted, so we just stack cargo test. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
-        - cargo test || cargo test || cargo test || cargo test
+        - cargo test || ( sleep 10 && cargo test ) || ( sleep 10 && cargo test ) || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test
 
 coverage:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
         - veloren-docker
     script:
         - echo "Workaround, tarpaulin fails due some rust files are already deleted, so we just stack tarpaulin. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
-        - cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v
+        - cargo tarpaulin -v || ( sleep 10 && cargo tarpaulin -v ) || ( sleep 10 && cargo tarpaulin -v ) || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v
 
 benchmarks:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     tags:
@@ -125,7 +126,7 @@ benchmarks:
 localization-status:
     variables:
         GIT_DEPTH: 0
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     allow_failure: true
@@ -135,13 +136,13 @@ localization-status:
         - cargo test -q test_all_localizations -- --nocapture --ignored
 
 linux:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     only:
         refs:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
-            - /^v[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
             - /^master$/
     tags:
         - veloren-docker
@@ -160,13 +161,13 @@ linux:
         expire_in: 1 week
 
 windows:
-    stage: post
+    stage: build-post
     when: delayed
     start_in: 5 seconds
     only:
         refs:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
-            - /^v[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
             - /^master$/
     tags:
         - veloren-docker
@@ -181,4 +182,53 @@ windows:
             - assets/
             - LICENSE
         expire_in: 1 week
+
+macos:
+    stage: build-post
+    when: delayed
+    start_in: 5 seconds
+    only:
+        refs:
+            - /^r[0-9]+\.[0-9]+\.[0-9]+/
+            - /^v[0-9]+\.[0-9]+/
+            - /^master$/
+    tags:
+        - veloren-docker
+    script:
+        - PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release
+        - cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR
+        - cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR
+    artifacts:
+        paths:
+            - veloren-server-cli
+            - veloren-voxygen
+            - assets/
+            - LICENSE
+        expire_in: 1 week
+# --
+
+# -- publish
+
+docker:
+    stage: publish
+    when: delayed
+    start_in: 5 seconds
+    image:
+      name: gcr.io/kaniko-project/executor:debug
+      entrypoint: [""]
+    dependencies:
+        - linux
+    before_script:
+        - ls "$CI_PROJECT_DIR/server-cli/"
+    only:
+      refs:
+          - /^r[0-9]+\.[0-9]+\.[0-9]+/
+          - /^v[0-9]+\.[0-9]+/
+          - /^master$/
+    tags:
+        - veloren-docker
+    script:
+        - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+        - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server-cli/Dockerfile --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-server"
+
 # --
diff --git a/server-cli/Dockerfile b/server-cli/Dockerfile
new file mode 100644
index 0000000000..eacecc7846
--- /dev/null
+++ b/server-cli/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:stable-slim
+
+ARG PROJECTNAME=server-cli
+
+COPY ./server-cli/docker-run.sh /opt/docker-run.sh
+COPY ./veloren-server-cli /opt/veloren-server-cli
+COPY ./assets/common /opt/assets/common
+COPY ./assets/world /opt/assets/world
diff --git a/server-cli/docker-compose.yml b/server-cli/docker-compose.yml
new file mode 100644
index 0000000000..ba9badf7de
--- /dev/null
+++ b/server-cli/docker-compose.yml
@@ -0,0 +1,17 @@
+version: "3.7"
+
+services:
+  game-server:
+    image: registry.gitlab.com/veloren/veloren:master-server
+    ports:
+      - "14004:14004"
+      - "14005:14005"
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 2
+        delay: 10s
+	order: stop-first
+        failure_action: rollback
+      restart_policy:
+        condition: on-failure
diff --git a/server-cli/docker-run.sh b/server-cli/docker-run.sh
new file mode 100755
index 0000000000..e965090fdb
--- /dev/null
+++ b/server-cli/docker-run.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt
+RUST_LOG=info,common=debug,common::net=info RUST_BACKTRACE=1 /opt/veloren-server-cli