diff --git a/.env b/.env
index d50fb40b0be6a5d747b19f05f0acc6d6ae0bc221..4184678b94574ca17c8885c15dd4dee0983c8026 100644
--- a/.env
+++ b/.env
@@ -1,12 +1,9 @@
 API_BASE=http://localhost
 API_PORT=8080
 API_PREFIX=/api
-API_URL=$API_BASE:$API_PORT
-PROXIED_API_URL=$API_URL$API_PREFIX
+API_HOST=$API_BASE:$API_PORT
 FRONTEND_PORT=8090
-VUE_FRONTEND_PORT=$FRONTEND_PORT
 VITE_FRONTEND_PORT=$FRONTEND_PORT
-VUE_API_URL=$PROXIED_API_URL
-VITE_API_URL=$PROXIED_API_URL
-VUE_SHARE_URL=http://future-se-tool:8081/upload-maed
-VITE_SHARE_URL=http://future-se-tool:8081/upload-maed
+VITE_API_HOST=$API_HOST
+VITE_API_PREFIX=$API_PREFIX
+VITE_SHARE_URL=http://future-se-tool:8081/upload-maed
\ No newline at end of file
diff --git a/.env.production b/.env.production
index f12cc014cbf3c2f15d2ceb5320da5848bbfe8a2a..96be829a017b6b162732ecf64a4092c89973cb4a 100644
--- a/.env.production
+++ b/.env.production
@@ -1,12 +1,5 @@
-FRONTEND_PORT=8090
-API_BASE=http://localhost
-API_PORT=$FRONTEND_PORT
 API_PREFIX=/api
-API_URL=$API_BASE:$API_PORT
-PROXIED_API_URL=$API_URL$API_PREFIX
-VUE_FRONTEND_PORT=$FRONTEND_PORT
+FRONTEND_PORT=8090
 VITE_FRONTEND_PORT=$FRONTEND_PORT
-VUE_API_URL=$PROXIED_API_URL
-VITE_API_URL=$PROXIED_API_URL
-VUE_SHARE_URL=http://future-se-tool:8081/upload-maed
-VITE_SHARE_URL=http://future-se-tool:8081/upload-maed
+VITE_API_PREFIX=$API_PREFIX
+VITE_SHARE_URL=http://future-se-tool:8081/upload-maed
\ No newline at end of file
diff --git a/nginx.conf.template b/nginx.conf.template
index 34103e4e0868ce9d32a98fb091fbf84435225757..d907b7150b80bc66e7b577284a8fa2cd739c1b84 100644
--- a/nginx.conf.template
+++ b/nginx.conf.template
@@ -11,6 +11,12 @@ server {
         try_files $uri $uri/ /index.html =404;
     }
 
+    location = /health {
+            access_log off;
+            add_header 'Content-Type' 'application/json';
+            return 200 '{"status":"healthy"}';
+    }
+
     location ${API_PREFIX} {
         proxy_pass http://api;
         proxy_set_header Host $http_host;
diff --git a/src/services/api.ts b/src/services/api.ts
index 0ed77e60b23a85993413c3df8651e7020ac0fdb5..b54bee2fca969b5d6119427a6a5fc4052246aa4b 100644
--- a/src/services/api.ts
+++ b/src/services/api.ts
@@ -79,7 +79,7 @@ export namespace Transforms {
 }
 
 
-const backendUrl = process.env.API_URL ?? 'http://localhost:8080' // import.meta.env?.VITE_API_URL ||
+const backendUrl = (process.env.API_HOST ?? window.location.host) + (process.env.API_PREFIX ?? '/api') // process.env.API_URL ?? 'http://localhost:8080' // import.meta.env?.VITE_API_URL ||
 console.log(`Using following (backend) API_URL: ${backendUrl}`)
 // const f = jsYaml.loadAll('./api-schema/openapi.yaml')
 
diff --git a/vite.config.mjs b/vite.config.mjs
index 28060e3737be0af3f48dc59101c69ae506fc65b7..1f861ae26a4854fe672f8f2d1410e5776fa21f21 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -24,7 +24,7 @@ export default defineConfig(({command, mode}) => {
                         name: 'Roboto', styles: 'wght@100;300;400;500;700;900',
                     }],
                 },
-            }),], define: {'process.env': {API_URL: env.VITE_API_URL, SHARE_URL: env.VITE_SHARE_URL}}, resolve: {
+            }),], define: {'process.env': {API_HOST: env.VITE_API_HOST, API_PREFIX: env.VITE_API_PREFIX, SHARE_URL: env.VITE_SHARE_URL}}, resolve: {
             alias: {
                 '@': fileURLToPath(new URL('./src', import.meta.url))
             }, extensions: ['.js', '.json', '.jsx', '.mjs', '.ts', '.tsx', '.vue',],