diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa86f826e32aa8cc234460cb65000b54a0f9aa9a..c23d1a0309a0ddf330c31e2fbbead4b64e455254 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,39 +1,45 @@
-
-test_api:
-  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:
-  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
+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
 
 
 pages:
+  stage: test
   image: alpine
   before_script:
     - cd docs
@@ -42,7 +48,7 @@ pages:
     - pip install sphinx
     - apk --no-cache add make
     - make html
-    - mv _build/html/ public/
+    - mv _build/html/ ../public
   artifacts:
     paths:
       - public