diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de20ada..f517da1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,62 +4,52 @@ stages:
  - postbuild
 prebuild:
  stage: prebuild
-# rules:
-#    - if: '$CI_COMMIT_TAG'
  tags:
-  - Builder-1
+  - iso-builder
  script:
-  - eval $(ssh-agent -s)
-  - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ./id_rsa
   - docker build --no-cache -f Dockerfile-builder -t builder:latest .
-
 tileos-sway-amd64:
  when: manual
  stage: build
  variables:
    DESKTOP: sway
  tags:
-  - Builder-1
+  - iso-builder
  script:
   - eval $(ssh-agent -s)
-  - mkdir /root/.ssh
+  - mkdir ~/.ssh/
   - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
+  - echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config
+  - chmod 644 ~/.ssh/config
   - chmod 400 ~/.ssh/id_rsa
-  - rm -rf ${CI_PROJECT_DIR}/output/*
-  - mkdir ${CI_PROJECT_DIR}/output
-  - 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 ${STORAGE_USER}@${STORAGE_HOST} -p ${STORAGE_PORT} -i ~/.ssh/id_rsa rm -rf /media/iso/tile-os/testing/sway/*
-  - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=/builder/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/sway/
-
+  - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc -e DESKTOP=sway 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/
 tileos-river-amd64:
- #rules:
- #   - if: '$CI_COMMIT_TAG'
  when: manual
  stage: build
  variables:
    DESKTOP: sway
  tags:
-  - Builder-1
+  - iso-builder
  script:
   - eval $(ssh-agent -s)
-  - mkdir /root/.ssh
+  - mkdir ~/.ssh/
   - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
+  - echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config
+  - chmod 644 ~/.ssh/config
   - chmod 400 ~/.ssh/id_rsa
-  - rm -rf ${CI_PROJECT_DIR}/output/*
-  - mkdir ${CI_PROJECT_DIR}/output
   - docker run --privileged --rm -i -v ${CI_PROJECT_DIR}/output:/builder/builds -v /proc:/proc builder:latest ./build --desktop river --release testing
-  - ssh -o StrictHostKeyChecking=no ${STORAGE_USER}@${STORAGE_HOST} -p ${STORAGE_PORT} -i ~/.ssh/id_rsa rm -rf /media/iso/tile-os/testing/river/*
-  - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -o IdentityFile=/builder/id_rsa -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@${STORAGE_HOST}:/media/iso/tile-os/testing/river/
-
+  - 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/
 mrproper:
- #rules:
- #   - if: '$CI_COMMIT_TAG'
  stage: postbuild
  when: on_success
  tags:
-  - Builder-1
+  - iso-builder
  needs:
   - tileos-sway-amd64
   - tileos-river-amd64
  script:
   - docker system prune -a -f
+
diff --git a/Dockerfile-builder b/Dockerfile-builder
index 1622ccf..8c07df0 100644
--- a/Dockerfile-builder
+++ b/Dockerfile-builder
@@ -3,4 +3,3 @@ RUN echo 'Acquire::http::Proxy "http://10.10.50.23:3142";' > /etc/apt/apt.conf.d
 RUN apt update && apt install -y openssh-client --no-install-recommends && rm -rf /var/lib/cache
 WORKDIR /builder
 COPY . /builder/
-RUN chmod 400 /builder/id_rsa