diff --git a/.final_builds/packages/golang-1.9-linux/index.yml b/.final_builds/packages/golang-1.9-linux/index.yml
new file mode 100644
index 0000000..7bb5e8a
--- /dev/null
+++ b/.final_builds/packages/golang-1.9-linux/index.yml
@@ -0,0 +1,6 @@
+builds:
+  39df05b363c89f1abccf002e7b3a7e996bfdacfd:
+    version: 39df05b363c89f1abccf002e7b3a7e996bfdacfd
+    blobstore_id: 9711c45c-446f-4bd9-743b-e0b63a42f36a
+    sha1: 438ddb99d4336c55ce9e74e130e398e5a3e4962f
+format-version: "2"
diff --git a/.final_builds/packages/golang-1.9-windows/index.yml b/.final_builds/packages/golang-1.9-windows/index.yml
new file mode 100644
index 0000000..4138bd4
--- /dev/null
+++ b/.final_builds/packages/golang-1.9-windows/index.yml
@@ -0,0 +1,6 @@
+builds:
+  7c276112e0b920266176deab6dcd1a208be10d1d:
+    version: 7c276112e0b920266176deab6dcd1a208be10d1d
+    blobstore_id: 5f4e0fef-6cf6-4484-51bd-79d3d4af8e34
+    sha1: 4d18889c0f1a4a28502656ea893e4a4ae3d5ba01
+format-version: "2"
diff --git a/jobs/acceptance-tests/spec b/jobs/acceptance-tests/spec
index 6da91e4..042017d 100644
--- a/jobs/acceptance-tests/spec
+++ b/jobs/acceptance-tests/spec
@@ -6,7 +6,7 @@ templates:
 packages:
  - acceptance-tests
  - consul
- - golang-1.8-linux
+ - golang-1.9-linux
 
 properties:
   consul.acceptance_tests.bosh.target:
diff --git a/jobs/acceptance-tests/templates/test.sh.erb b/jobs/acceptance-tests/templates/test.sh.erb
index e12d94a..952de7b 100644
--- a/jobs/acceptance-tests/templates/test.sh.erb
+++ b/jobs/acceptance-tests/templates/test.sh.erb
@@ -2,7 +2,7 @@
 
 CONSATS_DIR="/var/vcap/packages/acceptance-tests"
 pushd ${CONSATS_DIR} > /dev/null
-  source /var/vcap/packages/golang-1.8-linux/bosh/runtime.env
+  source /var/vcap/packages/golang-1.9-linux/bosh/runtime.env
 popd > /dev/null
 
 export PATH="${PATH}:/var/vcap/packages/consul/bin"
diff --git a/packages/acceptance-tests-windows/packaging b/packages/acceptance-tests-windows/packaging
index af1a304..84dc3a0 100644
--- a/packages/acceptance-tests-windows/packaging
+++ b/packages/acceptance-tests-windows/packaging
@@ -6,7 +6,7 @@ trap { $host.SetShouldExit(1) }
 $BOSH_INSTALL_TARGET = Resolve-Path "${env:BOSH_INSTALL_TARGET}"
 
 Push-Location ${BOSH_INSTALL_TARGET}
-. C:\var\vcap\packages\golang-1.8-windows\bosh\compile.ps1
+. C:\var\vcap\packages\golang-1.9-windows\bosh\compile.ps1
 Pop-Location
 
 # acceptance-tests
diff --git a/packages/acceptance-tests-windows/spec b/packages/acceptance-tests-windows/spec
index c2d042c..094ef2d 100644
--- a/packages/acceptance-tests-windows/spec
+++ b/packages/acceptance-tests-windows/spec
@@ -2,7 +2,7 @@
 name: acceptance-tests-windows
 
 dependencies:
-  - golang-1.8-windows
+  - golang-1.9-windows
 
 files:
  - acceptance-tests/**/*
diff --git a/packages/acceptance-tests/packaging b/packages/acceptance-tests/packaging
index 7bdcfd8..0b8429b 100644
--- a/packages/acceptance-tests/packaging
+++ b/packages/acceptance-tests/packaging
@@ -1,7 +1,7 @@
 #!/bin/bash -exu
 
 pushd ${BOSH_INSTALL_TARGET} > /dev/null
-  source /var/vcap/packages/golang-1.8-linux/bosh/compile.env
+  source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
 popd > /dev/null
 
 mkdir -p "${BOSH_INSTALL_TARGET}/src/github.com/cloudfoundry-incubator/consul-release/src/acceptance-tests/"
diff --git a/packages/acceptance-tests/spec b/packages/acceptance-tests/spec
index 26d77d4..052580c 100644
--- a/packages/acceptance-tests/spec
+++ b/packages/acceptance-tests/spec
@@ -2,7 +2,7 @@
 name: acceptance-tests
 
 dependencies:
-  - golang-1.8-linux
+  - golang-1.9-linux
 
 files:
  - acceptance-tests/**/*
diff --git a/packages/confab-windows/packaging b/packages/confab-windows/packaging
index 502d771..02199d4 100755
--- a/packages/confab-windows/packaging
+++ b/packages/confab-windows/packaging
@@ -6,7 +6,7 @@ trap { $host.SetShouldExit(1) }
 $BOSH_INSTALL_TARGET = Resolve-Path "${env:BOSH_INSTALL_TARGET}"
 
 Push-Location ${BOSH_INSTALL_TARGET}
-. "C:\var\vcap\packages\golang-1.8-windows\bosh\compile.ps1"
+. "C:\var\vcap\packages\golang-1.9-windows\bosh\compile.ps1"
 Pop-Location
 
 $pkg_path="github.com\cloudfoundry-incubator\consul-release\src\confab\confab"
diff --git a/packages/confab-windows/spec b/packages/confab-windows/spec
index 0c5062d..1271c6c 100755
--- a/packages/confab-windows/spec
+++ b/packages/confab-windows/spec
@@ -2,7 +2,7 @@
 name: confab-windows
 
 dependencies:
-  - golang-1.8-windows
+  - golang-1.9-windows
 
 files:
   - confab/**/*
diff --git a/packages/confab/packaging b/packages/confab/packaging
index 8244fbd..2879604 100644
--- a/packages/confab/packaging
+++ b/packages/confab/packaging
@@ -1,7 +1,7 @@
 #!/bin/bash -exu
 
 pushd ${BOSH_INSTALL_TARGET} > /dev/null
-  source /var/vcap/packages/golang-1.8-linux/bosh/compile.env
+  source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
 popd > /dev/null
 
 mkdir -p "${BOSH_INSTALL_TARGET}/src/github.com/cloudfoundry-incubator/consul-release/src"
diff --git a/packages/confab/spec b/packages/confab/spec
index 6cf31a0..70cf30b 100644
--- a/packages/confab/spec
+++ b/packages/confab/spec
@@ -2,7 +2,7 @@
 name: confab
 
 dependencies:
-  - golang-1.8-linux
+  - golang-1.9-linux
 
 files:
   - confab/**/*
diff --git a/packages/golang-1.9-linux/spec.lock b/packages/golang-1.9-linux/spec.lock
new file mode 100644
index 0000000..2068543
--- /dev/null
+++ b/packages/golang-1.9-linux/spec.lock
@@ -0,0 +1,2 @@
+name: golang-1.9-linux
+fingerprint: 39df05b363c89f1abccf002e7b3a7e996bfdacfd
diff --git a/packages/golang-1.9-windows/spec.lock b/packages/golang-1.9-windows/spec.lock
new file mode 100644
index 0000000..013ef1b
--- /dev/null
+++ b/packages/golang-1.9-windows/spec.lock
@@ -0,0 +1,2 @@
+name: golang-1.9-windows
+fingerprint: 7c276112e0b920266176deab6dcd1a208be10d1d