diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index c50204d..8a4ab05 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -25,6 +25,16 @@ jobs:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
           path: actions
 
+      - name: Login to GitHub Container registry
+        uses: docker/login-action@v1
+        env:
+          GITHUB_USER: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          registry: ghcr.io
+          username: $GITHUB_USER
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Validate Dockerfile
         uses: ./actions/docker/validate
         with:
diff --git a/.github/workflows/docker-build-test/action.yml b/.github/workflows/docker-build-test/action.yml
index cce2fd4..863f142 100644
--- a/.github/workflows/docker-build-test/action.yml
+++ b/.github/workflows/docker-build-test/action.yml
@@ -1,10 +1,5 @@
 name: Build docker container and run tests
 description: Assumes actions repository has been checked out
-inputs:
-  aws-access-key-id:
-    required: true
-  aws-secret-access-key:
-    required: true
 
 runs:
   using: composite
@@ -14,28 +9,27 @@ runs:
       with:
         key: docker-${{ runner.os }}-${{ hashFiles('package.json') }}
 
-    # - name: Pull base image
-    #   uses: ./actions/docker/ecr
-    #   id: login-ecr
+    # - name: Build base image
+    #   uses: ./actions/docker/build
     #   with:
-    #     ecr-repository: centos-7.9-base
-    #     aws-access-key-id: ${{ inputs.aws-access-key-id }}
-    #     aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
-    #     image-tag: latest
-    #     action: pull
+    #     image-name: ghcr.io/exabyte-io/centos-7.9-base-materials-designer
+    #     dockerfile: ./dockerfiles/centos/Dockerfile
+    # - name: Push updated base container
+    #   shell: bash -l {0}
+    #   run: |
+    #     docker push ghcr.io/exabyte-io/centos-7.9-base-materials-designer:latest
 
-    - name: Build base image
-      uses: ./actions/docker/build
-      with:
-        image-name: centos-base
-        dockerfile: ./dockerfiles/centos/Dockerfile
+    - name: Pull updated base container
+      shell: bash -l {0}
+      run: |
+        docker pull ghcr.io/exabyte-io/centos-7.9-base-materials-designer:latest
 
-    - name: Build container
+    - name: Build app container
       uses: ./actions/docker/build
       with:
         image-name: wave-test
         dockerfile: ./dockerfiles/app/Dockerfile
-        cli-args: --build-arg BASE_IMAGE=centos-base
+        cli-args: --build-arg BASE_IMAGE=ghcr.io/exabyte-io/centos-7.9-base-materials-designer
 
     - name: Run tests
       shell: bash -l {0}