diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 884cfdcbdfc579aac4e9042bc0035e1d1fb1d1c0..f6e61498394ac7a47fa8110620cd806d65211784 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,9 +18,9 @@ cache:
     # - venv/
 
 stages:
+  - deploy_docs
   - setup_and_format 
   - lint # Does not modify code
-  - deploy_docs
   - auto_commit
 
 # Job 1: Install ${PROJECT} and its dependencies
@@ -131,22 +131,23 @@ run_pylint:
 pages:
   stage: deploy_docs
   tags:
-    - git-run-ia2  
-  needs:
-    - job: apply_autopep8 
-      artifacts: true
+    - git-run-ia2
   before_script:
+    - pip install --upgrade pip
+    # Install project so Sphinx can import it
+    - pip install -e .
+    # Install doc dependencies
     - pip install -r docs/requirements.txt
   script:
-    - echo "Current directory $(pwd)"
-    - echo "Building docs..."
-    - sphinx-apidoc -o docs/source noctua
-    - sphinx-build -b html docs/source docs/public/html
+    - echo "Building documentation..."
+    - sphinx-apidoc -o docs/source ${PROJECT}
+    # The final output directory MUST be named 'public' for GitLab Pages
+    - sphinx-build -b html docs/source public
   artifacts:
     paths:
-      - . # Pass the modified workspace
-  #    - public
+      - public
   rules:
+    # Only run on the default branch
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   
 # Job 7: commit in branch