diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 7a85751..42483bb 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -1,14 +1,16 @@
 name: Build and Publish Docker Image
 
 on:
+  push:
+    branches:
+      - main
   pull_request:
     branches:
       - main
 
 jobs:
-  build:
+  build-and-publish:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -20,8 +22,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.PAT_YT_PODCAST }}
 
-      - name: Build Docker image
-        run: docker build -t ghcr.io/${{ github.actor }}/${{ github.repository }}:latest .
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
-      - name: Push Docker image to GitHub Container Registry
-        run: docker push ghcr.io/${{ github.actor }}/${{ github.repository }}:latest
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ghcr.io/${{ github.actor }}/${{ github.repository }}:latest
\ No newline at end of file