diff --git a/.gitignore b/.gitignore
index 5bb169b..e427135 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 tmp/*
 builds/*
 artifacts/*
-.gitlab-ci.yml
\ No newline at end of file
+#.gitlab-ci.yml
+.forgejo
+.forgejo/workflows
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f517da1..778a84c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 prebuild:
  stage: prebuild
  tags:
-  - iso-builder
+  - Builder-1
  script:
   - docker build --no-cache -f Dockerfile-builder -t builder:latest .
 tileos-sway-amd64:
@@ -14,7 +14,7 @@ tileos-sway-amd64:
  variables:
    DESKTOP: sway
  tags:
-  - iso-builder
+  - Builder-1
  script:
   - eval $(ssh-agent -s)
   - mkdir ~/.ssh/
@@ -23,7 +23,7 @@ tileos-sway-amd64:
   - 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 builder:latest ./build --desktop sway --release testing
-  - ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/testing/sway/*
+  - ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/ci/sway/*
   - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/sway/
 tileos-river-amd64:
  when: manual
@@ -31,7 +31,7 @@ tileos-river-amd64:
  variables:
    DESKTOP: sway
  tags:
-  - iso-builder
+  - Builder-1
  script:
   - eval $(ssh-agent -s)
   - mkdir ~/.ssh/
@@ -40,13 +40,13 @@ tileos-river-amd64:
   - 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/*
+  - ssh -o StrictHostKeyChecking=no tileos@tileos rm -rf /media/iso/tile-os/ci/river/*
   - scp -o StrictHostKeyChecking=no -p -B ${CI_PROJECT_DIR}/output/amd64/* tileos@tileos:/media/iso/tile-os/testing/river/
 mrproper:
  stage: postbuild
  when: on_success
  tags:
-  - iso-builder
+  - Builder-1
  needs:
   - tileos-sway-amd64
   - tileos-river-amd64