diff --git a/.docs/build-website.sh b/.docs/build-website.sh
index b6c366d9331381dd2e979cbbae04191975a5ed5f..5020643f397c8fc2f098b692466e93a838260259 100755
--- a/.docs/build-website.sh
+++ b/.docs/build-website.sh
@@ -6,6 +6,8 @@ SCRIPTS_EXTRA_JS=""
 function generate_docs {
   BRANCH="release-$1"
   echo "==================================================="
+  echo "Removing cache from directory ./site"
+  rm -rf ./site
   echo "Building DOCS for version $1 on branch $BRANCH"
   echo "==================================================="
   git reset --hard && git checkout "$BRANCH"
@@ -29,6 +31,8 @@ function generate_docs {
 function generate_api {
   BRANCH="release-$1"
   echo "==================================================="
+  echo "Removing cache from directory ./site"
+  rm -rf ./site
   echo "Building API for version $1 on branch $BRANCH"
   echo "==================================================="
   git reset --hard && git checkout "$BRANCH"
diff --git a/.docs/scripts/extra.js b/.docs/scripts/extra.js
index 34f3123b0a3c7bbb245880fd19d4e7e1861cb8ec..b5ae3d0a12749d5e825a396f96d67e8e51e3fcaa 100644
--- a/.docs/scripts/extra.js
+++ b/.docs/scripts/extra.js
@@ -1,8 +1,10 @@
 function getVersion() {
     const segments = location.pathname.split('/');
     if (segments.length > 4) {
+        console.debug('version', segments[3]);
         return segments[3];
     } else {
+        console.debug('default version', '__APPVERSION__');
         return '__APPVERSION__';
     }
 }
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30686cd7d8c500d6438cf43d60701fc5eba58330..c25100d5bb7298810a6039cfeb35173bedfb0ad9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -646,38 +646,6 @@ docs-registry:
       - ./final
     expire_in: 1 days
 
-docs-latest:
-  stage: docs
-  image: docker.io/python:3.9-slim
-  needs:
-    - build-api-latest
-    - build-api-1.3
-    - build-api-1.4
-  only:
-    refs:
-      - master
-      - release-v1.3
-      - release-v1.4
-  script:
-    - apt-get update && apt-get install -y git make sed
-    - git fetch && git checkout master
-    - pip install -r ./requirements.txt
-    - mkdir -p ./final
-    - sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" .docs/redirect.html
-    - cp ./.docs/redirect.html ./final/index.html
-    - find .docs/ -type f -exec sed -i -e "s/__APPVERSION__/latest/g" {} \;
-    - find .docs/ -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
-    - mkdocs build && cp -r ./site ./final/latest
-    - cp -r ./swagger/latest ./final/latest/swagger
-  cache:
-    paths:
-      - ./final
-  artifacts:
-    when: always
-    paths:
-      - ./final
-    expire_in: 1 days
-
 docs-1.3:
   stage: docs
   image: docker.io/python:3.9-slim
diff --git a/docker-compose.yml b/docker-compose.yml
index ecaea0a80b264770df568b7372d2af188f41de8a..0380fd2e9252b9173d9e3f62e7640a2c1d585e66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,8 @@ volumes:
 services:
   website:
     restart: "no"
+    container_name: website
+    hostname: website
     image: website
     build: .
     ports: