diff --git a/.semaphore/pipeline_2.yml b/.semaphore/pipeline_2.yml
index 9cbd3a7..a728d60 100644
--- a/.semaphore/pipeline_2.yml
+++ b/.semaphore/pipeline_2.yml
@@ -1,18 +1,18 @@
 version: v1.0
-name: Pipeline 2
+name: Deploy Release Candidate
 agent:
   machine:
     type: e1-standard-2
     os_image: ubuntu2004
 blocks:
-  - name: Tag
+  - name: RC Build
     task:
       jobs:
-        - name: Tag build as testing
+        - name: Tag and Push
           commands:
             - '# Login to Dockerhub'
             - 'echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin'
             - '# Create a version'
-            - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:latest'
+            - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:testing'
       secrets:
         - name: Dockerhub
diff --git a/.semaphore/pipeline_3.yml b/.semaphore/pipeline_3.yml
index 7954004..2fb312d 100644
--- a/.semaphore/pipeline_3.yml
+++ b/.semaphore/pipeline_3.yml
@@ -1,18 +1,21 @@
 version: v1.0
-name: Pipeline 3
+name: Deploy Production
 agent:
   machine:
     type: e1-standard-2
     os_image: ubuntu2004
 blocks:
-  - name: Tagging
+  - name: Production Build
     task:
       jobs:
-        - name: Tag build with version
+        - name: Tag and Push
           commands:
+            - DATE=$(date +%y%U%u)
+            - 'VERSION="${DATE}"'
             - '# Login to Dockerhub'
             - 'echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin'
             - '# Create a version'
-            - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:testing'
+            - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:$VERSION'
+            - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:latest'
       secrets:
         - name: Dockerhub
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 9dcb773..8e7e019 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -13,7 +13,7 @@ blocks:
             - 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 .'
+            - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .'
       secrets:
         - name: Dockerhub
 promotions: