diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml
index d0b0d64fe..dd5ffa4b3 100644
--- a/.github/workflows/publish-and-test.yml
+++ b/.github/workflows/publish-and-test.yml
@@ -204,7 +204,7 @@ jobs:
           repository: ${{github.repository}}
 
       - name: Run OpenELS image
-        run: docker-compose -f test.docker-compose.yml up -d
+        run: docker compose -f test.docker-compose.yml up -d
 
       - name: Cypress run
         uses: cypress-io/github-action@v6
diff --git a/frontend/cypress/e2e/batchOrderEntry.cy.js b/frontend/cypress/e2e/batchOrderEntry.cy.js
index 5ade8134b..eb84d94e6 100644
--- a/frontend/cypress/e2e/batchOrderEntry.cy.js
+++ b/frontend/cypress/e2e/batchOrderEntry.cy.js
@@ -51,9 +51,15 @@ describe("Batch Order Entry On Demand", function () {
 
   it("Should Validate Fields And Generate BarCode", function () {
     cy.fixture("BatchOrder").then((batchOrderData) => {
-      batchOrder.validateField("#tag-54", batchOrderData.sampleType);
-      batchOrder.validateField("#tag-56", batchOrderData.panel);
-      batchOrder.validateField("#tag-58", batchOrderData.facility);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(8)",
+        batchOrderData.sampleType,
+      );
+      batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(13)",
+        batchOrderData.facility,
+      );
       batchOrder.checkNextLabel().should("be.disabled");
       batchOrder.clickGenerateAndSaveBarcode();
       batchOrder.checkNextLabel().should("be.visible");
@@ -95,9 +101,15 @@ describe("Batch Order Entry Pre Printed", function () {
 
   it("Should Validate Fields", function () {
     cy.fixture("BatchOrder").then((batchOrderData) => {
-      batchOrder.validateField("#tag-58", batchOrderData.sampleType);
-      batchOrder.validateField("#tag-60", batchOrderData.panel);
-      batchOrder.validateField("#tag-62", batchOrderData.facility);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(8)",
+        batchOrderData.sampleType,
+      );
+      batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel);
+      batchOrder.validateField(
+        ":nth-child(1) > .cds--subgrid > :nth-child(13)",
+        batchOrderData.facility,
+      );
     });
   });