diff --git a/bosh-init.rb b/bosh-init.rb
deleted file mode 100644
index db4b746..0000000
--- a/bosh-init.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "FileUtils"
-
-class BoshInit < Formula
-  homepage "https://github.com/cloudfoundry/bosh-init"
-
-  v = "v0.0.100" # CI Managed
-  # remove v from version number
-  @@verNum = v.sub "v", ""
-  url "https://s3.amazonaws.com/bosh-init-artifacts/bosh-init-#{@@verNum}-darwin-amd64"
-  version v
-  sha256 "" # CI Managed
-
-  def install
-    FileUtils.mv("bosh-init-#{@@verNum}-darwin-amd64", "bosh-init")
-    bin.install "bosh-init"
-  end
-
-  test do
-    system "#{bin}/bosh-init", "--version"
-  end
-end
diff --git a/bosh2.rb b/bosh.rb
similarity index 68%
rename from bosh2.rb
rename to bosh.rb
index 4172f83..78c75fd 100644
--- a/bosh2.rb
+++ b/bosh.rb
@@ -1,6 +1,6 @@
 require "FileUtils"
 
-class Bosh2 < Formula
+class Bosh < Formula
   homepage "https://github.com/cloudfoundry/bosh-cli"
 
   v = "v5.1.2" # CI Managed
@@ -11,11 +11,11 @@ class Bosh2 < Formula
   sha256 "" # CI Managed
 
   def install
-    FileUtils.mv("bosh-cli-#{@@verNum}-darwin-amd64", "bosh2")
-    bin.install "bosh2"
+    FileUtils.mv("bosh-cli-#{@@verNum}-darwin-amd64", "bosh")
+    bin.install "bosh"
   end
 
   test do
-    system "#{bin}/bosh2", "--version"
+    system "#{bin}/bosh", "--version"
   end
 end
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index fec1620..f1e869f 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -52,9 +52,8 @@ groups:
   - gotcha-debian
   - genesis-homebrew
   - genesis-debian
-  - bosh2-homebrew
+  - bosh-homebrew
   - bosh-cli-debian
-  - bosh-init-homebrew
   - credhub-cli-debian
   - uaa-cli-homebrew
   - uaa-cli-debian
@@ -84,10 +83,9 @@ groups:
   - kafka-service-broker-homebrew
   - gotcha-homebrew
   - genesis-homebrew
-  - bosh2-homebrew
+  - bosh-homebrew
   - uaa-cli-homebrew
   - riff-homebrew
-  - bosh-init-homebrew
   - govc-homebrew
 - name: debian
   jobs:
@@ -690,7 +688,7 @@ jobs:
           REPO_ROOT: homebrew
           REPO_OUT: pushme
           IN_BINARY: "bosh-cli-*-linux-amd64"
-          OUT_BINARY: bosh bosh2
+          OUT_BINARY: bosh bosh
           NAME: bosh-cli
           LICENSE: Apache2
           DESCRIPTION: Interact with BOSH director
@@ -704,15 +702,15 @@ jobs:
           GPG_PUBLIC_KEY: (( grab meta.gpg.public_key ))
           GPG_PRIVATE_KEY: (( grab meta.gpg.private_key ))
 
-  - name: bosh2-homebrew
+  - name: bosh-homebrew
     public: true
     serial: true
     plan:
     - aggregate:
       - get: homebrew
         resource: homebrew
-      - get: bosh2
-        resource: bosh2
+      - get: bosh
+        resource: bosh
         trigger: true
     - task: update-homebrew
       config:
@@ -720,14 +718,14 @@ jobs:
         image_resource: (( grab meta.image ))
         inputs:
         - name: homebrew
-        - name: bosh2
+        - name: bosh
           path: recipe
         outputs:
         - name: pushme
         run:
           path: "homebrew/ci/scripts/update-homebrew.sh"
           args:
-          - bosh2.rb
+          - bosh.rb
         params:
           REPO_ROOT: homebrew
           REPO_OUT: pushme
@@ -737,39 +735,6 @@ jobs:
         repository: pushme/homebrew
         rebase: true
 
-  - name: bosh-init-homebrew
-    public: true
-    serial: true
-    plan:
-    - aggregate:
-      - get: homebrew
-        resource: homebrew
-      - get: bosh-init
-        resource: bosh-init
-        trigger: true
-    - task: update-homebrew
-      config:
-        platform: linux
-        image_resource: (( grab meta.image ))
-        inputs:
-        - name: homebrew
-        - name: bosh-init
-          path: recipe
-        outputs:
-        - name: pushme
-        run:
-          path: "homebrew/ci/scripts/update-homebrew.sh"
-          args:
-          - bosh-init.rb
-        params:
-          REPO_ROOT: homebrew
-          REPO_OUT: pushme
-          BINARY: "bosh-init-*-darwin-amd64"
-    - put: homebrew
-      params:
-        repository: pushme/homebrew
-        rebase: true
-
   - name: credhub-cli-debian
     public: true
     serial_groups: [apt]
@@ -1697,7 +1662,7 @@ resources:
     repository: install-debs-in-order
     access_token: (( grab meta.github.access_token ))
 
-- name: bosh2
+- name: bosh
   type: github-release
   source:
     user: cloudfoundry
@@ -1710,13 +1675,6 @@ resources:
     bucket: bosh-cli-artifacts
     regexp: bosh-cli-(.*)-linux-amd64
 
-- name: bosh-init
-  type: github-release
-  source:
-    user: cloudfoundry
-    repository: bosh-init
-    access_token: (( grab meta.github.access_token ))
-
 - name: credhub-cli
   type: github-release
   source:
diff --git a/ci/settings.yml b/ci/settings.yml
index ea7c431..97cc40b 100644
--- a/ci/settings.yml
+++ b/ci/settings.yml
@@ -1,23 +1,23 @@
 ---
 meta:
   name: homebrew-recipes
-  target: sw
+  target: pipes
 
   github:
     owner: starkandwayne
     repo: homebrew-cf
-    private_key: (( vault  "secret/pipelines/shared/github:private_key" ))
-    access_token: (( vault "secret/pipelines/shared/github:access_token" ))
+    private_key: (( vault  "secret/pipelines/github/starkandwayne/ci-bot:private" ))
+    access_token: (( vault "secret/pipelines/github/starkandwayne/ci-bot:access_token" ))
 
   debian:
     s3_bucket: apt.starkandwayne.com
-    aws_access_key: (( vault "secret/pipelines/homebrew/aws:aws_access_key" ))
-    aws_secret_key: (( vault "secret/pipelines/homebrew/aws:aws_secret_key" ))
+    aws_access_key: (( vault "secret/pipelines/aws/packaging:access_key" ))
+    aws_secret_key: (( vault "secret/pipelines/aws/packaging:secret_key" ))
 
   gpg:
-    id:  (( vault "secret/pipelines/homebrew/gpg:id" ))
-    public_key:  (( vault "secret/pipelines/homebrew/gpg:public" ))
-    private_key: (( vault "secret/pipelines/homebrew/gpg:private" ))
+    id:  (( vault "secret/pipelines/gpg/packaging:id" ))
+    public_key:  (( vault "secret/pipelines/gpg/packaging:public" ))
+    private_key: (( vault "secret/pipelines/gpg/packaging:private" ))
 
   pivnet:
-    api-token: (( vault "secret/pipelines/" meta.pipeline "/pivnet:api-token" ))
+    api-token: (( vault "secret/pipelines/pivnet/starkandwayne:token" ))