diff --git a/.semaphore/pipeline_2.yml b/.semaphore/pipeline_2.yml
index 78df075..57bf1b0 100644
--- a/.semaphore/pipeline_2.yml
+++ b/.semaphore/pipeline_2.yml
@@ -14,6 +14,7 @@ blocks:
             - git submodule update --init --recursive
             - 'docker pull $DOCKER_USERNAME/cloud9-ide-vdi:latest || true'
             - 'cd ./configuration && python configure.py --desktop enabled'
+            - 'cd ../'
             - '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'
@@ -21,6 +22,7 @@ blocks:
             - 'docker image tag devindice/cloud9-ide-vdi:latest devindice/cloud9-ide-vdi:testing'
             - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:testing'
             - 'cd ./configuration && python configure.py --desktop disabled'
+            - 'cd ../'
             - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .'
             - 'docker image tag devindice/cloud9-ide-vdi:latest devindice/cloud9-ide-vdi:no-desktop-testing'
             - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:no-desktop-testing'
diff --git a/.semaphore/pipeline_3.yml b/.semaphore/pipeline_3.yml
index e4c8889..7056ec4 100644
--- a/.semaphore/pipeline_3.yml
+++ b/.semaphore/pipeline_3.yml
@@ -15,12 +15,19 @@ blocks:
             - DATE=$(date +%y%U%u)
             - 'VERSION="${DATE}"'
             - 'docker pull $DOCKER_USERNAME/cloud9-ide-vdi:latest || true'
+            - 'cd ./configuration && python configure.py --desktop enabled'
+            - 'cd ../'
             - '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'
             - 'docker image tag devindice/cloud9-ide-vdi:latest devindice/cloud9-ide-vdi:$VERSION'
             - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:$VERSION'
-            - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:latest'
+            - 'cd ./configuration && python configure.py --desktop disabled'
+            - 'cd ../'
+            - 'docker build --cache-from=$DOCKER_USERNAME/cloud9-ide-vdi:latest -t devindice/cloud9-ide-vdi .'
+            - 'docker image tag devindice/cloud9-ide-vdi:latest devindice/cloud9-ide-vdi:$VERSION-no-desktop'
+            - 'docker push $DOCKER_USERNAME/cloud9-ide-vdi:$VERSION-no-desktop'
+
       secrets:
         - name: Dockerhub