diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index dc3e31d5b..c18aba14f 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -229,7 +229,7 @@ resources:
     access_key_id: ((s3_prod_accesskey))
     secret_access_key: ((s3_prod_secretkey))
     region_name: ((s3_region))
-    path: snapshot/STS4/vscode-extensions
+    path: snapshot/STS4/((branch))/vscode-extensions
     options:
     - "--acl public-read"
 # - name: atom-snapshot-website
@@ -265,17 +265,17 @@ resources:
   source:
     driver: s3
     bucket: ((s3_bucket))
-    key: versions/vscode-extensions
+    key: versions/((branch))/vscode-extensions
     access_key_id: ((s3_accesskey))
     secret_access_key: ((s3_secretkey))
     region_name: ((s3_region))
-    initial_version: 0.0.5-RC.6
+    initial_version: 1.8.0
 - name: theia-version
   type: semver
   source:
     driver: s3
     bucket: ((s3_bucket))
-    key: versions/theia-extensions
+    key: versions/((branch))/theia-extensions
     access_key_id: ((s3_accesskey))
     secret_access_key: ((s3_secretkey))
     region_name: ((s3_region))
diff --git a/concourse/set-pipeline.py b/concourse/set-pipeline.py
index 880bc74e7..966f513da 100755
--- a/concourse/set-pipeline.py
+++ b/concourse/set-pipeline.py
@@ -16,7 +16,7 @@ if branch == 'master':
               '      -p sts4-'+ branch +' -c pipeline.yml')
 else:
     fname = "pipeline-"+branch+".yml"
-    replace("pipeline.yml", "pipeline-"+branch+".yml", "snapshot", branch)
+    replace("pipeline.yml", "pipeline-"+branch+".yml", "((branch))", branch)
     with open(fname, 'r') as fin:
         print fin.read()
     cmd = ('fly -t tools set-pipeline ' +