diff --git a/.gitignore b/.gitignore
index 2699a80..364fdec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-_site
-_drafts
-.sass-cache
-.jekyll-metadata
+public/
diff --git a/Dockerfile b/Dockerfile
index 7777bc6..e961be5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM jekyll/jekyll as build
+FROM klakegg/hugo as build
 
-WORKDIR /srv/jekyll
-COPY . /srv/jekyll
-RUN jekyll build --trace && cp -a _site/ /tmp/site
+WORKDIR /src
+COPY . /src/
+RUN hugo
 
 FROM nginx
-COPY --from=build /tmp/site /usr/share/nginx/html
+COPY --from=build /src/public /usr/share/nginx/html
diff --git a/Makefile b/Makefile
index 3503f18..749a054 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 DOCKER_IMAGE := cr.annabunch.es/annabunches-static
 
-all: build
+.PHONY: all build push
 
-serve:
-	docker run --rm -it -p 4000:4000 -v $(shell pwd):/srv/jekyll jekyll/jekyll jekyll serve --drafts --future --safe -d /tmp/site --trace
+all: build
 
 build:
 	docker build -t ${DOCKER_IMAGE} .