diff --git a/.drone.yml b/.drone.yml
index 8c32df9626..9390312b18 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -64,3 +64,13 @@ pipeline:
       event: [ push ]
       branch: [ master ]
 
+  # Build the docker image and push it to docker hub
+  docker:
+    image: plugins/docker
+    pull: true
+    secrets: [ docker_username, docker_password ]
+    repo: vikunja/frontend
+    auto_tag: true
+    when:
+      event: [ push, tag ]
+      branch: [ master ]
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..710ce6f611
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+FROM nginx
+
+MAINTAINER maintainers@vikunja.io
+
+COPY dist /usr/share/nginx/html
+RUN rm /usr/share/nginx/html/js/*.map
\ No newline at end of file