diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a67a140e0..1303f4f380 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,8 +32,7 @@ before_script:
 optional-debug:linux:
     <<: *optional-debug
     script:
-        - cd voxygen && VELOREN_ASSETS=assets cargo build --verbose && cd ..
-        - cd server-cli && VELOREN_ASSETS=assets cargo build --verbose && cd ..
+        - VELOREN_ASSETS=assets cargo build --verbose
         - cp target/debug/veloren-server-cli $CI_PROJECT_DIR
         - cp target/debug/veloren-voxygen $CI_PROJECT_DIR
         - strip --strip-all veloren-server-cli
@@ -49,8 +48,7 @@ optional-debug:linux:
 optional-debug:windows:
     <<: *optional-debug
     script:
-        - cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu && cd ..
-        - cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu && cd ..
+        - VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu
         - cp target/x86_64-pc-windows-gnu/debug/veloren-server-cli.exe $CI_PROJECT_DIR
         - cp target/x86_64-pc-windows-gnu/debug/veloren-voxygen.exe $CI_PROJECT_DIR
     artifacts:
@@ -72,8 +70,7 @@ optional-debug:windows:
 optional-release:linux:
     <<: *optional-release
     script:
-        - cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --release && cd ..
-        - cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --release && cd ..
+        - VELOREN_ASSETS=assets cargo build --verbose --release
         - cp target/release/veloren-server-cli $CI_PROJECT_DIR
         - cp target/release/veloren-voxygen $CI_PROJECT_DIR
         - strip --strip-all veloren-server-cli
@@ -89,8 +86,7 @@ optional-release:linux:
 optional-release:windows:
     <<: *optional-release
     script:
-        - cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release && cd ..
-        - cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release && cd ..
+        - VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release
         - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
         - cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
     artifacts:
@@ -174,8 +170,7 @@ linux:
     tags:
         - veloren-docker
     script:
-        - cd voxygen && VELOREN_ASSETS=assets cargo build --release && cd ..
-        - cd server-cli && VELOREN_ASSETS=assets cargo build --release && cd ..
+        - VELOREN_ASSETS=assets cargo build --release
         - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
         - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
         - strip --strip-all veloren-server-cli
@@ -200,8 +195,7 @@ windows:
     tags:
         - veloren-docker
     script:
-        - cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release && cd ..
-        - cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release && cd ..
+        - VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release
         - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
         - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
     artifacts: