diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 2fded35..cf34917 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -10,7 +10,9 @@ jobs:
     name: Check tsc, lint, and prettier on front end
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+        with:
+          clean: true
       - uses: actions/setup-node@v1
         with:
           node-version: "21.x"
diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml
index b200c39..ec8a582 100644
--- a/.github/workflows/docker-cd-dev.yml
+++ b/.github/workflows/docker-cd-dev.yml
@@ -13,6 +13,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+          clean: true
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index ae0531e..f3e761f 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -13,6 +13,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+          clean: true
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index afc5a9d..7920151 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -13,6 +13,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+          clean: true
 
       - name: Test Server Docker image Builds
         run: docker build .
diff --git a/.github/workflows/docker-tag-cd.yml b/.github/workflows/docker-tag-cd.yml
index bc659d3..ec64f01 100644
--- a/.github/workflows/docker-tag-cd.yml
+++ b/.github/workflows/docker-tag-cd.yml
@@ -13,6 +13,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+          clean: true
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
diff --git a/backend/src/database/schemas/doctorOrderSchemas.js b/backend/src/database/schemas/doctorOrderSchemas.js
index 55e8b29..aba505c 100644
--- a/backend/src/database/schemas/doctorOrderSchemas.js
+++ b/backend/src/database/schemas/doctorOrderSchemas.js
@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 export const orderSchema = new mongoose.Schema({
+  orderId: String,
   caseNumber: String,
-  authNumber: String,
   prescriberOrderNumber: String,
   patientName: String,
   patientFirstName: String,
diff --git a/backend/src/routes/doctorOrders.js b/backend/src/routes/doctorOrders.js
index 8f5ba55..c0f46b7 100644
--- a/backend/src/routes/doctorOrders.js
+++ b/backend/src/routes/doctorOrders.js
@@ -278,15 +278,15 @@ const getGuidanceResponse = async order => {
     return null;
   }
 
-  // Make the etasu call with the auth number if it exists, if not call with patient and medication
+  // Make the etasu call with the case number if it exists, if not call with patient and medication
   let body = {};
-  if (order.authNumber !== '' && !env.USE_INTERMEDIARY) {
+  if (order.caseNumber && !env.USE_INTERMEDIARY) {
     body = {
       resourceType: 'Parameters',
       parameter: [
         {
-          name: 'authNumber',
-          valueString: order.authNumber
+          name: 'caseNumber',
+          valueString: order.caseNumber
         }
       ]
     };
@@ -334,7 +334,7 @@ const getGuidanceResponse = async order => {
       'content-type': 'application/json'
     }
   });
-  console.log('Retrieved order', response);
+  console.log('Retrieved order', JSON.stringify(response.data, null, 4));
   console.log('URL', etasuUrl);
   const responseResource = response.data.parameter?.[0]?.resource;
   return responseResource;
@@ -358,8 +358,8 @@ const getDispenseStatus = (order, guidanceResponse) => {
 async function parseNCPDPScript(newRx) {
   // Parsing  XML NCPDP SCRIPT from EHR
   const incompleteOrder = {
-    caseNumber: newRx.Message.Header.MessageID.toString(), // Will need to return to this and use actual pt identifier or uuid
-    authNumber: newRx.Message.Header.AuthorizationNumber,
+    orderId: newRx.Message.Header.MessageID.toString(), // Will need to return to this and use actual pt identifier or uuid
+    caseNumber: newRx.Message.Header.AuthorizationNumber,
     prescriberOrderNumber: newRx.Message.Header.PrescriberOrderNumber,
     patientName:
       newRx.Message.Body.NewRx.Patient.HumanPatient.Name.FirstName +
diff --git a/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx b/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx
index ccaf478..b5af968 100644
--- a/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx
+++ b/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx
@@ -28,16 +28,15 @@ type Requirement = {
   };
 };
 
-type AuthNumber = {
-  name: 'auth_number';
+type CaseNumber = {
+  name: 'case_number';
   valueString: string;
 };
 
-type MetRequirements = Requirement | AuthNumber;
+type MetRequirements = Requirement | CaseNumber;
 
 export type DoctorOrder = {
   caseNumber?: string;
-  authNumber?: string;
   patientName?: string;
   patientDOB?: string;
   doctorName?: string;
@@ -69,7 +68,7 @@ const EtasuPopUp = (props: any) => {
   const [doctorOrder, setDoctorOrder] = useState<DoctorOrder>();
 
   const etasuElements = (
-    (doctorOrder?.metRequirements || []).filter(m => m.name !== 'auth_number') as Requirement[]
+    (doctorOrder?.metRequirements || []).filter(m => m.name !== 'case_number') as Requirement[]
   ).sort((first: Requirement, second: Requirement) => {
     // Keep the other forms unsorted.
     if (second.name.includes('Patient Status Update')) {
diff --git a/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx b/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx
index 439d910..998678b 100644
--- a/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx
+++ b/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx
@@ -20,8 +20,8 @@ import PickedUpButton from './PickedUpButton';
 import VerifyButton from './VerifyButton';
 
 export type DoctorOrder = {
+  orderId?: string;
   caseNumber?: string;
-  authNumber?: string;
   patientName?: string;
   patientDOB?: string;
   doctorName?: string;
@@ -111,7 +111,7 @@ const OrderCard = (props: { tabStatus: TabStatus }) => {
     return (
       <Card sx={{ bgcolor: '#F5F5F7' }}>
         {doctorOrders.map(row => (
-          <Card key={row.caseNumber} sx={{ minWidth: 275, margin: 2, boxShadow: '10px' }}>
+          <Card key={row.orderId} sx={{ minWidth: 275, margin: 2, boxShadow: '10px' }}>
             <Card>
               <CardContent>
                 <Box>