diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bfd364..97a41e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,71 +4,64 @@
 #
 # Yvan Tortorella <yvan.tortorella@unibo.it>
 
-variables:
-  GIT_SUBMODULE_STRATEGY: recursive
-  # Our reference GCC toolchain for reproducible builds
-
 stages:
   - init
-  - build
-  - test
 
 init:
   stage: init
   script:
-    - cd golden-model
-    - source setup-py.sh
-
-.base:
-  artifacts:
-    when: always
-    expire_in: 1 week
-
-.redmule-build-tpl:
-  extends: .base
-  needs: [ init ]
-  stage: build
-  script:
-    - SETUP-CONFIG=${SETUP-CONFIG}
-    - source scripts/${SETUP-CONFIG}.sh
-    - make update-ips
-    - make build-hw
-
-redmule-build-hwpe:
-  extends: .redmule-build-tpl
-  variables:
-    SETUP-CONFIG: "setup-hwpe"
-
-redmule-build-complex:
-  extends: .redmule-build-tpl
-  variables:
-    SETUP-CONFIG: "setup-complex"
-
-.redmule-vsim-tpl:
-  extends: .base
-  needs: [ build ]
-  stage: test
-  script:
-    - SETUP-CONFIG=${SETUP-CONFIG}
-    - source scripts/${SETUP-CONFIG}.sh
-    - make goden M=${M} N=${N} K=${K}
-    - make clean all
-    - make run
-    - '(grep -rn Success!" ./work/transcript)'
-    - (! grep -rn "Fail!" ./work/transcript)
-
-hwpe-test:
-  extends: .redmule-vsim-tpl
-  variables:
-    SETUP-CONFIG: "setup-hwpe"
-  parallel:
-    matrix:
-      - { M: 32, N=32, K=32 }
+    - cd golden-model & source setup-py.sh
 
-complex-test:
-  extends: .redmule-vsim-tpl
-  variables:
-    SETUP-CONFIG: "setup-complex"
-  parallel:
-    matrix:
-      - { M: 32, N=32, K=32 }
+# .base:
+#   artifacts:
+#     when: always
+#     expire_in: 1 week
+# 
+# .redmule-build-tpl:
+#   extends: .base
+#   needs: [ init ]
+#   stage: build
+#   script:
+#     - SETUP-CONFIG=${SETUP-CONFIG}
+#     - source scripts/${SETUP-CONFIG}.sh
+#     - make update-ips
+#     - make build-hw
+# 
+# redmule-build-hwpe:
+#   extends: .redmule-build-tpl
+#   variables:
+#     SETUP-CONFIG: "setup-hwpe"
+# 
+# redmule-build-complex:
+#   extends: .redmule-build-tpl
+#   variables:
+#     SETUP-CONFIG: "setup-complex"
+# 
+# .redmule-vsim-tpl:
+#   extends: .base
+#   needs: [ build ]
+#   stage: test
+#   script:
+#     - SETUP-CONFIG=${SETUP-CONFIG}
+#     - source scripts/${SETUP-CONFIG}.sh
+#     - make goden M=${M} N=${N} K=${K}
+#     - make clean all
+#     - make run
+#     - '(grep -rn Success!" ./work/transcript)'
+#     - (! grep -rn "Fail!" ./work/transcript)
+# 
+# hwpe-test:
+#   extends: .redmule-vsim-tpl
+#   variables:
+#     SETUP-CONFIG: "setup-hwpe"
+#   parallel:
+#     matrix:
+#       - { M: 32, N=32, K=32 }
+# 
+# complex-test:
+#   extends: .redmule-vsim-tpl
+#   variables:
+#     SETUP-CONFIG: "setup-complex"
+#   parallel:
+#     matrix:
+#       - { M: 32, N=32, K=32 }