diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 334ff10baab25ac2ea08bec30592858282f6c3d2..1e09de3978acb21895dc4cf4d0955bb0715c2dd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,12 +143,8 @@ trigger_inttest:
   tags: [ cached-dind ]
   stage: deploy
   script:
-    - mkdir -p build
-    - cd build
-    - conan install .. -s "compiler.libcxx=libstdc++11"
-    - cmake ..
-    - cmake --build . --target doc-sphinx
-    - cp -r doc/sphinx_out ../public
+    - make doc
+    - cp -r build/doc/sphinx_out ../public
 
 test_pages:
   <<: *pages_prepare
diff --git a/Makefile b/Makefile
index 819b9ca2910ce5571f1a80412f655f41afa023e5..4772702ae29823dd96703c0ad481ab00e40ea4f1 100644
--- a/Makefile
+++ b/Makefile
@@ -64,3 +64,9 @@ conan-create:
 
 conan: conan-install conan-create
 .PHONY: conan
+
+doc:
+	mkdir -p build && cd build && conan install .. -s $(CONAN_SETTINGS) \
+	  && cmake .. && cmake --build . --target doc-sphinx \
+	  && echo "The documentation starts at build/doc/sphinx_out/index.html ."
+.PHONY: doc
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 4255ab7d0f5531187491de7586a8c7b6c61545f7..c78f2b336706c2b8ac79cc248b4f0148011dd55d 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -18,6 +18,7 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 
+cmake_minimum_required(VERSION 3.13)
 find_package(Doxygen)
 
 if (DOXYGEN_FOUND)
@@ -89,12 +90,11 @@ if (DOXYGEN_FOUND)
             VERBATIM
             )
         # Copying files is necessary: https://stackoverflow.com/a/45808534/232888
-		# TODO fix for docs
-		#FILE(COPY
-		#Examples.rst
-		#README_SETUP.md
+		FILE(COPY
+		    Examples.rst
+		    README_SETUP.md
             # Tutorial.rst
-			#DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+			DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
     else ()
         message("Sphinx need to be installed to generate the sphinx documentation")
     endif ()