diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c59e45c..6a3feae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,12 +22,12 @@ tileos-sway-amd64:
   - eval $(ssh-agent -s)
   - mkdir ~/.ssh/
   - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
-  - echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config
+  #- 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 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/
+  - ssh -o StrictHostKeyChecking=no ${STORAGE_USER}@{$STORAGE_HOST} -p ${STORAGE_PORT} rm -rf /media/iso/tile-os/testing/sway/*
+  - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -p -B ${CI_PROJECT_DIR}/output/amd64/* ${STORAGE_USER}@{$STORAGE_HOST}:/media/iso/tile-os/testing/sway/
 
 tileos-river-amd64:
  #rules:
@@ -42,12 +42,12 @@ tileos-river-amd64:
   - eval $(ssh-agent -s)
   - mkdir ~/.ssh/
   - echo "$BASE64_TILEOS_ISO_STORAGE_KEY" | base64 -d > ~/.ssh/id_rsa
-  - echo "$TILEOS_ISO_STORAGE_CONFIG" > ~/.ssh/config
+  #- 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 builder:latest ./build --desktop river --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/
+  - ssh -o StrictHostKeyChecking=no ${STORAGE_USER}@{$STORAGE_HOST} -p ${STORAGE_PORT} rm -rf /media/iso/tile-os/testing/river/*
+  - scp -o StrictHostKeyChecking=no -o Port=${STORAGE_PORT} -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/river/
 
 mrproper:
  #rules: