diff --git a/package-lock.json b/package-lock.json
index f9505c1..c8c7cbc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7849,14 +7849,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/dotenv": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/dotenv-expand": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
@@ -15972,6 +15964,14 @@
         }
       }
     },
+    "node_modules/react-scripts/node_modules/dotenv": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/react-spinners": {
       "version": "0.13.8",
       "resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.13.8.tgz",
diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js
index d5dc72d..98c1756 100644
--- a/src/Components/Document/DocEditPage.js
+++ b/src/Components/Document/DocEditPage.js
@@ -54,6 +54,11 @@ const DocEditPage = () => {
   const zipCode = group ? group.zipCode : null;
   const telephone = group ? group.telephone : null;
 
+  const apiUrl =
+    process.env.NODE_ENV === "development"
+      ? process.env.REACT_APP_API_DEV
+      : process.env.REACT_APP_API_PROD;
+
   const displayCopy =
     state === "New York"
       ? docEditCopy.NewYork
@@ -90,8 +95,6 @@ const DocEditPage = () => {
     }
   };
 
-  const baseUrl = "http://localhost:4000";
-
   const headerString =
     documentType === "interrogatories" ? (
       "Response to Interrogatories"
@@ -212,7 +215,7 @@ const DocEditPage = () => {
       const docType = String(documentType);
       try {
         const response = await fetch(
-          `${baseUrl}/getParsedRequests/${documentId}/${docType}`,
+          `${apiUrl}/getParsedRequests/${documentId}/${docType}`,
           {
             method: "GET",
           }
@@ -231,7 +234,7 @@ const DocEditPage = () => {
 
   async function getCompletions(docId) {
     const docType = String(documentType);
-    const response = await fetch(`${baseUrl}/completions/${docId}/${docType}`, {
+    const response = await fetch(`${apiUrl}/completions/${docId}/${docType}`, {
       method: "GET",
     });
     const req = await response.json();
@@ -246,11 +249,15 @@ const DocEditPage = () => {
     let mode;
     //TODO: remove isRequests var
     const isRequests = false;
-
+    console.log(
+      "generateResponsesCombined docmentId docType",
+      documentId,
+      docType
+    );
     try {
       setIsLoading(true);
       fetch(
-        `${baseUrl}/genResponseFromArrayCombined/${documentId}/${docType}/${isRequests}`,
+        `${apiUrl}/genResponseFromArrayCombined/${documentId}/${docType}/${isRequests}`,
         {
           method: "GET",
         }
@@ -289,7 +296,7 @@ const DocEditPage = () => {
     try {
       setIsLoading(true);
       fetch(
-        `${baseUrl}/genResponseFromArray/${documentId}/${docType}/${isRequests}`,
+        `${apiUrl}/genResponseFromArray/${documentId}/${docType}/${isRequests}`,
         {
           method: "GET",
         }
@@ -323,7 +330,7 @@ const DocEditPage = () => {
     obj["requests"] = responses;
     const data = JSON.stringify(obj);
     try {
-      const response = await fetch(`${baseUrl}/storecompletions`, {
+      const response = await fetch(`${apiUrl}/storecompletions`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         json: true,
@@ -347,7 +354,7 @@ const DocEditPage = () => {
   async function cleanUpDocx() {
     const docId = documentId;
     const reqType = documentType;
-    fetch(`${baseUrl}/cleanUpDocx/${docId}/${reqType}`, {
+    fetch(`${apiUrl}/cleanUpDocx/${docId}/${reqType}`, {
       method: "GET",
     })
       .then((response) => {
@@ -361,7 +368,7 @@ const DocEditPage = () => {
   async function getDocx() {
     const docId = documentId;
     const reqType = documentType;
-    fetch(`${baseUrl}/getDocx/${docId}/${reqType}`, {
+    fetch(`${apiUrl}/getDocx/${docId}/${reqType}`, {
       method: "GET",
     }).then((response) => {
       response.blob().then((blob) => {
@@ -394,7 +401,7 @@ const DocEditPage = () => {
       : null;
 
     try {
-      const response = await fetch(`${baseUrl}/genDocx/${docId}/${reqType}`, {
+      const response = await fetch(`${apiUrl}/genDocx/${docId}/${reqType}`, {
         method: "POST",
         headers: {
           Accept: "application/json",
@@ -446,7 +453,7 @@ const DocEditPage = () => {
     obj["requests"] = responses;
     const data = JSON.stringify(obj);
     try {
-      const response = await fetch(`${baseUrl}/storeeditedcompletions`, {
+      const response = await fetch(`${apiUrl}/storeeditedcompletions`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         json: true,
diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index e0f618a..68fe57f 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -32,11 +32,17 @@ const DocumentListPage = ({ perPage }) => {
   const [page, setPage] = useState(1);
   const [order, setOrder] = useState("parentCaseName");
   const appUserId = group ? group.appUserId : null;
-  const baseUrl = "http://localhost:4000";
+
   const [isBusy, setIsBusy] = useState(false);
   const [selectedDocumentType, setSelectedDocumentType] = useState();
   const [showModal, setShowModal] = useState(false);
 
+  const apiUrl =
+    process.env.NODE_ENV === "development"
+      ? process.env.REACT_APP_API_DEV
+      : process.env.REACT_APP_API_PROD;
+
+  console.log("apiUrl", apiUrl);
   useEffect(() => {
     if (count.current == null) {
       setIsMobile(window.innerWidth < 440);
@@ -117,7 +123,7 @@ const DocumentListPage = ({ perPage }) => {
 
     try {
       const response = await fetch(
-        `${baseUrl}/deleteDoc/${selectedDocumentId}/${selectedDocumentType}/${respGens}`,
+        `${apiUrl}/deleteDoc/${selectedDocumentId}/${selectedDocumentType}/${respGens}`,
         {
           method: "POST",
         }
diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js
index 8b5c3a9..916c4c1 100644
--- a/src/Components/Modals/UploadModal.js
+++ b/src/Components/Modals/UploadModal.js
@@ -35,8 +35,11 @@ const UploadModal = (props) => {
   const [docError, setShowDocError] = useState("");
   const fileTypes = ["PDF"];
   const fileName = fileToParse ? fileToParse.name : undefined;
-  const baseUrl = "http://localhost:4000";
-  const navigate = useNavigate();
+
+  const apiUrl =
+    process.env.NODE_ENV === "development"
+      ? process.env.REACT_APP_API_DEV
+      : process.env.REACT_APP_API_PROD;
 
   async function saveToDb(uuidName) {
     const data = {
@@ -67,7 +70,7 @@ const UploadModal = (props) => {
 
   async function uploadFile(file) {
     try {
-      const response = await fetch(`${baseUrl}/parseNewDoc`, {
+      const response = await fetch(`${apiUrl}/parseNewDoc`, {
         method: "POST",
         body: file,
       });
@@ -223,6 +226,7 @@ const UploadModal = (props) => {
                   multiple={true}
                   handleChange={handleFileChange}
                   name="file"
+                  types={fileTypes}
                 >
                   <div className={fileToParse ? "drag-box filled" : "drag-box"}>
                     {fileToParse