diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml
index 4a9be4a..02b513f 100644
--- a/.github/workflows/docker-build-push-dockerhub.yml
+++ b/.github/workflows/docker-build-push-dockerhub.yml
@@ -41,8 +41,6 @@ jobs:
           git submodule update --init
 
       - name: Docker Login
-      # You may pin to the exact commit or the version.
-      # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         uses: docker/login-action@v1.10.0
         with:
           # Username used to log against the Docker registry
@@ -51,10 +49,6 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
           # Log out from the Docker registry at the end of a job
           logout: true # optional, default is true
-
-      - name: Set up Docker builder
-        id: buildx
-        uses: docker/setup-buildx-action@v1.6.0
       
       - name: Copy env
         run: |
@@ -62,9 +56,9 @@ jobs:
           cat .env >> $GITHUB_ENV
           echo "DATABASE_HOST=localhost:5432" >> $GITHUB_ENV
           eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ;
-      
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+      # Temporarily disable ARM build due to runner performance issues
+#       - name: Set up QEMU
+#         uses: docker/setup-qemu-action@v2
 
       - name: Start database
         run: |
@@ -85,7 +79,7 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:latest
           build-args: |
             NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
diff --git a/Dockerfile b/Dockerfile
index fa5b57e..a403b81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,10 +20,12 @@ COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./
 COPY calcom/apps/web ./apps/web
 COPY calcom/packages ./packages
 
-RUN yarn config set network-timeout 1000000000 -g && \ 
-    yarn install --frozen-lockfile
+RUN yarn global add turbo && \
+    yarn config set network-timeout 1000000000 -g && \ 
+    turbo prune --scope=@calcom/web --docker && \
+    yarn install
 
-RUN yarn build
+RUN yarn turbo run build --filter=@calcom/web
 
 FROM node:16 as runner