diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts
index 675ea24..ce77c0b 100644
--- a/pages/api/auth/[...nextauth].ts
+++ b/pages/api/auth/[...nextauth].ts
@@ -24,7 +24,7 @@ import { isLoggedIn, setAuthTokens, clearAuthTokens, getAccessToken, getRefreshT
 export const authOptions: NextAuthOptions = {
   // https://next-auth.js.org/configuration/providers/oauth
 
-  site: process.env.PUBLIC_URL,
+  site: process.env.NEXT_PUBLIC_PUBLIC_URL,
   secret: process.env.NEXTAUTH_SECRET, // Ensure you have this set in your .env file
   //adapter: PrismaAdapter(prisma),
   providers: [
diff --git a/pages/api/shiftgenerate.ts b/pages/api/shiftgenerate.ts
index 409d580..f0137f6 100644
--- a/pages/api/shiftgenerate.ts
+++ b/pages/api/shiftgenerate.ts
@@ -444,7 +444,7 @@ async function GenerateSchedule(axios: Axios, date: string, copyFromPreviousMont
     }
 
     //create shifts using API
-    // const { data: createdShifts } = await axios.post(`${process.env.PUBLIC_URL}/api/data/shifts`, shiftsToCreate);
+    // const { data: createdShifts } = await axios.post(`${process.env.NEXT_PUBLIC_PUBLIC_URL}/api/data/shifts`, shiftsToCreate);
     //const { data: allshifts } = await axios.get(`/api/data/shifts`);
     return {}; //allshifts;
 
diff --git a/pages/cart/availabilities/index.tsx b/pages/cart/availabilities/index.tsx
index 23a14c1..2f44dc3 100644
--- a/pages/cart/availabilities/index.tsx
+++ b/pages/cart/availabilities/index.tsx
@@ -133,7 +133,7 @@ export const getServerSideProps = async (context) => {
 
   const role = session?.user.role;
   console.log("server role: " + role);
-  var queryUrl = process.env.PUBLIC_URL + "/api/data/availabilities?select=id,name,isActive,dayofweek,dayOfMonth,startTime,endTime,publisher.firstName,publisher.lastName,publisher.id";
+  var queryUrl = process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/availabilities?select=id,name,isActive,dayofweek,dayOfMonth,startTime,endTime,publisher.firstName,publisher.lastName,publisher.id";
   if (role === UserRole.USER || context.query.my) {
     queryUrl += `&where={"publisherId":"${session?.user.id}"}`;
   } else if (role == UserRole.ADMIN) {
@@ -145,7 +145,7 @@ export const getServerSideProps = async (context) => {
   }
   var resp = await axios.get(
     queryUrl
-    // process.env.PUBLIC_URL + "/api/data/availabilities?include=publisher",
+    // process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/availabilities?include=publisher",
     , { decompress: true });
   var items = resp.data;
   console.log("got " + items.length + " availabilities");
diff --git a/pages/cart/availabilities/new.tsx b/pages/cart/availabilities/new.tsx
index e10fd2b..06a91b7 100644
--- a/pages/cart/availabilities/new.tsx
+++ b/pages/cart/availabilities/new.tsx
@@ -31,7 +31,7 @@ export const getServerSideProps = async (context) => {
     };
   }
   const { data: item } = await axios.get(
-    process.env.PUBLIC_URL + "/api/data/availabilities/" + context.params.id
+    process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/availabilities/" + context.params.id
   );
 
   return {
diff --git a/pages/cart/calendar/index.tsx b/pages/cart/calendar/index.tsx
index 594c22e..5bb9269 100644
--- a/pages/cart/calendar/index.tsx
+++ b/pages/cart/calendar/index.tsx
@@ -891,9 +891,9 @@ import axiosServer from '../../../src/axiosServer';
 import { start } from 'repl';
 export const getServerSideProps = async (context) => {
     const axios = await axiosServer(context);
-    const baseUrl = common.getBaseUrl();
-    console.log('runtime BaseUrl: ' + baseUrl);
-    console.log('runtime PUBLIC_URL: ' + process.env.PUBLIC_URL);
+    // const baseUrl = common.getBaseUrl();
+    // console.log('runtime BaseUrl: ' + baseUrl);
+    console.log('runtime NEXT_PUBLIC_PUBLIC_URL: ' + process.env.NEXT_PUBLIC_PUBLIC_URL);
     console.log('Runtime Axios Base URL:', axios.defaults.baseURL);
 
     const currentDate = new Date();
diff --git a/pages/cart/cartevents/edit/[id].tsx b/pages/cart/cartevents/edit/[id].tsx
index 08b8428..689c487 100644
--- a/pages/cart/cartevents/edit/[id].tsx
+++ b/pages/cart/cartevents/edit/[id].tsx
@@ -7,9 +7,9 @@ export const getServerSideProps = async (context) => {
     console.log("edit page getServerSideProps");
     const axios = await axiosServer(context);
     const { id } = context.query;
-    const { data } = await axios.get(`${process.env.PUBLIC_URL}/api/data/cartevents/` + id);
+    const { data } = await axios.get(`${process.env.NEXT_PUBLIC_PUBLIC_URL}/api/data/cartevents/` + id);
     const locations = await axios
-        .get(`${process.env.PUBLIC_URL}/api/data/locations?select=id,name`)
+        .get(`${process.env.NEXT_PUBLIC_PUBLIC_URL}/api/data/locations?select=id,name`)
         .then((res) => {
             console.log("locations: " + JSON.stringify(res.data));
             return res.data;
diff --git a/pages/cart/cartevents/new.tsx b/pages/cart/cartevents/new.tsx
index 522f489..0e098f6 100644
--- a/pages/cart/cartevents/new.tsx
+++ b/pages/cart/cartevents/new.tsx
@@ -26,7 +26,7 @@ export const getServerSideProps = async (context) => {
 
     const axios = await axiosServer(context);
     const locations = await axios
-        .get(`${process.env.PUBLIC_URL}/api/data/locations?select=id,name`)
+        .get(`${process.env.NEXT_PUBLIC_PUBLIC_URL}/api/data/locations?select=id,name`)
         .then((res) => {
             console.log("locations: " + JSON.stringify(res.data));
             return res.data;
@@ -41,7 +41,7 @@ export const getServerSideProps = async (context) => {
 
     const { id } = context.query.id;
     const { data: item } = await axiosInstance.get(
-        process.env.PUBLIC_URL + "/api/data/cartevents/" + context.params.id
+        process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/cartevents/" + context.params.id
     );
 
     return {
diff --git a/pages/cart/locations/[id].tsx b/pages/cart/locations/[id].tsx
index 523478b..c66f338 100644
--- a/pages/cart/locations/[id].tsx
+++ b/pages/cart/locations/[id].tsx
@@ -99,11 +99,11 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
     const axios = await axiosServer(context);
 
     const { data: location } = await axios.get(
-        `${process.env.PUBLIC_URL}/api/data/locations/${context.params.id}`
+        `${process.env.NEXT_PUBLIC_PUBLIC_URL}/api/data/locations/${context.params.id}`
     );
     if (location.backupLocationId !== null) {
         const { data: backupLocation } = await axios.get(
-            process.env.PUBLIC_URL + "/api/data/locations/" + location.backupLocationId
+            process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/locations/" + location.backupLocationId
         );
         location.backupLocationName = backupLocation.name;
         location.backupLocationContent = backupLocation ? backupLocation.content : "";
diff --git a/pages/cart/locations/edit/[id].tsx b/pages/cart/locations/edit/[id].tsx
index 90ba81f..a48f89a 100644
--- a/pages/cart/locations/edit/[id].tsx
+++ b/pages/cart/locations/edit/[id].tsx
@@ -29,7 +29,7 @@ export const getServerSideProps = async (context) => {
     };
   }
   const { data: item } = await axios.get(
-    process.env.PUBLIC_URL + "/api/data/locations/" + context.params.id
+    process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/locations/" + context.params.id
   );
   console.log(item) //this is the location object
   context.res.setHeader("Cache-Control", "s-maxage=1, stale-while-revalidate");
diff --git a/pages/cart/locations/new.tsx b/pages/cart/locations/new.tsx
index e1c7137..a76cf0a 100644
--- a/pages/cart/locations/new.tsx
+++ b/pages/cart/locations/new.tsx
@@ -32,7 +32,7 @@ export const getServerSideProps = async (context) => {
   }
 
   const { data: loc } = await axios.get(
-    `${process.env.PUBLIC_URL}api/data/locations/` + context.params.id
+    `${process.env.NEXT_PUBLIC_PUBLIC_URL}api/data/locations/` + context.params.id
   );
   console.log(location) //this is the location object
   context.res.setHeader("Cache-Control", "s-maxage=1, stale-while-revalidate");
diff --git a/pages/cart/publishers/edit/[id].tsx b/pages/cart/publishers/edit/[id].tsx
index 484910f..0e93b9a 100644
--- a/pages/cart/publishers/edit/[id].tsx
+++ b/pages/cart/publishers/edit/[id].tsx
@@ -44,7 +44,7 @@ export const getServerSideProps = async (context) => {
       props: {}
     };
   }
-  var url = process.env.PUBLIC_URL + "/api/data/publishers/" + context.query.id + "?include=availabilities,assignments,assignments.shift";
+  var url = process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/publishers/" + context.query.id + "?include=availabilities,assignments,assignments.shift";
   console.log("GET PUBLISHER FROM:" + url)
   const { data: item } = await axios.get(url);
 
diff --git a/pages/cart/publishers/new.tsx b/pages/cart/publishers/new.tsx
index f9f62fb..c0b1988 100644
--- a/pages/cart/publishers/new.tsx
+++ b/pages/cart/publishers/new.tsx
@@ -47,7 +47,7 @@ export const getServerSideProps = async (context) => {
       props: {}
     };
   }
-  var url = process.env.PUBLIC_URL + "/api/data/publishers/" + context.query.id + "?include=availabilities,shifts";
+  var url = process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/publishers/" + context.query.id + "?include=availabilities,shifts";
   console.log("GET PUBLISHER FROM:" + url)
   const { data } = await axios.get(url);
 
diff --git a/pages/cart/reports/experience.tsx b/pages/cart/reports/experience.tsx
index c41079a..9e4df08 100644
--- a/pages/cart/reports/experience.tsx
+++ b/pages/cart/reports/experience.tsx
@@ -32,7 +32,7 @@ export const getServerSideProps = async (context) => {
     //     };
     // }
     // const { data: loc } = await axiosInstance.get(
-    //     `${process.env.PUBLIC_URL}api/data/locations/` + context.params.id
+    //     `${process.env.NEXT_PUBLIC_PUBLIC_URL}api/data/locations/` + context.params.id
     // );
 
     // console.log(location) //this is the location object
diff --git a/pages/cart/reports/report.tsx b/pages/cart/reports/report.tsx
index b416704..8c7bcff 100644
--- a/pages/cart/reports/report.tsx
+++ b/pages/cart/reports/report.tsx
@@ -33,7 +33,7 @@ export const getServerSideProps = async (context) => {
     // }
 
     // const { data: loc } = await axiosInstance.get(
-    //     `${process.env.PUBLIC_URL}api/data/locations/` + context.params.id
+    //     `${process.env.NEXT_PUBLIC_PUBLIC_URL}api/data/locations/` + context.params.id
     // );
     // console.log(location) //this is the location object
     // context.res.setHeader("Cache-Control", "s-maxage=1, stale-while-revalidate");
diff --git a/server.js b/server.js
index c48323b..9c355ab 100644
--- a/server.js
+++ b/server.js
@@ -43,7 +43,7 @@ const dev = process.env.NODE_ENV !== "production";
 const nextApp = next({ dev });
 const nextHandler = nextApp.getRequestHandler();
 console.log("process.env.PROTOCOL = ", process.env.PROTOCOL);
-console.log("process.env.PUBLIC_URL = ", process.env.NEXT_PUBLIC_PUBLIC_URL);
+console.log("process.env.NEXT_PUBLIC_PUBLIC_URL = ", process.env.NEXT_PUBLIC_PUBLIC_URL);
 console.log("process.env.PORT = ", process.env.PORT);
 console.log("process.env.TELEGRAM_BOT = ", process.env.TELEGRAM_BOT);