diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 81736eb..ba84970 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,5 @@
 name: Create and publish Docker image
+
 on:
   push:
     branches:
@@ -24,7 +25,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
         with:
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64,linux/arm64
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -42,11 +43,29 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and push Docker image with cache & retry
+        run: |
+          set -e
+          for i in {1..3}; do
+            echo "Attempt $i of 3"
+            docker buildx build \
+              --push \
+              --platform linux/amd64,linux/arm64 \
+              --tag ${{ steps.meta.outputs.tags }} \
+              --label ${{ steps.meta.outputs.labels }} \
+              --cache-from=type=gha \
+              --cache-to=type=gha,mode=max \
+              .
+            status=$?
+            if [ $status -eq 0 ]; then
+              echo "Docker build succeeded on attempt $i"
+              break
+            else
+              echo "Docker build failed (attempt $i). Retrying in 10 seconds..."
+              sleep 10
+            fi
+            if [ $i -eq 3 ]; then
+              echo "Docker build failed after 3 attempts. Exiting with error."
+              exit 1
+            fi
+          done
diff --git a/Dockerfile b/Dockerfile
index d7c32ce..8edb0e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,33 @@
 FROM node:20
 
-WORKDIR  /fredy
+# Install chromium dependencies in a separate layer (cacheable)
+RUN apt-get update && apt-get install -y chromium && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
-COPY . /fredy
+# Set working directory
+WORKDIR /fredy
 
-RUN apt-get update && apt-get install -y chromium
+# Copy only package.json + yarn.lock for dependency caching
+COPY package.json yarn.lock ./
 
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
-  PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
-
-RUN yarn install
+# Increase network timeout for npm registry
+RUN yarn config set network-timeout 600000 && yarn install
 
+# Global tools (cached separately)
 RUN yarn global add pm2
 
+# Copy application source code (after deps, cache friendly)
+COPY . .
+
+# Build step (assuming 'prod' is a build script)
 RUN yarn run prod
 
+# Prepare runtime dirs
 RUN mkdir /db /conf && \
-  chown 1000:1000 /db /conf && \
-  chmod 777 -R /db/ && \
-  ln -s /db /fredy/db && ln -s /conf /fredy/conf
+    chown 1000:1000 /db /conf && \
+    chmod 777 -R /db/ && \
+    ln -s /db /fredy/db && ln -s /conf /fredy/conf
 
+# Expose port & set runtime command
 EXPOSE 9998
-
-CMD pm2-runtime index.js
+CMD ["pm2-runtime", "index.js"]
\ No newline at end of file