diff --git a/.gitea/workflows/merge-master-tag-deploy.yaml b/.gitea/workflows/merge-master-tag-deploy.yaml
index 85562df..40855ce 100644
--- a/.gitea/workflows/merge-master-tag-deploy.yaml
+++ b/.gitea/workflows/merge-master-tag-deploy.yaml
@@ -58,15 +58,14 @@ jobs:
           -H "Authorization: token ${{ secrets.action_token }}" \
           https://gitea.simplysyncedllc.com/api/v1/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets
 
-
-    - name: Build amd64/arm64 Docker containers and put in gitea registry.
-      run: |
-        echo "${{ secrets.action_token }}" | docker login gitea.simplysyncedllc.com -u dex --password-stdin
-        docker buildx build --platform linux/amd64,linux/arm64 -t gitea.simplysyncedllc.com/dex/kx3dex_radio:latest .
-        docker push gitea.simplysyncedllc.com/dex/kx3dex_radio:latest
-
-#    - name: Build arm64 Docker container and put in gitea registry.
-#      run: |
-#        echo "${{ secrets.action_token }}" | docker login gitea.simplysyncedllc.com -u dex --password-stdin
-#        docker buildx build --platform -t gitea.simplysyncedllc.com/dex/kx3dex_radio:latest .
-#        docker push gitea.simplysyncedllc.com/dex/kx3dex_radio:latest
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: |
+          linux/amd64
+          linux/arm64
+        push: true
+        tags: |
+          gitea.simplysyncedllc.com/dex/kx3dex_radio:latest
diff --git a/Dockerfile b/Dockerfile
index 230bfe9..97a1b0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 # Install dependencies only when needed
 FROM node:18-alpine3.19 AS deps
-RUN yarn config set network-timeout 300000
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
 COPY package.json yarn.lock ./