diff --git a/{{cookiecutter.project_repo_name}}/docs/source/conf.py b/{{cookiecutter.project_repo_name}}/docs/source/conf.py
index d315f5809..01fac0f60 100755
--- a/{{cookiecutter.project_repo_name}}/docs/source/conf.py
+++ b/{{cookiecutter.project_repo_name}}/docs/source/conf.py
@@ -20,7 +20,7 @@
 #
 import os
 import sys
-# sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath('../../'))
 
 
 # -- General configuration ---------------------------------------------
@@ -38,11 +38,6 @@
               'pywps.ext_autodoc',
               ]
 
-autoapi_type = 'python'
-autoapi_dirs = ['../../{{ cookiecutter.project_slug }}']
-autoapi_file_pattern = '*.py'
-autoapi_options = ['members', 'undoc-members', 'private-members']
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
diff --git a/{{cookiecutter.project_repo_name}}/docs/source/installation.rst b/{{cookiecutter.project_repo_name}}/docs/source/installation.rst
index 0b0e0ebbf..eb898d835 100644
--- a/{{cookiecutter.project_repo_name}}/docs/source/installation.rst
+++ b/{{cookiecutter.project_repo_name}}/docs/source/installation.rst
@@ -87,7 +87,7 @@ You can also use the ``Makefile`` to start and stop the service:
 Run {{ cookiecutter.project_name }} as Docker container
 -{{ '-' * (cookiecutter.project_name|count + 23) }}
 
-You can also run {{ cookiecutter.project_name }} as a Docker container, see the :ref:`Tutorial <tutorial>`.
+You can also run {{ cookiecutter.project_name }} as a Docker container.
 
 Use Ansible to deploy {{ cookiecutter.project_name }} on your System
 -{{ '-' * (cookiecutter.project_name|count + 36) }}
@@ -105,4 +105,4 @@ First install dependencies for the documentation::
 
 
 .. _Ansible playbook: http://ansible-wps-playbook.readthedocs.io/en/latest/index.html
-.. _example: http://ansible-wps-playbook.readthedocs.io/en/latest/tutorial.html
+.. _example: https://ansible-wps-playbook.readthedocs.io/en/latest/testing.html
diff --git a/{{cookiecutter.project_repo_name}}/readthedocs.yml b/{{cookiecutter.project_repo_name}}/readthedocs.yml
new file mode 100644
index 000000000..88bef8412
--- /dev/null
+++ b/{{cookiecutter.project_repo_name}}/readthedocs.yml
@@ -0,0 +1,8 @@
+build:
+    image: latest
+
+python:
+    version: 3.6
+
+conda:
+    file: environment.yml
diff --git a/{{cookiecutter.project_repo_name}}/requirements_dev.txt b/{{cookiecutter.project_repo_name}}/requirements_dev.txt
index dd00bf25f..ddfc66e7e 100644
--- a/{{cookiecutter.project_repo_name}}/requirements_dev.txt
+++ b/{{cookiecutter.project_repo_name}}/requirements_dev.txt
@@ -1,7 +1,6 @@
 -r requirements.txt
 pytest
 flake8
+pytest-flake8
 sphinx>=1.7
-sphinx-autoapi
--e git+https://github.com/huard/sphinx-autodoc-pywps.git#egg=sphinx_autodoc_pywps
 bumpversion
diff --git a/{{cookiecutter.project_repo_name}}/rtd.txt b/{{cookiecutter.project_repo_name}}/rtd.txt
deleted file mode 100644
index 81c2c2908..000000000
--- a/{{cookiecutter.project_repo_name}}/rtd.txt
+++ /dev/null
@@ -1,6 +0,0 @@
--e git+https://github.com/geopython/pywps.git#egg=pywps
-jinja2
-click
-psutil
-sphinx>=1.7
-sphinx-autoapi