diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58be623ac1ab30792b218cce045fa96589752b06..a2cf8065cda7e7a9e84b8eae6114925e138ff515 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,41 @@
 stages:
-    - build
-    - test
+    - sim-compile
+    - sim-simulate
+    - hw-compile
+    - hw-check-fmax
+    - hw-check-programming-files
 
-build:
-    stage: build
+sim-compile:
+    stage: sim-compile
     script:
-        - echo "Building"
+        - echo "Compiling for simulation"
         - mkdir build
         - touch build/info.txt
     artifacts:
         paths:
             - build/
 
-test:
-    stage: test
+sim-simulate:
+    stage: sim-simulate
     script:
-        - echo "Testing"
+        - echo "Running simulations"
         - test -f "build/info.txt"
 
+hw-compile:
+    stage: hw-compile
+    script:
+        - echo "Compiling for hardware"
+
+hw-check-fmax:
+    stage: hw-check-fmax
+    script:
+        - echo "Checking achieved fMax"
+
+hw-check-programming-files:
+    stage: hw-check-programming-files
+    script:
+        - echo "Checking if programming files have been generated"
+
+
+
+