diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc33459cdd..f863c233d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,6 +35,9 @@ jobs:
            ports:
              - 10389:10389
              - 10636:10636
+           credentials: 
+             username: ${{ secrets.DOCKERHUB_PUBLIC_USERNAME }}
+             password: ${{ secrets.DOCKERHUB_PUBLIC_TOKEN }}
       sql-server:
         # Docker Hub image
         image: mcr.microsoft.com/mssql/server:2019-latest
@@ -57,6 +60,9 @@ jobs:
         ports:
           # Maps port 6379 on service container to the host
           - 6379:6379
+        credentials: 
+           username: ${{ secrets.DOCKERHUB_PUBLIC_USERNAME }}
+           password: ${{ secrets.DOCKERHUB_PUBLIC_TOKEN }}
       greenmail:
         image: greenmail/standalone:1.6.9
         ports:
@@ -67,9 +73,17 @@ jobs:
           - 3993:3993 #IMAPS
           - 3995:3995 #POP3S
           - 8080:8080 #API
+        credentials: 
+           username: ${{ secrets.DOCKERHUB_PUBLIC_USERNAME }}
+           password: ${{ secrets.DOCKERHUB_PUBLIC_TOKEN }}
     steps:
     # when workflow is run via a workflow_call, these vars are found under input, which doesn't exist otherwise
     # so lets copy them over to the normal env vars
+    -  name: Login to Docker Hub
+       uses: docker/login-action@v3
+       with:
+         username: ${{ secrets.DOCKERHUB_PUBLIC_USERNAME }}
+         password: ${{ secrets.DOCKERHUB_PUBLIC_TOKEN }}
     - name: Configure Build Java Version
       if: ${{ inputs.LUCEE_BUILD_JAVA_VERSION != '' }}
       run: echo "LUCEE_BUILD_JAVA_VERSION=${{ inputs.LUCEE_BUILD_JAVA_VERSION }}" >> $GITHUB_ENV