diff --git a/site/Dockerfile.dev b/site/Dockerfile.dev
new file mode 100644
index 00000000..3c99a213
--- /dev/null
+++ b/site/Dockerfile.dev
@@ -0,0 +1,7 @@
+FROM node:16-alpine as build
+
+WORKDIR /site
+COPY ./ /site
+RUN yarn --frozen-lockfile
+
+CMD yarn start
diff --git a/site/docker-compose.yml b/site/docker-compose.yml
index 5b2428f1..6112ae46 100644
--- a/site/docker-compose.yml
+++ b/site/docker-compose.yml
@@ -7,10 +7,12 @@ services:
     volumes:
       - ./build:/site/build
 
+  # Runs dev evn for the site
   server:
     image: remark42-site
-    build: .
-    command: yarn dev
+    build:
+      dockerfile: Dockerfile.dev
+      context: .
 
     logging:
       driver: json-file
diff --git a/site/package.json b/site/package.json
index 585c42e7..051d32da 100644
--- a/site/package.json
+++ b/site/package.json
@@ -11,10 +11,11 @@
 		"yarn": ">=1.22"
 	},
 	"scripts": {
-		"dev": "npm-run-all -l clean -p dev:css dev:11ty",
+		"start": "npm-run-all dev",
+		"dev": "npm-run-all -l clean build:css -p dev:css dev:11ty",
 		"dev:css": "tailwindcss -i ./src/styles.css -o .tmp/style.css -w",
 		"dev:11ty": "eleventy --serve --watch --quiet",
-		"build": "cross-env NODE_ENV=production run-s clean build:* --print-label",
+		"build": "cross-env NODE_ENV=production run-s clean build:css build:11ty --print-label",
 		"build:css": "tailwindcss -i ./src/styles.css -o .tmp/style.css",
 		"build:11ty": "eleventy",
 		"clean": "rm -rf .tmp/* build/*"