diff --git a/.versions b/.versions
index be25df4a..1d884a3a 100644
--- a/.versions
+++ b/.versions
@@ -1,4 +1,4 @@
 credhub=1.6.0
-bucc=0.4.0
+bucc=0.4.1
 bbr=1.2.0
 bosh=2.0.48
diff --git a/ci/tasks/generate-release-notes/task b/ci/tasks/generate-release-notes/task
index 9d54e27b..efe8caca 100755
--- a/ci/tasks/generate-release-notes/task
+++ b/ci/tasks/generate-release-notes/task
@@ -10,7 +10,7 @@ touch ${custom_notes}
 cp ${custom_notes} ${notes}
 
 get_releases() {
-    non_unique_releases=$(bosh int <(echo "releases: []") -o <(spruce json <(echo -e "ops:\n$(find ops -name '*.yml' -exec bosh int {} \; | grep -v -E '^null')") | jq '.ops | map(select(.path | contains("/releases")))'))
+    non_unique_releases=$(bosh2 int src/bosh-deployment/bosh.yml --path /releases -o <(spruce json <(echo -e "ops:\n$(find ops -name '*.yml' -exec bosh2 int {} \; | grep -v -E '^null')") | jq '.ops | map(select(.path | contains("/releases/-")))'))
     spruce json <(echo -e "${non_unique_releases}") | jq -c -r -M '.releases | sort_by(.name) | unique_by(.name) | .[]'
 }
 
diff --git a/ci/tasks/shipit/task b/ci/tasks/shipit/task
index b73c7acb..1e3e5542 100755
--- a/ci/tasks/shipit/task
+++ b/ci/tasks/shipit/task
@@ -20,6 +20,16 @@ rm -f ci/release_notes.md
 
 sed -i "s/.*bucc.*/bucc=$VERSION/" .versions
 
+$ cat <<EOF > ops/5-bucc-version.yml
+# Generated by ci/tasks/shipit/task
+- type: replace
+  path: /instance_groups/name=bosh/jobs/name=credhub-importer/properties/credhub/import_credentials/-
+  value:
+    name: concourse/main/bucc_version
+    type: value
+    value: ${VERSION}
+EOF
+
 git add -A
 git commit -m "release: v${VERSION}"
 
diff --git a/ops/3-concourse-release.yml b/ops/3-concourse-release.yml
index c977299d..019c255c 100644
--- a/ops/3-concourse-release.yml
+++ b/ops/3-concourse-release.yml
@@ -2,6 +2,6 @@
   path: /releases/name=concourse?
   value:
     name: concourse
-    version: 3.8.0
-    url: https://bosh.io/d/github.com/concourse/concourse?v=3.8.0
-    sha1: 99e134676df72e18c719ccfbd7977bd9449e6fd4
+    version: 3.9.1
+    url: https://bosh.io/d/github.com/concourse/concourse?v=3.9.1
+    sha1: 235c704d50e62c9e089865dd43306659d5207690
diff --git a/ops/5-bucc-version.yml b/ops/5-bucc-version.yml
new file mode 100644
index 00000000..e652e91d
--- /dev/null
+++ b/ops/5-bucc-version.yml
@@ -0,0 +1,7 @@
+# Generated by ci/tasks/shipit/task
+- type: replace
+  path: /instance_groups/name=bosh/jobs/name=credhub-importer/properties/credhub/import_credentials/-
+  value:
+    name: concourse/main/bucc_version
+    type: value
+    value: 0.4.1
diff --git a/ops/6-bucc-bbr.yml b/ops/6-bucc-bbr.yml
index bcb213b6..66842025 100644
--- a/ops/6-bucc-bbr.yml
+++ b/ops/6-bucc-bbr.yml
@@ -3,7 +3,7 @@
   value:
     name: bucc-bbr
     url: git+https://github.com/starkandwayne/bucc-bbr-boshrelease
-    version: 4
+    version: 5
 
 - type: replace
   path: /instance_groups/name=bosh/jobs/-
