diff --git a/.ci/docker/docker-compose-system-test.yml b/.ci/docker/docker-compose-system-test.yml
index 03903d50..8f01794a 100644
--- a/.ci/docker/docker-compose-system-test.yml
+++ b/.ci/docker/docker-compose-system-test.yml
@@ -2,7 +2,7 @@ version: "3.1"
 
 services:
    aca:
-      image: ghcr.io/nsacyber/hirs/aca:latest
+      image: ghcr.io/nsacyber/hirs/aca-ci:latest
       container_name: hirs-aca1
       volumes:
          - ../../:/HIRS
@@ -18,7 +18,7 @@ services:
               - ${HIRS_ACA_HOSTNAME}
 
    tpmprovisioner:
-      image: ghcr.io/nsacyber/hirs/tpm2provisioner:latest
+      image: ghcr.io/nsacyber/hirs/tpm2provisioner-ci:latest
       container_name: hirs-provisioner1-tpm2
       depends_on:
          - aca
diff --git a/.github/workflows/system_test.yml b/.github/workflows/system_test.yml
index 68694067..5ee7dcca 100644
--- a/.github/workflows/system_test.yml
+++ b/.github/workflows/system_test.yml
@@ -23,18 +23,12 @@ jobs:
         distribution: 'adopt'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file  
-    - name: Login to the Github Container Registry
-      uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
     - name: ACA TPM2 Tests
       continue-on-error: true
       shell: bash
       run: |
         sudo apt-get install -y curl
-        echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+        echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
         bash .ci/system-tests/run_system_tests.sh
     - name: Archive System Test Log files
       uses: actions/upload-artifact@v2