diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c23d1a030..4a10a92e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,41 +1,41 @@
 stages:
   - test
-#   - build
-#
-# test_api:
-#   stage: test
-#   before_script:
-#     - docker-compose -f api/test.yml build
-#   script:
-#     - docker-compose -f api/test.yml run test
-#   after_script:
-#     - docker-compose -f api/test.yml run test rm -rf funkwhale_api/media/
-#
-#   tags:
-#     - dind
-#
-# build_front:
-#   stage: build
-#   image: node:6-alpine
-#   before_script:
-#     - cd front
-#
-#   script:
-#     - npm install
-#     - npm run build
-#   cache:
-#     key: "$CI_COMMIT_REF_NAME"
-#     paths:
-#       - front/node_modules
-#   artifacts:
-#     name: "front_${CI_COMMIT_REF_NAME}"
-#     paths:
-#       - front/dist/
-#   only:
-#     - master
-#     - develop
-#   tags:
-#     - docker
+  - build
+
+test_api:
+  stage: test
+  before_script:
+    - docker-compose -f api/test.yml build
+  script:
+    - docker-compose -f api/test.yml run test
+  after_script:
+    - docker-compose -f api/test.yml run test rm -rf funkwhale_api/media/
+
+  tags:
+    - dind
+
+build_front:
+  stage: build
+  image: node:6-alpine
+  before_script:
+    - cd front
+
+  script:
+    - npm install
+    - npm run build
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    paths:
+      - front/node_modules
+  artifacts:
+    name: "front_${CI_COMMIT_REF_NAME}"
+    paths:
+      - front/dist/
+  only:
+    - master
+    - develop
+  tags:
+    - docker
 
 
 pages: