diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11d0b0bc..01d6644a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,6 +20,7 @@ jobs:
 
     steps:
       - checkout
+      - setup_remote_docker
       - restore_cache:
           keys:
             - v4-crossbuild-cache
@@ -41,9 +42,12 @@ jobs:
 
     steps:
       - checkout
+      - setup_remote_docker
       - restore_cache:
           keys:
             - v4-crossbuild-cache
+      - run: docker login docker.io -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+      - run: docker login quay.io -u $QUAY_LOGIN -p $QUAY_PASSWORD
       - run: cd ..; GO111MODULE=on go get github.com/goreleaser/goreleaser@v0.131.1
       - run: git reset --hard
       - run: make release 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 47d684c9..7ce9204d 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -30,3 +30,18 @@ checksum:
   name_template: 'checksums.txt'
 snapshot:
   name_template: "{{ .Tag }}-next"
+dockers:
+  -
+    goos: linux
+    goarch: amd64
+    binaries:
+      - promql-langserver
+    image_templates:
+    - "docker.io/prometheuscommunity/promql_langserver:latest"
+    - "docker.io/prometheuscommunity/promql_langserver:{{ .Tag }}"
+    - "docker.io/prometheuscommunity/promql_langserver:v{{ .Major }}"
+    - "docker.io/prometheuscommunity/promql_langserver:v{{ .Major }}.{{ .Minor }}"
+    - "quay.io/prometheuscommunity/promql_langserver:latest"
+    - "quay.io/prometheuscommunity/promql_langserver:{{ .Tag }}"
+    - "quay.io/prometheuscommunity/promql_langserver:v{{ .Major }}"
+    - "quay.io/prometheuscommunity/promql_langserver:v{{ .Major }}.{{ .Minor }}"
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..df7d184c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM scratch
+
+LABEL maintainer="The Prometheus Authors <prometheus-developers@googlegroups.com>"
+
+COPY promql-langserver /bin/promql-langserver
+
+ENTRYPOINT [ "/bin/promql-langserver" ]