diff --git a/src/common/sendFeedback.js b/src/common/sendFeedback.js
index 4883587..15d2ab0 100644
--- a/src/common/sendFeedback.js
+++ b/src/common/sendFeedback.js
@@ -17,14 +17,14 @@ export default async function sendFeedback({ name, email, message, category, ext
   }
 
   const msg = {
-    to: import.meta.env.HELP_DESK_EMAIL,
+    to: import.meta.env.VITE_HELP_DESK_EMAIL,
     from: email,
     subject: `gatewayEdit App: ${category}`,
     text: fullMessage,
     html: fullMessage.replace(/\n/g, '<br>'),
   }
 
-  sgMail.setApiKey(import.meta.env.HELP_DESK_TOKEN)
+  sgMail.setApiKey(import.meta.env.VITE_HELP_DESK_TOKEN)
 
   return sgMail.send(msg)
 }
diff --git a/src/components/Layout.jsx b/src/components/Layout.jsx
index 2c42c5f..0d26b62 100644
--- a/src/components/Layout.jsx
+++ b/src/components/Layout.jsx
@@ -90,7 +90,7 @@ export default function Layout({
       let server_ = (serverID_ === QA) ? QA_BASE_URL : BASE_URL
 
       if (params.get('server')?.length === 0){
-        server_ = (import.meta.env.NEXT_PUBLIC_BUILD_CONTEXT === 'production') ? BASE_URL : QA_BASE_URL
+        server_ = (import.meta.env.VITE_NEXT_PUBLIC_BUILD_CONTEXT === 'production') ? BASE_URL : QA_BASE_URL
         serverID_ = (server_ === QA_BASE_URL) ? QA : PROD
       }
 
diff --git a/src/context/AuthContext.jsx b/src/context/AuthContext.jsx
index e988c00..1517a3d 100644
--- a/src/context/AuthContext.jsx
+++ b/src/context/AuthContext.jsx
@@ -22,7 +22,7 @@ export const AuthContext = createContext({})
 export default function AuthContextProvider(props) {
   const [authentication, setAuthentication] = useState(null)
   const [networkError, setNetworkError] = useState(null)
-  const defaultServer = (import.meta.env.NEXT_PUBLIC_BUILD_CONTEXT === 'production') ? BASE_URL : QA_BASE_URL
+  const defaultServer = (import.meta.env.VITE_NEXT_PUBLIC_BUILD_CONTEXT === 'production') ? BASE_URL : QA_BASE_URL
   const [server, setServer] = useLocalStorage(SERVER_KEY, defaultServer)
 
   /**
diff --git a/src/utils/build.js b/src/utils/build.js
index 0336e9b..6c61f85 100644
--- a/src/utils/build.js
+++ b/src/utils/build.js
@@ -10,7 +10,7 @@ export function getCommitHash() {
   let commitHash
 
   try {
-    commitHash = import.meta.env.NEXT_PUBLIC_BUILD_NUMBER
+    commitHash = import.meta.env.VITE_NEXT_PUBLIC_BUILD_NUMBER
   } catch (e) {
     console.error(`getCommitHash() - could not get commit hash`, e)
   }