diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f1cb32ac266043b7d7b3aefd4153f2b11b3663f..9d04ee752f1e3ab7d4f97feac28496d207484575 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,8 @@ stages:          # List of stages for jobs, and their order of execution
 
 build-job:       # This job runs in the build stage, which runs first.
   stage: build
+  tags:
+    - libero-soc-v2023.2
   variables:
     BUILD_OPTIONS_DIRECTORY: "custom-fpga-design"
     BRANCH_UNDER_TEST: "develop"
@@ -31,7 +33,7 @@ build-job:       # This job runs in the build stage, which runs first.
     - echo "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"
     - echo "Compile complete."
   artifacts:
-    when: always
+    when: on_success
     paths:
       - gateware-builds-tester/artifacts/
     reports: