diff --git a/scripts/build/ci-deploy/Dockerfile b/scripts/build/ci-deploy/Dockerfile
new file mode 100644
index 00000000000..deef612e761
--- /dev/null
+++ b/scripts/build/ci-deploy/Dockerfile
@@ -0,0 +1,5 @@
+FROM circleci/python:2.7-stretch
+
+RUN sudo pip install awscli && \
+  curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-222.0.0-linux-x86_64.tar.gz | \
+  sudo tar xvzf - -C /opt
diff --git a/scripts/build/ci-deploy/build-deploy.sh b/scripts/build/ci-deploy/build-deploy.sh
new file mode 100755
index 00000000000..c9ce805b30b
--- /dev/null
+++ b/scripts/build/ci-deploy/build-deploy.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+_version="1.0.0"
+_tag="grafana/grafana-ci-deploy:${_version}"
+
+docker build -t $_tag .
+docker push $_tag