diff --git a/.drone.yml b/.drone.yml
index aab69260..15f93b3a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,13 +35,21 @@ steps:
   depends_on:
   - install-deps
   commands:
-  - npm run generate:calendar
+  - npm run build:calendar
+
+- name: optimize-images
+  image: node:16
+  depends_on:
+  - install-deps
+  commands:
+  - npm run build:images
 
 - name: export
   image: node:16
   depends_on:
   - build
   - generate-calendar
+  - optimize-images
   commands:
   - npm run export
 
diff --git a/package.json b/package.json
index 75d7ad8e..7bfb9dd5 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,14 @@
   },
   "scripts": {
     "dev": "npm run generate:images && next dev",
-    "build": "npm run build:web && npm run generate:calendar",
-    "build:web": "npm run generate:images && next build",
+    "build": "npm run build:web && npm run build:calendar && npm run build:images",
+    "build:web": "next build",
+    "build:calendar": "ts-node ./scripts/generate-calendar",
+    "build:images": "ts-node ./scripts/optimize-images",
     "start": "next start",
     "export": "next export",
     "lint": "eslint \"{pages,components,lib,hooks,scripts}/**/*.{js,ts,tsx,jsx}\" --quiet",
     "lint:fix": "eslint \"{pages,components,lib,hooks,scripts}/**/*.{js,ts,tsx,jsx}\" --quiet --fix",
-    "generate:calendar": "ts-node ./scripts/generate-calendar",
-    "generate:images": "ts-node ./scripts/optimize-images",
     "check-lockfile": "ts-node ./scripts/check-lockfile"
   },
   "dependencies": {