diff --git a/ops/9-bucc-bbr-compiled-release.yml b/ops/9-bucc-bbr-compiled-release.yml
index 0cf06d72..3025fca8 100644
--- a/ops/9-bucc-bbr-compiled-release.yml
+++ b/ops/9-bucc-bbr-compiled-release.yml
@@ -2,6 +2,6 @@
   path: /releases/name=bucc-bbr?
   value:
     name: bucc-bbr
-    version: 4
-    url: https://s3-eu-west-1.amazonaws.com/bucc-compiled-releases/bucc-bbr-4-ubuntu-trusty-3468.21-20180222-105456-385508399.tgz
-    sha1: 0f5569802d402e2f5291bda48a75b8f99225fe98
+    version: 5
+    url: https://s3-eu-west-1.amazonaws.com/bucc-compiled-releases/bucc-bbr-5-ubuntu-trusty-3468.21-20180309-122319-958549201.tgz
+    sha1: 986e2590d046fb42905dbad538a174706fea533b
diff --git a/ops/cpis/aws/flags/spot-instance.yml b/ops/cpis/aws/flags/spot-instance.yml
new file mode 100644
index 00000000..7037ae2b
--- /dev/null
+++ b/ops/cpis/aws/flags/spot-instance.yml
@@ -0,0 +1,3 @@
+- type: replace
+  path: /resource_pools/name=vms/cloud_properties/spot_bid_price?
+  value: ((spot_bid_price))
diff --git a/ops/cpis/aws/vars.tmpl b/ops/cpis/aws/vars.tmpl
index b9508571..83c1775d 100644
--- a/ops/cpis/aws/vars.tmpl
+++ b/ops/cpis/aws/vars.tmpl
@@ -13,3 +13,6 @@ private_key:
 
 instance_type:  m4.xlarge
 ephemeral_disk_size: 25_000
+
+# flag: --spot-instance
+spot_bid_price: # Bid price in dollars for AWS spot instance
diff --git a/src/bosh-deployment/aws/cli-iam-instance-profile.yml b/src/bosh-deployment/aws/cli-iam-instance-profile.yml
new file mode 100644
index 00000000..30d78da1
--- /dev/null
+++ b/src/bosh-deployment/aws/cli-iam-instance-profile.yml
@@ -0,0 +1,10 @@
+---
+- type: replace
+  path: /cloud_provider/properties/aws/credentials_source?
+  value: env_or_profile
+
+- type: remove
+  path: /cloud_provider/properties/aws/access_key_id
+
+- type: remove
+  path: /cloud_provider/properties/aws/secret_access_key
diff --git a/src/bosh-deployment/aws/iam-instance-profile.yml b/src/bosh-deployment/aws/iam-instance-profile.yml
index 7201318d..04e002cd 100644
--- a/src/bosh-deployment/aws/iam-instance-profile.yml
+++ b/src/bosh-deployment/aws/iam-instance-profile.yml
@@ -1,10 +1,4 @@
 ---
-- type: remove
-  path: /resource_pools/name=vms/cloud_properties/access_key_id?
-
-- type: remove
-  path: /resource_pools/name=vms/cloud_properties/secret_access_key?
-
 - type: replace
   path: /resource_pools/name=vms/cloud_properties/iam_instance_profile?
   value: ((iam_instance_profile))
diff --git a/src/bosh-deployment/docker/cloud-config.yml b/src/bosh-deployment/docker/cloud-config.yml
index 4e0ade02..22fea5d6 100644
--- a/src/bosh-deployment/docker/cloud-config.yml
+++ b/src/bosh-deployment/docker/cloud-config.yml
@@ -17,6 +17,8 @@ networks:
   - azs: [z1, z2, z3]
     range: 10.245.0.0/16
     dns: [8.8.8.8]
+    # IPs that will not be used for anything
+    reserved: [10.245.0.2-10.245.0.10]
     gateway: 10.245.0.1
     static: [10.245.0.34]
     cloud_properties:
