diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 2c4ebb463..298bfe1cd 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -256,7 +256,7 @@ resources:
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
-    repository: kdvolder/sts4-build-env
+    repository: springci/sts4-build-env
 - name: theia-docker-image
   type: docker-image
   source:
diff --git a/concourse/tasks/build-mvn-cache.yml b/concourse/tasks/build-mvn-cache.yml
index 606a1d1df..896714877 100644
--- a/concourse/tasks/build-mvn-cache.yml
+++ b/concourse/tasks/build-mvn-cache.yml
@@ -6,6 +6,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: sts4/concourse/tasks/build-mvn-cache.sh
diff --git a/concourse/tasks/build-vscode-website.yml b/concourse/tasks/build-vscode-website.yml
index 11c22aaf3..629c01de8 100644
--- a/concourse/tasks/build-vscode-website.yml
+++ b/concourse/tasks/build-vscode-website.yml
@@ -10,6 +10,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: "sts4/concourse/tasks/build-vscode-website.sh"
diff --git a/concourse/tasks/build-vsix.yml b/concourse/tasks/build-vsix.yml
index 697570137..b58879969 100644
--- a/concourse/tasks/build-vsix.yml
+++ b/concourse/tasks/build-vsix.yml
@@ -7,6 +7,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: sts4/concourse/tasks/build-vsix.sh
diff --git a/concourse/tasks/bump-versions.yml b/concourse/tasks/bump-versions.yml
index 44a54192d..639918ecb 100644
--- a/concourse/tasks/bump-versions.yml
+++ b/concourse/tasks/bump-versions.yml
@@ -7,6 +7,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: sts4/concourse/tasks/bump-versions.sh
diff --git a/concourse/tasks/create-release-wiki-page.yml b/concourse/tasks/create-release-wiki-page.yml
index ea5c22e18..d85602a4d 100644
--- a/concourse/tasks/create-release-wiki-page.yml
+++ b/concourse/tasks/create-release-wiki-page.yml
@@ -13,6 +13,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: sts4/concourse/tasks/create-release-wiki-page.sh
diff --git a/concourse/tasks/fatjars-language-servers.yml b/concourse/tasks/fatjars-language-servers.yml
index 7c5fb6ce8..d3de990d5 100644
--- a/concourse/tasks/fatjars-language-servers.yml
+++ b/concourse/tasks/fatjars-language-servers.yml
@@ -8,6 +8,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: sts4/concourse/tasks/fatjars-language-servers.sh
\ No newline at end of file
diff --git a/concourse/tasks/npm-publish.yml b/concourse/tasks/npm-publish.yml
index 051e75975..c6fed0e9f 100644
--- a/concourse/tasks/npm-publish.yml
+++ b/concourse/tasks/npm-publish.yml
@@ -2,7 +2,9 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 inputs:
 - name: sources_repo
 - name: tasks
diff --git a/concourse/tasks/ovsx-build-and-publish.yml b/concourse/tasks/ovsx-build-and-publish.yml
index 8acdd6d99..5aa3e8f14 100644
--- a/concourse/tasks/ovsx-build-and-publish.yml
+++ b/concourse/tasks/ovsx-build-and-publish.yml
@@ -2,7 +2,9 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 params:
   ovsx_token: ovsx_token_should_be_set
 inputs:
diff --git a/concourse/tasks/prepare-theia-docker-image.yml b/concourse/tasks/prepare-theia-docker-image.yml
index ad25690d6..e2a03983f 100644
--- a/concourse/tasks/prepare-theia-docker-image.yml
+++ b/concourse/tasks/prepare-theia-docker-image.yml
@@ -2,7 +2,9 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 inputs:
 - name: sts4
 - name: s3-concourse-vsix-snapshot
diff --git a/concourse/tasks/publish-concourse-vsix-release.yml b/concourse/tasks/publish-concourse-vsix-release.yml
index 043079137..7c78f63ca 100644
--- a/concourse/tasks/publish-concourse-vsix-release.yml
+++ b/concourse/tasks/publish-concourse-vsix-release.yml
@@ -7,5 +7,7 @@ run:
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
   
\ No newline at end of file
diff --git a/concourse/tasks/publish-ovsx-releases.yml b/concourse/tasks/publish-ovsx-releases.yml
index 16f466a02..cce584fa1 100644
--- a/concourse/tasks/publish-ovsx-releases.yml
+++ b/concourse/tasks/publish-ovsx-releases.yml
@@ -10,5 +10,7 @@ run:
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
   
\ No newline at end of file
diff --git a/concourse/tasks/publish-vsix-releases.yml b/concourse/tasks/publish-vsix-releases.yml
index 0557dc8ea..4168656e3 100644
--- a/concourse/tasks/publish-vsix-releases.yml
+++ b/concourse/tasks/publish-vsix-releases.yml
@@ -10,5 +10,7 @@ run:
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
   
\ No newline at end of file
diff --git a/concourse/tasks/rc-build.yml b/concourse/tasks/rc-build.yml
index 7efefe14e..c15307397 100644
--- a/concourse/tasks/rc-build.yml
+++ b/concourse/tasks/rc-build.yml
@@ -12,5 +12,7 @@ params:
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
   
\ No newline at end of file
diff --git a/concourse/tasks/unpack.yml b/concourse/tasks/unpack.yml
index 3cfbb7617..6494fdc6a 100644
--- a/concourse/tasks/unpack.yml
+++ b/concourse/tasks/unpack.yml
@@ -2,7 +2,9 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: sts4/concourse/tasks/unpack.sh
 inputs:
diff --git a/concourse/tasks/vsce-publish.yml b/concourse/tasks/vsce-publish.yml
index 95700c115..c8e97c5e9 100644
--- a/concourse/tasks/vsce-publish.yml
+++ b/concourse/tasks/vsce-publish.yml
@@ -8,6 +8,8 @@ platform: linux
 image_resource:
   type: docker-image
   source:
-    repository: kdvolder/sts4-build-env
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
 run:
   path: sts4/concourse/tasks/vsce-publish.sh