diff --git a/concourse/experimental-pipeline.yml b/concourse/experimental-pipeline.yml
deleted file mode 100644
index a065e1c07..000000000
--- a/concourse/experimental-pipeline.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-sleep: &sleep
-  config:
-    platform: linux
-    image_resource:
-      type: docker-image
-      source:
-        repository: alpine
-        tag: latest
-    run:
-      path: sh
-      args:
-      - -exc
-      - sleep 60
-
-##########
-
-resource_types:
-- name: pool
-  type: docker-image
-
-jobs:
-- name: acquire-1
-  plan:
-    - task: sleep
-      <<: *sleep
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index a7bf16607..34147b6c9 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -1,20 +1,20 @@
 ##########################################################
 resource_types:
 - name: s3-multi
-  type: docker-image
+  type: registry-image
   source:
     repository: kdvolder/s3-resource-simple
     username: ((docker_hub_username))
     password: ((docker_hub_password))
 - name: slack-notification
-  type: docker-image
+  type: registry-image
   source:
     repository: cfcommunity/slack-notification-resource
     username: ((docker_hub_username))
     password: ((docker_hub_password))
     tag: latest
 - name: artifactory-resource
-  type: docker-image
+  type: registry-image
   source:
     repository: springio/artifactory-resource
     tag: 0.0.10
@@ -241,16 +241,6 @@ resources:
     path: snapshot/STS4/vscode-extensions
     options:
     - "--acl public-read"
-# - name: atom-snapshot-website
-#   type: s3-multi
-#   source:
-#     bucket: ((s3_prod_bucket))
-#     access_key_id: ((s3_prod_accesskey))
-#     secret_access_key: ((s3_prod_secretkey))
-#     region_name: ((s3_region))
-#     path: snapshot/STS4/atom-packages
-#     options:
-#     - "--acl public-read"
 - name: slack-notification
   type: slack-notification
   source:
@@ -261,12 +251,6 @@ resources:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
     repository: springci/sts4-build-env
-# - name: theia-docker-image
-#   type: docker-image
-#   source:
-#     username: ((docker_hub_username))
-#     password: ((docker_hub_password))
-#     repository: springci/sts4-theia-snapshot    
 - name: maven-cache
   type: s3
   source:
diff --git a/concourse/tasks/build-mvn-cache.yml b/concourse/tasks/build-mvn-cache.yml
index 896714877..77935f073 100644
--- a/concourse/tasks/build-mvn-cache.yml
+++ b/concourse/tasks/build-mvn-cache.yml
@@ -4,7 +4,7 @@ outputs:
 - name: out
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/build-vscode-website.yml b/concourse/tasks/build-vscode-website.yml
index 629c01de8..0c0e1759f 100644
--- a/concourse/tasks/build-vscode-website.yml
+++ b/concourse/tasks/build-vscode-website.yml
@@ -8,7 +8,7 @@ outputs:
 - name: website
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/bump-versions.yml b/concourse/tasks/bump-versions.yml
index 639918ecb..e74909cba 100644
--- a/concourse/tasks/bump-versions.yml
+++ b/concourse/tasks/bump-versions.yml
@@ -5,7 +5,7 @@ outputs:
 - name: out
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/create-release-wiki-page.yml b/concourse/tasks/create-release-wiki-page.yml
index d85602a4d..62407ad8a 100644
--- a/concourse/tasks/create-release-wiki-page.yml
+++ b/concourse/tasks/create-release-wiki-page.yml
@@ -11,7 +11,7 @@ params:
   wiki_page_file_name: Current-VSCode-Releases
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/fatjars-language-servers.yml b/concourse/tasks/fatjars-language-servers.yml
index d3de990d5..38bfb3ef8 100644
--- a/concourse/tasks/fatjars-language-servers.yml
+++ b/concourse/tasks/fatjars-language-servers.yml
@@ -6,7 +6,7 @@ outputs:
 - name: maven-out
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/npm-publish.yml b/concourse/tasks/npm-publish.yml
index c6fed0e9f..257fd6d8e 100644
--- a/concourse/tasks/npm-publish.yml
+++ b/concourse/tasks/npm-publish.yml
@@ -1,6 +1,6 @@
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/publish-concourse-vsix-release.yml b/concourse/tasks/publish-concourse-vsix-release.yml
index 7c78f63ca..a28aebf08 100644
--- a/concourse/tasks/publish-concourse-vsix-release.yml
+++ b/concourse/tasks/publish-concourse-vsix-release.yml
@@ -5,7 +5,7 @@ platform: linux
 run:
   path: sts4/concourse/tasks/publish-vsix-releases.sh
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/publish-ovsx-releases.yml b/concourse/tasks/publish-ovsx-releases.yml
index cce584fa1..c331e7840 100644
--- a/concourse/tasks/publish-ovsx-releases.yml
+++ b/concourse/tasks/publish-ovsx-releases.yml
@@ -8,7 +8,7 @@ platform: linux
 run:
   path: sts4/concourse/tasks/publish-ovsx-releases.sh
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/publish-vsix-releases.yml b/concourse/tasks/publish-vsix-releases.yml
index 4168656e3..cb007b89f 100644
--- a/concourse/tasks/publish-vsix-releases.yml
+++ b/concourse/tasks/publish-vsix-releases.yml
@@ -8,7 +8,7 @@ platform: linux
 run:
   path: sts4/concourse/tasks/publish-vsix-releases.sh
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/rc-build.yml b/concourse/tasks/rc-build.yml
index c15307397..70cc469ca 100644
--- a/concourse/tasks/rc-build.yml
+++ b/concourse/tasks/rc-build.yml
@@ -10,7 +10,7 @@ run:
 params:
   extension_id: undefined_extension_id
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/unpack.yml b/concourse/tasks/unpack.yml
index 6494fdc6a..4abc5bbb7 100644
--- a/concourse/tasks/unpack.yml
+++ b/concourse/tasks/unpack.yml
@@ -1,6 +1,6 @@
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/verify-vsce-token.yml b/concourse/tasks/verify-vsce-token.yml
index e1efa20bf..8db44e245 100644
--- a/concourse/tasks/verify-vsce-token.yml
+++ b/concourse/tasks/verify-vsce-token.yml
@@ -2,7 +2,7 @@ inputs:
 - name: sts4
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))
diff --git a/concourse/tasks/vsce-publish.yml b/concourse/tasks/vsce-publish.yml
index c8e97c5e9..b39a8748a 100644
--- a/concourse/tasks/vsce-publish.yml
+++ b/concourse/tasks/vsce-publish.yml
@@ -6,7 +6,7 @@ outputs:
 - name: website
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     username: ((docker_hub_username))
     password: ((docker_hub_password))