diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 623de9171af3263843b96cebdf8cde7419aabe4f..8739cab54f99105a68338d5e28433edd16572425 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,15 @@
-make:
-    image: sphinxdoc/sphinx
-    script:
-        - apt-get update
-        - apt-get install -y pandoc
-        - apt-get install -y openssh-client
-        - pip3 install sphinx-rtd-theme
-        - pip3 install sphinx-autoapi
-        - pip3 install nbsphinx
-        - cd doc
-        - make html
-        - eval $(ssh-agent)
-        - echo "$SSHKEY" | ssh-add -
-        - ssh -o UserKnownHostsFile=known_hosts wp86team@exflqr30526 "./doc-prepare toolbox/$CI_COMMIT_REF_NAME"
-        - scp -o UserKnownHostsFile=known_hosts -r _build/html wp86team@exflqr30526:html/toolbox/$CI_COMMIT_REF_NAME
-
+# The Docker image that will be used to build your app
+image: sphinxdoc/sphinx
+# Functions that should be executed before the build script is run
+before_script: []
+pages:
+  script:
+    - make html
+  artifacts:
+    paths:
+      # The folder that contains the files to be exposed at the Page URL
+      - public
+  rules:
+    # This ensures that only pushes to the default branch will trigger
+    # a pages deploy
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
diff --git a/README.rst b/README.rst
index c62efc1ec9a017ad2a1d207e333dd881d28a657f..34b94b6736a2cfa4bfab742ccec04e798137247e 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,4 @@
 Documentation
 #############
 
-Online documentation can be found at `ReadTheDocs <https://rtd.xfel.eu/docs/scs-toolbox/en/latest/>`_.
-
-From within the XFEL office network, documentation for the git branches may be found `here <http://exflqr30526.desy.de:8000/toolbox/>`_.
\ No newline at end of file
+Online documentation can be found `here <https://scs.pages.xfel.eu/toolbox/>`_.
diff --git a/doc/Makefile b/doc/Makefile
index 298ea9e213e8c4c11f0431077510d4e325733c65..5c37cfaa363cf0c450bf48b42bcac4968f074f93 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 SOURCEDIR     = .
-BUILDDIR      = _build
+BUILDDIR      = public
 
 # Put it first so that "make" without argument is like "make help".
 help: