diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64e507f..69187f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,8 @@ Build Docker Images:
   only:
     - master
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
-  # Needed because we aren't using our custom runners here
-  services:
-    - docker:dind
-  variables:
-    DOCKER_HOST: tcp://docker:2375
+  tags:
+    - autoscale
   parallel:
     matrix:
       - DISTRO:
@@ -83,11 +80,8 @@ docker-win64:
   only:
     - win64
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
-  # Needed because we aren't using our custom runners here
-  services:
-    - docker:dind
-  variables:
-    DOCKER_HOST: tcp://docker:2375
+  tags:
+    - autoscale
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
     - make docker-win64