diff --git a/.semaphore/pipeline_2.yml b/.semaphore/pipeline_2.yml
index a728d60..d8255b9 100644
--- a/.semaphore/pipeline_2.yml
+++ b/.semaphore/pipeline_2.yml
@@ -8,8 +8,10 @@ blocks:
   - name: RC Build
     task:
       jobs:
-        - name: Tag and Push
+        - name: Build and Push
           commands:
+            - 'docker pull $DOCKER_USERNAME/cloud9-ide-vdi:latest || true'
+            - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .'
             - '# Login to Dockerhub'
             - 'echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin'
             - '# Create a version'
diff --git a/.semaphore/pipeline_3.yml b/.semaphore/pipeline_3.yml
index 2fb312d..2373e82 100644
--- a/.semaphore/pipeline_3.yml
+++ b/.semaphore/pipeline_3.yml
@@ -12,6 +12,8 @@ blocks:
           commands:
             - DATE=$(date +%y%U%u)
             - 'VERSION="${DATE}"'
+            - 'docker pull $DOCKER_USERNAME/cloud9-ide-vdi:latest || true'
+            - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .'
             - '# Login to Dockerhub'
             - 'echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin'
             - '# Create a version'
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 8e7e019..e078993 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -5,15 +5,13 @@ agent:
     type: e1-standard-2
     os_image: ubuntu2004
 blocks:
-  - name: Build
+  - name: Setup
     task:
       jobs:
-        - name: docker build
+        - name: Checkout
           commands:
             - checkout
             - git submodule update --init --recursive
-            - 'docker pull $DOCKER_USERNAME/cloud9-ide-vdi:latest || true'
-            - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .'
       secrets:
         - name: Dockerhub
 promotions: