diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f13583b..10a6163 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ tileos-sway-amd64:
   - echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config
   - chmod 644 ~/.ssh/config
   - chmod 400 ~/.ssh/id_rsa
-  - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc -e DESKTOP=sway -e RELEASE=testing builder:latest /bin/bash -s etc/terraform.conf < build.sh
+  - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop sway --release testing
   - ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/testing/sway/*
   - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/sway/
 
@@ -45,7 +45,7 @@ tileos-river-amd64:
   - echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config
   - chmod 644 ~/.ssh/config
   - chmod 400 ~/.ssh/id_rsa
-  - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc -e DESKTOP=river -e RELEASE=testing builder:latest /bin/bash -s etc/terraform.conf < build.sh
+  - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop sway --release testing
   - ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/testing/river/*
   - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/river/