diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 507fef24..de5403c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,45 +10,16 @@ stages:
   - release
   - distribute
 
-#before_script:
-#  - earthly bootstrap
-
-create_test_machine:
-  stage: test
-  only:
-    - main
-    - merge_requests
-  tags:
-    - build-orchestration
-  script:
-    - /home/gitlab-runner/build-machine-ctl.sh create amd64-deb
-  when: manual
-
 test_amd64:
   stage: test
-  image: earthly/earthly:v0.6.30
+  image: earthly/earthly:v0.7.15
   only:
-    - main
-    - merge_requests
-  needs:
-    - create_test_machine
-  tags:
-    - earthly-tests
+     - main
+     - merge_requests
   script:
     - earthly bootstrap
     - earthly --ci +unit-tests-linux-amd64
-
-delete_test_machine:
-  stage: test
-  only:
-    - main
-    - merge_requests
-  needs:
-    - test_amd64
-  tags:
-    - build-orchestration
-  script:
-    - /home/gitlab-runner/build-machine-ctl.sh delete amd64-deb
+  when: manual
 
 release_job:
   stage: release