diff --git a/CHANGELOG.md b/CHANGELOG.md
index c461d350a8..cbd42c037c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## [2.18.0] - 2019-08-26
+
+## Added
+- Added a config.HA_strict flag to allow role size overrides on top of config.HA 
+
+## Changed
+- Bumped binary-buildpack release to 1.0.33
+- Bumped cf-deployment to 9.5
+- Bumped cflinuxfs3 to 0.118.0
+- Bumped dotnet-core-buildpack release to 2.2.13
+- Bumped eirini release to 0.0.15  
+- Bumped go-buildpack release to 1.8.42
+- Bumped groot-btrfs release to 1.0.5
+- Bumped java-buildpack release to 4.20.0
+- Bumped nginx-buildpack release to 1.0.15
+- Bump nodejs-buildpack release to 1.6.53
+- Bumped PHP buildpack release to 4.3.80
+- Bumped python-buildpack release to 1.6.36
+- Bumped ruby-buildpack release to 1.7.42
+- Bumped scf-helper release to 1.0.3
+- Bumped SLE12 and SLE15 stacks
+- Removed the cluster-admin role binding for the eirini service account
+- Switched SCF over to PXC from cf-mysql for database management
+
+
 ## [2.17.1] - 2019-07-03
 
 ## Added
diff --git a/src/scf-release/src/github.com/cloudfoundry/cf-acceptance-tests b/src/scf-release/src/github.com/cloudfoundry/cf-acceptance-tests
index 88491bc21d..2d9901c098 160000
--- a/src/scf-release/src/github.com/cloudfoundry/cf-acceptance-tests
+++ b/src/scf-release/src/github.com/cloudfoundry/cf-acceptance-tests
@@ -1 +1 @@
-Subproject commit 88491bc21d9b010fb2a6c179e5b977b7feeb1487
+Subproject commit 2d9901c0986b8e67c585061acc6626afc36acfea
diff --git a/src/uaa-fissile-release b/src/uaa-fissile-release
index 93fb6be750..d5543953de 160000
--- a/src/uaa-fissile-release
+++ b/src/uaa-fissile-release
@@ -1 +1 @@
-Subproject commit 93fb6be7508fdd78ef982f62f47e8a89c9b293dd
+Subproject commit d5543953de2ed8714811409f4d2006117355caf3