diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 2f4d5456..04b5d408 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -16,16 +16,14 @@ jobs:
     - name: Set up Docker Buildx
       run: |
         docker buildx create --use
-    - name: Authenticate
-      uses: docker/login-action@v1
-      with:
-        registry: quay.io
-        username: ${{ secrets.QUAY_USERNAME }}
-        password: ${{ secrets.QUAY_PASSWORD }}
-    - name: Build and Push Multiarch image
+    - name: Log in to GitHub Container Registry
+      run: |
+        echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+    - name: Build and Push Multiarch Image to ghcr.io
       run: |
         docker buildx build \
           --file ./Containerfile \
-          --platform linux/arm64,linux/amd64\
-          --tag quay.io/wizhao/tft-tools:latest \
-          --push .
+          --platform linux/arm64,linux/amd64 \
+          --tag ghcr.io/${{ github.repository_owner }}/ocp-traffic-flow-tests:pr_test \
+          --push \
+          .
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 6c3c9618..f3979841 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -20,6 +20,6 @@ jobs:
       run: |
         docker buildx build \
           --file ./Containerfile \
-          --platform linux/arm64,linux/amd64\
-          --tag quay.io/wizhao/tft-tools:pr_test \
+          --platform linux/arm64,linux/amd64 \
+          --tag ghcr.io/${{ github.repository_owner }}/ocp-traffic-flow-tests:pr_test \
           .