diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7531f5..2094ea9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,11 +4,20 @@ jobs:
     machine: true
     steps:
       - checkout
-      - run: e2e/bootstrap.sh
-      - run: e2e/install.sh
-      - run: e2e/test.sh
+      - run:
+          name: Build podinfo container
+          command: e2e/build.sh
+      - run:
+          name: Start Kubernetes Kind cluster
+          command: e2e/bootstrap.sh
+      - run:
+          name: Install podinfo with Helm
+          command: e2e/install.sh
+      - run:
+          name: Run Helm tests
+          command: e2e/test.sh
 
-  build-container:
+  push-container:
     docker:
       - image: circleci/golang:1.12
     working_directory: ~/build
@@ -78,17 +87,16 @@ workflows:
   version: 2
   build-test:
     jobs:
-      - build-container
       - e2e-kubernetes
   release:
     jobs:
-      - build-container:
+      - push-binary:
           filters:
             branches:
               ignore: /.*/
             tags:
               ignore: /^chart.*/
-      - push-binary:
+      - push-container:
           filters:
             branches:
               ignore: /.*/
@@ -96,7 +104,7 @@ workflows:
               ignore: /^chart.*/
       - push-helm-charts:
           requires:
-            - build-container
+            - push-container
           filters:
             branches:
               ignore: /.*/
diff --git a/e2e/build.sh b/e2e/build.sh
new file mode 100755
index 0000000..9b6523c
--- /dev/null
+++ b/e2e/build.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+docker build -t test/podinfo:latest .
+
diff --git a/e2e/install.sh b/e2e/install.sh
index 3d2f9ac..2b0775c 100755
--- a/e2e/install.sh
+++ b/e2e/install.sh
@@ -5,9 +5,6 @@ set -o errexit
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
-echo ">>> Building container"
-docker build -t test/podinfo:latest .
-
 echo '>>> Loading image in Kind'
 kind load docker-image test/podinfo:latest