diff --git a/src/bosh-deployment/gcp/cpi.yml b/src/bosh-deployment/gcp/cpi.yml
index 5c92d33e..e8c77003 100644
--- a/src/bosh-deployment/gcp/cpi.yml
+++ b/src/bosh-deployment/gcp/cpi.yml
@@ -3,9 +3,9 @@
   path: /releases/-
   value:
     name: bosh-google-cpi
-    version: "26.0.0"
-    url: https://bosh.io/d/github.com/cloudfoundry-incubator/bosh-google-cpi-release?v=26.0.0
-    sha1: 96a59530bba6dd4d3f6f04d12c37b99c4377064c
+    version: "27.0.0"
+    url: https://bosh.io/d/github.com/cloudfoundry-incubator/bosh-google-cpi-release?v=27.0.0
+    sha1: cbbf73c102b1f27d3db15d95bc971b2b4995c78e
 
 - type: replace
   path: /resource_pools/name=vms/stemcell?
diff --git a/src/bosh-deployment/misc/ipv6/bosh.yml b/src/bosh-deployment/misc/ipv6/bosh.yml
index 3c17fc71..32372b91 100644
--- a/src/bosh-deployment/misc/ipv6/bosh.yml
+++ b/src/bosh-deployment/misc/ipv6/bosh.yml
@@ -27,16 +27,3 @@
 - type: replace
   path: /instance_groups/name=bosh/properties/blobstore/address
   value: "[((internal_ip))]"
-
-- type: replace
-  path: /instance_groups/name=bosh/properties/director/address
-  value: "[((internal_ip))]"
-
-# eventmachine does not like ipv6 addresses
-- type: replace
-  path: /instance_groups/name=bosh/properties/nats/address
-  value: "localhost"
-
-- type: replace
-  path: /variables/name=nats_server_tls/options/alternative_names/-
-  value: localhost
diff --git a/src/bosh-deployment/misc/ntp.yml b/src/bosh-deployment/misc/ntp.yml
new file mode 100644
index 00000000..9952b1ce
--- /dev/null
+++ b/src/bosh-deployment/misc/ntp.yml
@@ -0,0 +1,6 @@
+- type: replace
+  path: /instance_groups/name=bosh/properties/ntp?
+  value: ((internal_ntp))
+- type: replace
+  path: /cloud_provider/properties/ntp?
+  value: ((internal_ntp))
diff --git a/src/bosh-deployment/openstack/cpi.yml b/src/bosh-deployment/openstack/cpi.yml
index 67c76bea..67994831 100644
--- a/src/bosh-deployment/openstack/cpi.yml
+++ b/src/bosh-deployment/openstack/cpi.yml
@@ -3,9 +3,9 @@
   path: /releases/-
   value:
     name: bosh-openstack-cpi
-    version: "37"
-    url: https://bosh.io/d/github.com/cloudfoundry-incubator/bosh-openstack-cpi-release?v=37
-    sha1: 4507b907955909bc8036afc1cf6be339b306ca03
+    version: "38"
+    url: https://bosh.io/d/github.com/cloudfoundry-incubator/bosh-openstack-cpi-release?v=38
+    sha1: 9e149e64612f8a705eb9c069fd4ebf268af5ae46
 
 - type: replace
   path: /resource_pools/name=vms/stemcell?
diff --git a/src/bosh-deployment/softlayer/cpi-dynamic.yml b/src/bosh-deployment/softlayer/cpi-dynamic.yml
index 9bf49ccd..bed49539 100644
--- a/src/bosh-deployment/softlayer/cpi-dynamic.yml
+++ b/src/bosh-deployment/softlayer/cpi-dynamic.yml
@@ -95,3 +95,11 @@
 - type: replace
   path: /cloud_provider/properties/softlayer?
   value: *softlayer
+
+- type: replace
+  path: /instance_groups/name=bosh/properties/blobstore/address?
+  value: 127.0.0.1
+
+- type: replace
+  path: /instance_groups/name=bosh/properties/nats/address?
+  value: 127.0.0.1
\ No newline at end of file