diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/Dockerfile b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/Dockerfile
index e89081947e2..23fd259ae22 100644
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/Dockerfile
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/Dockerfile
@@ -1,8 +1,10 @@
 FROM debian:buster-slim
 
 USER root
+ENV DEBIAN_FRONTEND=noninteractive
 
 COPY scripts scripts
 COPY install /usr/local
 
 RUN cd scripts && ./deploy.sh
+ENV DEBIAN_FRONTEND=newt
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh
index f024e617055..14ca02a1dc9 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/build.sh
@@ -18,5 +18,7 @@ fi
 
 docker build -t ${DOCKER_IMAGE_NAME} .
 docker push $DOCKER_IMAGE_NAME
+docker tag ${DOCKER_IMAGE_NAME} ${DOCKER_IMAGE_BASE_NAME}:latest
+docker push ${DOCKER_IMAGE_BASE_NAME}:latest
 
 [ -n "$INCLUDE_TOOLKIT" ] && /bin/rm -rfv install/grafana-toolkit
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh
index 61443d21b2c..2b0998b4bc3 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/common.sh
@@ -4,4 +4,6 @@
 ## Common variable declarations
 ##
 
-DOCKER_IMAGE_NAME="grafana/grafana-plugin-ci-e2e:1.0.0"
+DOCKER_IMAGE_BASE_NAME="grafana/grafana-plugin-ci-e2e"
+DOCKER_IMAGE_VERSION="1.0.1"
+DOCKER_IMAGE_NAME="${DOCKER_IMAGE_BASE_NAME}:${DOCKER_IMAGE_VERSION}"
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh
index 8b87bea2a91..9c3c0a31e2d 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy-slim.sh
@@ -2,5 +2,26 @@
 source "/etc/profile"
 
 apt-get --allow-insecure-repositories update
-apt-get install --allow-unauthenticated -y build-essential wget git sudo adduser libfontconfig1 locate libnss3 libnspr4 libgdk-pixbuf2.0-0 libgtk-3-0 libpangocairo-1.0-0 libpango-1.0-0 libatk1.0-0 libcairo2 libdbus-1-3 libxcomposite1 libxrender1 libxcursor1 libxi6 libxtst6 libxrandr2 libxss1 libasound2 libatk-bridge2.0-0 libatspi2.0-0 libcups2 jq xvfb net-tools git-lfs unzip pkg-config zip libaio1 libaio-dev netcat
+apt-get install --allow-unauthenticated -y \
+  build-essential \
+  wget git sudo adduser \
+  libfontconfig1 \
+  locate \
+  libnss3 libnspr4 \
+  libgdk-pixbuf2.0-0 \
+  libgtk-3-0 \
+  libpangocairo-1.0-0 \
+  libpango-1.0-0 \
+  libatk1.0-0 \
+  libcairo2 \
+  libdbus-1-3 \
+  libxcomposite1 libxrender1 libxcursor1 libxi6 libxtst6 libxrandr2 libxss1 xauth xvfb \
+  libasound2 \
+  libatk-bridge2.0-0 \
+  libatspi2.0-0 \
+  libcups2 \
+  jq net-tools git-lfs unzip pkg-config zip  \
+  libaio1 libaio-dev \
+  netcat \
+  libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
 
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
index d77f6177c27..2dc1b47cd00 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
@@ -56,11 +56,10 @@ mv $HOME/go/bin/mage /usr/local/bin
 /bin/rm -rf /tmp/mage
 /bin/rm -rf $HOME/go
 
-# Install grafana-toolkit deps
-pushd /usr/local/grafana-toolkit
-yarn install
-ln -s /usr/local/grafana-toolkit/bin/grafana-toolkit.js /usr/local/bin/grafana-toolkit
-popd
+# add cypress
+yarn global add cypress
+# verify cypress install
+cypress verify
 
 # Get the size down
 /bin/rm -rf /var/lib/apt/lists