diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 76c5e2b..6e758bf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -36,12 +36,6 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Add orchestrator context to summary
-        if: ${{ inputs.orchestrator_run_suffix != '' }}
-        run: |
-          echo "### Orchestrator" >> "$GITHUB_STEP_SUMMARY"
-          echo "Run: ${{ inputs.orchestrator_run_suffix }}" >> "$GITHUB_STEP_SUMMARY"
-
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v5
         with:
@@ -54,6 +48,15 @@ jobs:
         with:
           checkout-enabled: false
 
+      # Internal setup required by Specmatic. Sample project users can ignore this block.
+      - if: ${{ inputs.orchestrator_run_suffix != '' }}
+        uses: specmatic/specmatic-github-workflows/action-orchestrator-setup@main
+        with:
+          orchestrator-run-suffix: ${{ inputs.orchestrator_run_suffix }}
+          docker-hub-username: ${{ vars.SPECMATIC_DOCKER_HUB_USERNAME }}
+          docker-hub-token: ${{ secrets.SPECMATIC_DOCKER_HUB_TOKEN }}
+      # End: internal setup required by Specmatic.
+
       - name: Download Specmatic CLI
         shell: bash
         run: |
@@ -84,10 +87,6 @@ jobs:
           mkdir -p ~/.specmatic
           echo "${{ secrets.SPECMATIC_LICENSE_KEY }}" > ~/.specmatic/specmatic-license.txt
 
-      - name: Docker Login for snapshot image
-        if: ${{ inputs.enterprise_artifact_url != '' && github.ref == 'refs/heads/main' }}
-        run: echo ${{ secrets.SPECMATIC_DOCKER_HUB_TOKEN }} | docker login -u ${{ vars.SPECMATIC_DOCKER_HUB_USERNAME }} --password-stdin
-
       - name: Build with Maven
         run: ./mvnw --no-transfer-progress test package jacoco:report -Ptest
 
diff --git a/src/test/java/com/store/ContractTestUsingTestContainerTest.java b/src/test/java/com/store/ContractTestUsingTestContainerTest.java
index cc1e02b..5761728 100644
--- a/src/test/java/com/store/ContractTestUsingTestContainerTest.java
+++ b/src/test/java/com/store/ContractTestUsingTestContainerTest.java
@@ -24,12 +24,7 @@ public static boolean isNonCIOrLinux() {
     }
 
     private static String enterpriseImage(){
-        return "specmatic/specmatic:latest";
-        // if(!System.getenv("ENTERPRISE_ARTIFACT_URL").isEmpty()){
-        //     return "specmatic/enterprise:snapshot";
-        // }else{
-        //     return "specmatic/specmatic:latest";
-        // }
+        return "specmatic/enterprise";
     }
 
     private static final GenericContainer<?> testContainer;