diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml
index 4c75491..7e35ebe 100644
--- a/.gitea/workflows/build-and-deploy.yml
+++ b/.gitea/workflows/build-and-deploy.yml
@@ -15,6 +15,7 @@ env:
   GIT_SSL_NO_VERIFY: "true"
   REGISTRY_HOST: 192.168.3.80
   DOCKERFILE_PATH: Dockerfile.production
+  DOCKER_PLATFORM: linux/amd64
   DEPLOY_ROOT: /opt/rentaldrivego
 
 jobs:
@@ -94,6 +95,7 @@ jobs:
         with:
           context: .
           file: ${{ env.DOCKERFILE_PATH }}
+          platforms: ${{ env.DOCKER_PLATFORM }}
           push: ${{ steps.registry-check.outputs.available == 'true' }}
           tags: |
             ${{ steps.image-meta.outputs.full }}
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 68dc8bd..1a46df3 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -24,7 +24,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm ci
+      - run: corepack enable && corepack prepare npm@10.5.0 --activate
+      - run: npm ci --include=optional
       - run: npm run db:generate
       - run: npm run type-check
 
@@ -37,7 +38,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm ci
+      - run: corepack enable && corepack prepare npm@10.5.0 --activate
+      - run: npm ci --include=optional
       - run: npm run db:generate
       - run: npm run test:api
 
@@ -50,7 +52,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm ci
+      - run: corepack enable && corepack prepare npm@10.5.0 --activate
+      - run: npm ci --include=optional
       - run: npm run build --workspace @rentaldrivego/types
       - run: npm run test:homepage
 
@@ -63,7 +66,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm ci
+      - run: corepack enable && corepack prepare npm@10.5.0 --activate
+      - run: npm ci --include=optional
       - run: npm run build --workspace @rentaldrivego/types
       - run: npm run test:storefront
 
@@ -76,7 +80,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm ci
+      - run: corepack enable && corepack prepare npm@10.5.0 --activate
+      - run: npm ci --include=optional
       - run: npm run test:admin
 
   dashboard-tests:
@@ -88,7 +93,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm ci
+      - run: corepack enable && corepack prepare npm@10.5.0 --activate
+      - run: npm ci --include=optional
       - run: npm run build --workspace @rentaldrivego/types
       - run: npm run test:dashboard
 
@@ -127,7 +133,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: npm ci
+      - run: corepack enable && corepack prepare npm@10.5.0 --activate
+      - run: npm ci --include=optional
       - run: npm run db:generate
       - run: npm run db:deploy
       - run: npx prisma db push --schema packages/database/prisma/schema.prisma
diff --git a/Dockerfile.production b/Dockerfile.production
index d0b2fc4..621364a 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -36,7 +36,7 @@ ENV API_INTERNAL_URL=$API_INTERNAL_URL \
     NEXT_PUBLIC_ADMIN_URL=$NEXT_PUBLIC_ADMIN_URL \
     SITE_ORIGIN=$SITE_ORIGIN
 
-RUN npm ci
+RUN npm ci --include=optional
 RUN npm run db:generate
 RUN npm run build