diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 9295289..4ff3240 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -12,10 +12,21 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Login to DockerHub Registry
-      run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag chewbaka69/plexshare:${{ github.event.release.tag_name }} --tag chewbaka69/plexshare:latest
-    - name: Docker Push
-      run: docker push --all-tags chewbaka69/plexshare
-      
+    -
+      name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+    -
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+    -
+      name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    -
+      name: Build and push
+      uses: docker/build-push-action@v3
+      with:
+        push: true
+        tags: chewbaka69/plexshare:latest,chewbaka69/plexshare${{ github.event.release.tag_name }}