diff --git a/api/middleware/cors.go b/api/middleware/cors.go
index 6bbb4ba..ae74ece 100644
--- a/api/middleware/cors.go
+++ b/api/middleware/cors.go
@@ -1,12 +1,20 @@
 package middleware
 
 import (
+	"log"
 	"net/http"
+	"os"
 )
 
 func EnableCors(next http.Handler) http.Handler {
+	var frontent_url = os.Getenv("FRONTEND_URL")
+	if frontent_url == "" {
+		log.Fatal("FRONTEND_URL is not set")
+	}
+	log.Println("FRONTEND_URL is", frontent_url)
+
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Origin", "http://localhost:5173")
+		w.Header().Set("Access-Control-Allow-Origin", frontent_url)
 		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, DELETE")
 		w.Header().Set("Access-Control-Allow-Headers", "Authorization")
 
diff --git a/view/package.json b/view/package.json
index 04c8ae9..96c0a36 100644
--- a/view/package.json
+++ b/view/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.2",
 	"private": true,
 	"scripts": {
-		"dev": "vite dev",
+		"dev": "PUBLIC_BASE_API_URL=http://localhost:8080 vite dev",
 		"build": "vite build",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
diff --git a/view/src/routes/app/+page.svelte b/view/src/routes/app/+page.svelte
index 48742b8..75eb205 100644
--- a/view/src/routes/app/+page.svelte
+++ b/view/src/routes/app/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { PUBLIC_BASE_API_URL } from '$env/static/public';
 	import { onMount } from 'svelte';
 	import type { Auth } from 'firebase/auth';
 	import { goto } from '$app/navigation';
@@ -17,7 +18,7 @@
 		const formData = new FormData(form);
 
 		try {
-			const response = await fetch('http://localhost:8080/workout', {
+			const response = await fetch(PUBLIC_BASE_API_URL + '/workout', {
 				method: 'POST',
 				headers: {
 					Authorization: 'Bearer ' + (await auth?.currentUser?.getIdToken())
@@ -49,7 +50,7 @@
 
 	async function fetchWorkouts() {
 		try {
-			const response = await fetch('http://localhost:8080/workout', {
+			const response = await fetch(PUBLIC_BASE_API_URL + '/workout', {
 				headers: {
 					Authorization: 'Bearer ' + (await auth?.currentUser?.getIdToken())
 				},