diff --git a/docker/ci-runner/Dockerfile b/docker/ci-runner/Dockerfile
index 937fe86ec3a04eb6d9bb1463b366168f23b32aec..8b9621755a0653909c67cf1eda3ff2bfba87063c 100644
--- a/docker/ci-runner/Dockerfile
+++ b/docker/ci-runner/Dockerfile
@@ -1,4 +1,5 @@
 FROM python:3.11
 
 RUN python -m pip install --upgrade pip
-RUN pip install --upgrade cookiecutter tox twine
+RUN pip install --upgrade cookiecutter tox twine cibuildwheel==2.13.1 cookiecutter
+RUN curl -sSL https://get.docker.com/ | sh
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 5d15cbffc4e22a51feba5b28b6f3f7b55d1cb4d2..1498ae3a1c7fddd5566cef273240ac4cf276cb96 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -79,14 +79,14 @@ run_unit_tests_coverage:
 
 package_files:
   stage: package
-  image: python:3.8
+#  image: python:3.8
   artifacts:
     expire_in: 1w
     paths:
       - dist/*
   script:
-    - curl -sSL https://get.docker.com/ | sh
-    - python -m pip install cibuildwheel==2.13.1 cookiecutter
+#    - curl -sSL https://get.docker.com/ | sh
+#    - python -m pip install cibuildwheel==2.13.1 cookiecutter
     - cibuildwheel --platform linux --output-dir dist
 
 package_docs:
diff --git a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile
index 01d5ee1b5eb9da1e6f7f3d89806bbc1d1787c7ed..54b2c9c4fe345ccda7c44daee6c754f52358cfac 100644
--- a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile
+++ b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile
@@ -1,4 +1,4 @@
 FROM python:3.11
 
 RUN python -m pip install --upgrade pip
-RUN pip install --upgrade tox twine
+RUN pip install --upgrade tox twine cibuildwheel==2.13.1
diff --git a/{{cookiecutter.project_slug}}/docs/source/conf.py b/{{cookiecutter.project_slug}}/docs/source/conf.py
index c14432747f3fbb5409e54edb47eb8f80b41dc99a..4f02a28fdef1abb71da367df1ddd1b89f2a5bd3a 100644
--- a/{{cookiecutter.project_slug}}/docs/source/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/source/conf.py
@@ -20,7 +20,7 @@ extensions = [
 # Assumes tox is used to call sphinx-build
 project_root_directory = os.getcwd()
 
-apidoc_module_dir = "../../{{cookiecutter.project_slug}}"
+apidoc_module_dir = "../../src"
 apidoc_output_dir = "source_documentation"
 apidoc_excluded_paths = []
 apidoc_separate_modules = True
diff --git a/{{cookiecutter.project_slug}}/tox.ini b/{{cookiecutter.project_slug}}/tox.ini
index 5d298cbf6f2011ee4b4e10a80a5894752a04a5b2..efe916668846670e2f8e08db8cb09417fb5d6e28 100644
--- a/{{cookiecutter.project_slug}}/tox.ini
+++ b/{{cookiecutter.project_slug}}/tox.ini
@@ -45,6 +45,8 @@ allowlist_externals =
     sh
 ; unset LC_ALL / LANGUAGE from testenv, would fail sphinx otherwise
 setenv =
+    PYTHONWARNINGS=default::DeprecationWarning
+    DYNAMIC_VERSION_SOURCE={toxinidir}
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/docs/requirements.txt