diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ef000d0c65cebdc4ed04e951b667869ca4cc38f..c367e3bb8ca43433ba2a479eb1800933670875aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,10 +9,9 @@ docs:
   stage: "build"
   script:
     - "nix-build docs"
-    - "cp --recursive --no-preserve=mode result/docs/. docs/build/"
   artifacts:
     paths:
-      - "docs/build/"
+      - "./result/docs/"
     expose_as: "documentation"
 
 unit-tests:
diff --git a/docs/build/.gitignore b/docs/_static/.gitignore
similarity index 100%
rename from docs/build/.gitignore
rename to docs/_static/.gitignore
diff --git a/docs/source/_static/logo-ps.svg b/docs/_static/logo-ps.svg
similarity index 100%
rename from docs/source/_static/logo-ps.svg
rename to docs/_static/logo-ps.svg
diff --git a/docs/source/_static/.gitignore b/docs/_templates/.gitignore
similarity index 100%
rename from docs/source/_static/.gitignore
rename to docs/_templates/.gitignore
diff --git a/docs/source/conf.py b/docs/conf.py
similarity index 100%
rename from docs/source/conf.py
rename to docs/conf.py
diff --git a/docs/source/dev/README.rst b/docs/dev/README.rst
similarity index 100%
rename from docs/source/dev/README.rst
rename to docs/dev/README.rst
diff --git a/docs/docs.nix b/docs/docs.nix
index 03ac07df93e324c6f6d3b017bb51c242435b488b..d764aa783f619a36b4313570a75c3843c76d0eaf 100644
--- a/docs/docs.nix
+++ b/docs/docs.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = ''
-    ${pyenv}/bin/sphinx-build -W docs/source $out/docs
+    ${pyenv}/bin/sphinx-build -W docs/ $out/docs
   '';
 }
diff --git a/docs/source/index.rst b/docs/index.rst
similarity index 100%
rename from docs/source/index.rst
rename to docs/index.rst
diff --git a/docs/source/ops/README.rst b/docs/ops/README.rst
similarity index 100%
rename from docs/source/ops/README.rst
rename to docs/ops/README.rst
diff --git a/docs/source/ops/generating-keys.rst b/docs/ops/generating-keys.rst
similarity index 100%
rename from docs/source/ops/generating-keys.rst
rename to docs/ops/generating-keys.rst
diff --git a/docs/source/ops/monitoring.rst b/docs/ops/monitoring.rst
similarity index 100%
rename from docs/source/ops/monitoring.rst
rename to docs/ops/monitoring.rst
diff --git a/docs/source/ops/service-dag-to-dashboard-order.dot b/docs/ops/service-dag-to-dashboard-order.dot
similarity index 100%
rename from docs/source/ops/service-dag-to-dashboard-order.dot
rename to docs/ops/service-dag-to-dashboard-order.dot
diff --git a/docs/source/_templates/.gitignore b/docs/source/_templates/.gitignore
deleted file mode 100644
index f935021a8f8a7bd22f9d6703cafa5134bb6a57f8..0000000000000000000000000000000000000000
--- a/docs/source/_templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore