diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6935bea2d8d7f9eaa1bad71f98161f1e4f97e3fd..226e862e48d03c38f68d6cf914a7cc65e686e948 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,11 +18,12 @@ stages:
   variables:
     CONTEXT: "."
     DOCKERFILE: "Dockerfile"
+    BASE_URL: /wiki/
   before_script:
     - i=0; while [ "$i" -lt 12 ]; do docker info && break; sleep 5; i=$(( i + 1 )) ; done
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg="BUILD_OPTIONS=$OPTIONS" -f $DOCKERFILE $CONTEXT
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg="NUXT_APP_BASE_URL=$BASE_URL" -f $DOCKERFILE $CONTEXT
     - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA"
 
 # build:
@@ -41,7 +42,7 @@ stages:
 build:dev:
   extends: .build
   rules:
-    - if: $CI_COMMIT_BRANCH != "main"
+    - if: $CI_COMMIT_BRANCH == "main"
 
 .deploy:
   stage: deploy
diff --git a/Dockerfile b/Dockerfile
index b8b4f9c6a955e1b94b1fb7cf3603c53e57376501..8540d6645aecaa6aae9a95b3653c7abbad0b946e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,12 +42,12 @@ CMD [ "node", "server/index.mjs"]
 ### STAGE: Generate ###
 FROM node:19.5-bullseye-slim as generate
 
-ARG NUXT_APP_BASE_URL
-
+ARG BASE_URL=/
+ENV NUXT_APP_BASE_URL=${BASE_URL}
 WORKDIR /usr/src/app
 COPY --from=install /usr/src/app ./
 COPY . /usr/src/app
-RUN NUXT_APP_BASE_URL=/wiki npm run generate
+RUN npm run generate
 
 ### STAGE: NGINX ###
 FROM nginxinc/nginx-unprivileged:1.25
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 376795421cf5c1814c78f8dfeb1f340553109bcb..04c36373a8d957ae6b54ade61a5151997c1cd29f 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -2,7 +2,6 @@
 export default defineNuxtConfig({
   modules: ['@nuxt/content', 'vuetify-nuxt-module', '@vueuse/nuxt'],
   content: {
-    api: { baseURL: '/wiki/api/_content' },
     documentDriven: {
       injectPage: false,
     }