diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea27988bc5d5600cc23ea257a62dfe454cc05313..36c6012c35af72d276ad16f1691661f7b691425a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ stages:
 # Simulation stage
 ###############################################################################
 sim-compile:
+    tags: fpga
     stage: simulation
     script:
         - echo "Compiling for simulation"
@@ -18,6 +19,7 @@ sim-compile:
             - build/
 
 sim-run:
+    tags: fpga
     stage: simulation
     script:
         - echo "Running simulations"
@@ -28,16 +30,19 @@ sim-run:
 # Synthesis stage
 ###############################################################################
 synth-compile:
+    tags: fpga
     stage: synthesis
     script:
         - echo "Compiling for synthesis"
 
 synth-check-fmax:
+    tags: fpga
     stage: synthesis
     script:
         - echo "Checking achieved fMax"
 
 synth-check-programming-files:
+    tags: fpga
     stage: synthesis
     script:
         - echo "Checking if programming files have been generated"
@@ -47,14 +52,15 @@ synth-check-programming-files:
 # Hardware stage
 ###############################################################################
 trigger-opc-ua-test:
-  stage: hardware
-  only:
-    changes:
-      - applications/lofar2/images/lofar2_unb2b_sdp_station_full.tar.gz
+    tags: fpga
+    stage: hardware
+    only:
+        changes:
+            - applications/lofar2/images/lofar2_unb2b_sdp_station_full.tar.gz
 #  script:
 #      - echo "Found updated programming file. Triggering OPC UA test in SDPTR repo."
-  trigger:
-      project: LOFAR2.0/sdptr
-      branch: L2SDP-534
+    trigger:
+        project: LOFAR2.0/sdptr
+        branch: L2SDP-534