diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 98a5fdc..34d7b4e 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -25,7 +25,7 @@ meta:
     name:   (( param "Please provide the git name for automated commits" ))
 
   image:
-    name: starkandwayne/concourse
+    name: registry.ops.scalecf.net/genesis-community/concourse
     tag: latest
 
   aws:
@@ -79,15 +79,11 @@ jobs:
     public: true
     serial: true
     plan:
-    - name: main
-      do:
-      - name: get
-        in_parallel:
+    - do:
+      - in_parallel:
         - { get: git, trigger: true }
-      - name: testflights
-        in_parallel:
-        - name: testflight
-          task: testflight
+      - in_parallel:
+        - task: testflight
           config:
             platform: linux
             image_resource:
@@ -250,12 +246,10 @@ jobs:
     serial: true
     plan:
     - do:
-      - name: inputs
-        in_parallel:
+      - in_parallel:
           - { get: version, passed: [rc], params: {bump: final} }
           - { get: git,     passed: [rc] }
-      - name: release
-        task: release
+      - task: release
         config:
           platform: linux
           image_resource:
@@ -285,28 +279,23 @@ jobs:
             AWS_ACCESS_KEY: (( grab meta.aws.access_key ))
             AWS_SECRET_KEY: (( grab meta.aws.secret_key ))
 
-      - name: upload-git
-        put: git
+      - put: git
         params:
           rebase: true
           repository: pushme/git
-      - name: tarball
-        put: s3-tarball
+      - put: s3-tarball
         params:
           file:  (( concat "gh/artifacts/" meta.name "-*.tgz" ))
-      - name: github-release
-        put: github
+      - put: github
         params:
           name:   gh/name
           tag:    gh/tag
           body:   gh/notes.md
           globs: [gh/artifacts/*]
-      - name: version-bump
-        put: version
+      - put: version
         params:
           bump: patch
-      - name: notify
-        in_parallel:
+      - in_parallel:
         - put: notify
           params:
             method: announce
diff --git a/ci/settings.yml b/ci/settings.yml
index a985c8a..331d9a4 100644
--- a/ci/settings.yml
+++ b/ci/settings.yml
@@ -2,35 +2,35 @@
 meta:
   name:    toolbelt
   release: Toolbelt
-  target:  pipes
-  url:     https://pipes.starkandwayne.com
+  target:  pipes/cloudfoundry-community
+  url:     https://pipes.scalecf.net
 
   initial_version: 2.1.0
 
   git:
-    email: ci@starkandwayne.com
-    name:  Stark & Wayne CI Bot
+    email: ((cloudfoundry-community-ci-bot-github.email))
+    name:  ((cloudfoundry-community-ci-bot-github.name))
 
   bosh-lite:
-    target:   https://10.128.4.73:25555
+    target:   ((thunder-dome.url))
     username: ((thunder-dome.username))
     password: ((thunder-dome.password))
     cacert:   ((thunder-dome.ca-certificate))
 
   aws:
-    access_key: ((cfcommunity.access))
-    secret_key: ((cfcommunity.secret))
+    access_key: ((cloudfoundry-community-aws.access_key_id))
+    secret_key: ((cloudfoundry-community-aws.secret_access_key))
 
   github:
     owner:  cloudfoundry-community
     repo:   toolbelt-boshrelease
     branch: master
-    private_key:  ((github.private-key))
-    access_token: ((github.access-token))
+    private_key:  ((cloudfoundry-community-ci-bot-github.private_key))
+    access_token: ((cloudfoundry-community-ci-bot-github.access_token_rw))
 
 
   shout:
-    url:      http://10.128.4.65:7109
+    url:      ((shout.url))
     username: ((shout.username))
     password: ((shout.password))
 
@@ -115,3 +115,4 @@ resources:
       repository: spruce
       access_token: (( grab meta.github.access_token ))
   # }}}
+