diff --git a/EnvironmentVariables.md b/EnvironmentVariables.md
index d0f63a4..5dbd60c 100644
--- a/EnvironmentVariables.md
+++ b/EnvironmentVariables.md
@@ -17,7 +17,7 @@
     - test-ehr
       - `oauth_token`
     - request-generator
-      - `REACT_APP_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH`
+      - `VITE_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH`
     - rems-administrator
       - `MONGO_URL`
     - pims_remsadmin_mongo
@@ -84,34 +84,31 @@
     - `HTTPS`
     - `HTTPS_CERT_PATH`
     - `HTTPS_KEY_PATH`
-    - `REACT_APP_ALT_DRUG`
-    - `REACT_APP_AUTH`
-    - `REACT_APP_CDS_SERVICE`
-    - `REACT_APP_CLIENT`
-    - `REACT_APP_CLIENT_SCOPES`
-    - `REACT_APP_DEFAULT_USER`
-    - `REACT_APP_EHR_BASE`
-    - `REACT_APP_EHR_LINK`
-    - `REACT_APP_EHR_SERVER`
-    - `REACT_APP_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH`
-    - `REACT_APP_GENERATE_JWT`
-    - `REACT_APP_GH_PAGES`
-    - `REACT_APP_HOMEPAGE`
-    - `REACT_APP_LAUNCH_URL`
-    - `REACT_APP_ORDER_SELECT`
-    - `REACT_APP_ORDER_SIGN`
-    - `REACT_APP_PASSWORD`
-    - `REACT_APP_PATIENT_FHIR_QUERY`
-    - `REACT_APP_PATIENT_VIEW`
-    - `REACT_APP_PIMS_SERVER`
-    - `REACT_APP_PUBLIC_KEYS`
-    - `REACT_APP_REALM`
-    - `REACT_APP_RESPONSE_EXPIRATION_DAYS`
-    - `REACT_APP_SERVER`
-    - `REACT_APP_SMART_LAUNCH_URL`
-    - `REACT_APP_URL`
-    - `REACT_APP_URL_FILTER`
-    - `REACT_APP_USER`
+    - `VITE_ALT_DRUG`
+    - `VITE_AUTH`
+    - `VITE_CDS_SERVICE`
+    - `VITE_CLIENT`
+    - `VITE_CLIENT_SCOPES`
+    - `VITE_DEFAULT_USER`
+    - `VITE_EHR_BASE`
+    - `VITE_EHR_LINK`
+    - `VITE_EHR_SERVER`
+    - `VITE_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH`
+    - `VITE_GENERATE_JWT`
+    - `VITE_GH_PAGES`
+    - `VITE_HOMEPAGE`
+    - `VITE_LAUNCH_URL`
+    - `VITE_PASSWORD`
+    - `VITE_PATIENT_FHIR_QUERY`
+    - `VITE_PIMS_SERVER`
+    - `VITE_PUBLIC_KEYS`
+    - `VITE_REALM`
+    - `VITE_RESPONSE_EXPIRATION_DAYS`
+    - `VITE_SERVER`
+    - `VITE_SMART_LAUNCH_URL`
+    - `VITE_URL`
+    - `VITE_URL_FILTER`
+    - `VITE_USER`
 
 - mcode/pims
   - backend/env.json
@@ -191,48 +188,45 @@
   - src/registerServiceWorker.js
     - `NODE_ENV`
     - `PUBLIC_URL`
-  - src/containers/RequestBuilder.js
-    - `REACT_APP_ALT_DRUG`
-    - `REACT_APP_CDS_SERVICE`
-    - `REACT_APP_CLIENT`
-    - `REACT_APP_CLIENT_SCOPES`
-    - `REACT_APP_DEFAULT_USER`
-    - `REACT_APP_EHR_BASE`
-    - `REACT_APP_EHR_SERVER`
-    - `REACT_APP_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH`
-    - `REACT_APP_GENERATE_JWT`
-    - `REACT_APP_LAUNCH_URL`
-    - `REACT_APP_ORDER_SELECT`
-    - `REACT_APP_ORDER_SIGN`
-    - `REACT_APP_PATIENT_FHIR_QUERY`
-    - `REACT_APP_PATIENT_VIEW`
-    - `REACT_APP_PIMS_SERVER`
-    - `REACT_APP_RESPONSE_EXPIRATION_DAYS`
-    - `REACT_APP_CLIENT_SCOPES`
-    - `REACT_APP_SMART_LAUNCH_URL`
-    - `REACT_APP_URL_FILTER`
+  - src/util/data.js
+    - `VITE_ALT_DRUG`
+    - `VITE_CDS_SERVICE`
+    - `VITE_CLIENT`
+    - `VITE_CLIENT_SCOPES`
+    - `VITE_DEFAULT_USER`
+    - `VITE_EHR_BASE`
+    - `VITE_EHR_SERVER`
+    - `VITE_EHR_SERVER_TO_BE_SENT_TO_REMS_ADMIN_FOR_PREFETCH`
+    - `VITE_GENERATE_JWT`
+    - `VITE_LAUNCH_URL`
+    - `VITE_PATIENT_FHIR_QUERY`
+    - `VITE_PIMS_SERVER`
+    - `VITE_RESPONSE_EXPIRATION_DAYS`
+    - `VITE_CLIENT_SCOPES`
+    - `VITE_SMART_LAUNCH_URL`
+    - `VITE_URL_FILTER`
   - src/util/auth.js
-    - `REACT_APP_AUTH`
-    - `REACT_APP_CLIENT`
-    - `REACT_APP_PASSWORD`
-    - `REACT_APP_PUBLIC_KEYS`
-    - `REACT_APP_REALM`
-    - `REACT_APP_USER`
+    - `VITE_AUTH`
+    - `VITE_CLIENT`
+    - `VITE_PASSWORD`
+    - `VITE_PUBLIC_KEYS`
+    - `VITE_REALM`
+    - `VITE_USER`
   - src/components/SMARTBox/EHRLaunchBox.js
-    - `REACT_APP_EHR_LINK`
+    - `VITE_EHR_LINK`
   - src/components/App.js
-    - `REACT_APP_GH_PAGES`
+    - `VITE_GH_PAGES`
   - src/components/Auth/Login.jsx
-    - `REACT_APP_AUTH`
-    - `REACT_APP_CLIENT`
-    - `REACT_APP_REALM`
+    - `VITE_AUTH`
+    - `VITE_CLIENT`
+    - `VITE_REALM`
   - src/components/Dashboard/DashboardElement.jsx
-    - `REACT_APP_LAUNCH_URL`
+    - `VITE_LAUNCH_URL`
   - src/containers/Launch.jsx
-    - `REACT_APP_CLIENT`
-    - `REACT_APP_EHR_BASE`
+    - `VITE_CLIENT`
+    - `VITE_EHR_BASE`
   - src/containers/PatientPortal.jsx
-    - `REACT_APP_EHR_BASE`
+    - `VITE_EHR_BASE`
 
 - mcode/pims