diff --git a/commit-watcher/Dockerfile b/commit-watcher/Dockerfile
index 42b297f..96762fa 100644
--- a/commit-watcher/Dockerfile
+++ b/commit-watcher/Dockerfile
@@ -11,19 +11,22 @@ RUN	apk add --no-cache \
 
 RUN	set -x \
 	&& apk add --no-cache --virtual .build-deps \
-	build-base \
-	cmake \
-	libxml2-dev \
-	libxslt-dev \
-	ruby-json \
+		build-base \
+		cmake \
+		libxml2-dev \
+		libxslt-dev \
+		pkgconfig \
+		ruby-json \
 	&& git clone --depth 1 https://github.com/srcclr/commit-watcher.git /usr/src/commit-watcher \
-	&& cd /usr/src/commit-watcher \
-	&& gem install \
-		activesupport-json_encoder \
-		--no-rdoc --no-ri \
-	&& bundle config build.nokogiri --use-system-libraries \
-	&& bundle update sdoc \
-	&& bundle install \
+	&& ( \
+		cd /usr/src/commit-watcher \
+		&& gem install \
+			activesupport-json_encoder \
+			--no-rdoc --no-ri \
+		&& bundle config build.nokogiri --use-system-libraries \
+		&& bundle update sdoc \
+		&& bundle install \
+	) \
 	&& apk del .build-deps
 
 WORKDIR /usr/src/commit-watcher
diff --git a/windmill/Dockerfile b/windmill/Dockerfile
new file mode 100644
index 0000000..c9847ea
--- /dev/null
+++ b/windmill/Dockerfile
@@ -0,0 +1,30 @@
+FROM ruby:alpine
+
+RUN	apk add --no-cache \
+	ca-certificates \
+	libxml2 \
+	libxslt \
+	postgresql-libs \
+	sqlite-libs
+
+RUN	set -x \
+	&& apk add --no-cache --virtual .build-deps \
+		build-base \
+		git \
+		libxml2-dev \
+		libxslt-dev \
+		pkgconfig \
+		postgresql-dev \
+		sqlite-dev \
+	&& git clone --depth 1 https://github.com/heroku/windmill.git /usr/src/windmill \
+	&& ( \
+		cd /usr/src/windmill \
+		&& sed -i 's/ruby "2.2.3"/ruby "2.5.1"/' Gemfile \
+		&& bundle config build.nokogiri --use-system-libraries \
+		&& bundle install \
+	) \
+	&& apk del .build-deps
+
+WORKDIR /usr/src/windmill
+
+CMD [ "rake", "db:setup", "&&", "ruby", "server.rb" ]