diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40c0215de4b6ddbb83084761a19bb4dc88473471..850d339540bd5a9e675c07d2f7343b59b724457f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,30 +1,24 @@
 image: node:16
 cache:
   paths:
-    - dist
     - node_modules
+
 stages:
-  - prepare
   - test
   - build
 
-prepare:
-  stage: prepare
-  script:
-    - npm install
+before_script:
+  - npm --version  # For debugging
+  - npm install
 
 lint:
   stage: test
-  needs:
-    - prepare
   script:
     - npm run lint
     - npm run type-check
 
 build:
   stage: build
-  needs:
-    - prepare
   script:
     - npm run build-only
   artifacts:
diff --git a/src/client/core/OpenAPI.ts b/src/client/core/OpenAPI.ts
index dba8bdb3010f83c6abfb91a17471cbb60d40a938..4ca423bb8eabf49428e80e3347468cfd4b0f976a 100644
--- a/src/client/core/OpenAPI.ts
+++ b/src/client/core/OpenAPI.ts
@@ -19,7 +19,7 @@ export type OpenAPIConfig = {
 };
 
 export const OpenAPI: OpenAPIConfig = {
-    BASE: 'http://localhost:9999/api',
+    BASE: import.meta.env.VITE_API_BASE_URL != null ? import.meta.env.VITE_API_BASE_URL : 'http://localhost:9999/api',
     VERSION: '1.0.0',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',