diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index f4b8a090e..ce4413656 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -867,10 +867,10 @@ jobs:
            • <https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-concourse|Concourse CI Pipeline Editor>
            • <https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-bosh|Bosh Deployment Manifest Editor>
            • <https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-spring-boot|Spring Boot Support>
-  # - aggregate:
-  #   - put: theia-version
-  #     params:
-  #       file: theia-version/version
+  - aggregate:
+    - put: theia-version
+      params:
+        file: theia-version/version
 
 - name: build-concourse-rc
   plan:
@@ -1123,6 +1123,23 @@ jobs:
     - put: version
       params:
         file: version/version
+- name: bump-theia-version-patch
+  serial: true
+  plan:
+  - aggregate:
+    - get: sts4
+    - get: theia-version
+      params:
+        bump: patch
+  - task: bump-theia-versions
+    file: sts4/concourse/tasks/bump-theia-versions.yml
+  - put: sts4
+    params:
+      repository: out
+      rebase: true
+  - put: theia-version
+    params:
+      file: theia-version/version
 - name: bump-version-patch
   serial: true
   plan:
@@ -1430,6 +1447,7 @@ groups:
   - bump-version-patch
   - bump-version-minor
   - bump-version-major
+  - bump-theia-version-patch
 - name: atom-snapshots
   jobs:
   # - build-atom-snapshot-website
diff --git a/concourse/tasks/bump-theia-versions.sh b/concourse/tasks/bump-theia-versions.sh
new file mode 100755
index 000000000..a10c25dd0
--- /dev/null
+++ b/concourse/tasks/bump-theia-versions.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+set -e
+set -v
+workdir=`pwd`
+
+theia_sources=$workdir/sts4/theia-extensions
+
+theia_version=`cat theia-version/version`
+echo "theia-version=$theia_version"
+
+# theia extensions
+cd $theia_sources
+yarn install lerna -g
+for extension_id in $(ls -d theia-*)
+do
+    if [ $extension_id != "theia-commons" ]; then
+        cd $theia_sources/$extension_id
+        echo "Should update version of $extension_id to $theia_version"
+        lerna version $theia_version --exact --no-git-tag-version --no-push --yes
+        git add ./
+        echo ""
+    fi
+done
+
+git config user.email "kdevolder@pivotal.io"
+git config user.name "Kris De Volder"
+
+git commit \
+    -m "Bump Theia version to ${theia_version}"
+
+git clone $workdir/sts4 $workdir/out
diff --git a/concourse/tasks/bump-theia-versions.yml b/concourse/tasks/bump-theia-versions.yml
new file mode 100755
index 000000000..33be7a091
--- /dev/null
+++ b/concourse/tasks/bump-theia-versions.yml
@@ -0,0 +1,12 @@
+inputs:
+- name: version
+- name: sts4
+outputs:
+- name: out
+platform: linux
+image_resource:
+  type: docker-image
+  source:
+    repository: kdvolder/sts4-build-env
+run:
+  path: sts4/concourse/tasks/bump-theia-versions.sh
diff --git a/concourse/tasks/bump-versions.sh b/concourse/tasks/bump-versions.sh
index bc042d9c2..a73df00f5 100755
--- a/concourse/tasks/bump-versions.sh
+++ b/concourse/tasks/bump-versions.sh
@@ -10,6 +10,9 @@ theia_sources=$workdir/sts4/theia-extensions
 version=`cat version/version`
 echo "version=$version"
 
+theia_version=`cat theia-version/version`
+echo "theia-version=$theia_version"
+
 # vscode extensions
 cd $vscode_sources
 for extension_id in $(ls -d vscode-*)
@@ -35,15 +38,15 @@ do
 done
 
 # theia extensions
-theia_version=cat version/version`
-echo "theia-version=$theia_version"
+cd $theia_sources
+yarn install lerna -g
 for extension_id in $(ls -d theia-*)
 do
     if [ $extension_id != "theia-commons" ]; then
-        cd "${theia_sources}/theia-$extension_id"
-        echo "Should update version of $extension_id to $version"
-        npm version $version
-        git add package.json
+        cd $theia_sources/$extension_id
+        echo "Should update version of $extension_id to $theia_version"
+        lerna version $theia_version --exact --no-git-tag-version --no-push --yes
+        git add ./
         echo ""
     fi
 done
diff --git a/concourse/tasks/publish-theia-releases.sh b/concourse/tasks/publish-theia-releases.sh
index f317b5e4d..a983a11a2 100755
--- a/concourse/tasks/publish-theia-releases.sh
+++ b/concourse/tasks/publish-theia-releases.sh
@@ -14,4 +14,7 @@ do
     echo ""
     echo "     npm publish $theia_tgz_file --access public"
     echo ""
+
+    yarn publish $theia_tgz_file --access public
+
 done