diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d7d8e2bd..961896041 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,39 @@
-# Change Log
+# Changelog
+
+## [v4.3.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v4.3.0) (2020-03-16)
+
+[Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v4.2.0...v4.3.0)
+
+**Implemented enhancements:**
+
+- bump terraform flexible engine to version 1.11 [\#308](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/308)
+- Quick overview of bosh release versions used by a root deployment  [\#305](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/305)
+- Leverage icons to ease resource identification [\#304](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/304)
+- multiple markers for iaas-type \(~ profile tag\) [\#79](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/79)
+
+**Closed issues:**
+
+- Replace deprecated docker images [\#303](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/303)
+- Support concourse latest version \(5.8.x\) [\#299](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/299)
+- delete lifecyle does not clean up generated bosh manifest in secrets repo [\#65](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/65)
+
+**Merged pull requests:**
+
+- fix\(manifest-bosh-deployment-information\): add optional resource to have deployment\_information file available [\#318](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/318)
+- feature\(display-bosh-deployment-information\) [\#317](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/317)
+- fix\(bootstrap-all-init-pipeline\): replace curl by wget [\#316](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/316)
+- refactor\(rubocop\): fix warnings [\#315](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/315)
+- fix\(bootstrap-all-init-pipeline\): auto detect credentials files [\#314](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/314)
+- feature\(bosh-delete-deployment\): fail-slow, to delete as much deployments as possible [\#313](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/313)
+- feature\(remove-spiff-references\): as spiff image is not used anymore, it is not required to keep such references [\#311](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/311)
+- Support auto sorted profiles [\#310](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/310)
+- Bump images from orange-cloudfoundry/paas-docker-cloudfoundry-tools [\#309](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/309)
+- Support profiles [\#306](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/306)
+- feature\(concourse\): support concourse 5.8 [\#302](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/302)
+- chore\(gem\): bump to latest gem \(rspec, simplecov, github\_changelog\_generator, ...\) [\#301](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/301)
 
 ## [v4.2.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v4.2.0) (2020-01-08)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v4.1.0...v4.2.0)
 
 **Implemented enhancements:**
@@ -31,6 +64,7 @@
 - Rework cloud and runtime config support [\#291](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/291)
 
 ## [v4.1.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v4.1.0) (2019-11-04)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v4.0.4...v4.1.0)
 
 **Implemented enhancements:**
@@ -51,9 +85,11 @@
 - Fix invalid relative path in reference documentation [\#281](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/281)
 
 ## [v4.0.4](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v4.0.4) (2019-10-04)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v4.0.3...v4.0.4)
 
 ## [v4.0.3](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v4.0.3) (2019-10-03)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v4.0.2...v4.0.3)
 
 **Fixed bugs:**
@@ -61,9 +97,11 @@
 - broken link in bosh deployment template operators silently ignored [\#273](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/273)
 
 ## [v4.0.2](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v4.0.2) (2019-08-07)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v4.0.0...v4.0.2)
 
 ## [v4.0.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v4.0.0) (2019-07-29)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.6.0...v4.0.0)
 
 **Fixed bugs:**
@@ -81,9 +119,11 @@
 - upgrade to concourse 5 [\#261](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/261)
 
 ## [v3.6.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.6.0) (2019-06-28)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.6.1...v3.6.0)
 
 ## [v3.6.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.6.1) (2019-06-28)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.5.0...v3.6.1)
 
 **Closed issues:**
@@ -98,6 +138,7 @@
 - pipeline\(concourse\): allow credentials sharing between generated pipelines and custom pipelines [\#268](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/268)
 
 ## [v3.5.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.5.0) (2019-06-04)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.4.1...v3.5.0)
 
 **Implemented enhancements:**
@@ -119,6 +160,7 @@
 - Bosh recreate fix [\#251](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/251)
 
 ## [v3.4.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.4.1) (2019-03-28)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.4.0...v3.4.1)
 
 **Implemented enhancements:**
@@ -134,6 +176,7 @@
 - Issue with the "github-release" concourse resource type tagged versions. [\#220](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/220)
 
 ## [v3.4.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.4.0) (2019-03-15)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.3.0...v3.4.0)
 
 **Implemented enhancements:**
@@ -157,8 +200,10 @@
 - hardening pipeline retries [\#241](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/241)
 - pipelines\(submodules\): fix  [\#237](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/237)
 - 108 add covered pipelines [\#236](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/236)
+- Load submodules from the PaaS Template repo in the BOSH pipeline [\#230](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/230)
 
 ## [v3.3.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.3.0) (2019-01-22)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.2.2...v3.3.0)
 
 **Implemented enhancements:**
@@ -186,10 +231,13 @@
 - pipelines\(br-upload\): add a retrigger-all-uploads task [\#225](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/225)
 - 81 add ops interpolation example [\#224](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/224)
 - pipeline\(sync-feature-branches\): add hard reset job [\#222](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/222)
+- 220 github-release resource type [\#221](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/221)
 - WIP: rework serial\_groups allocation [\#217](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/217)
 - Fix bootstrap failure on update-pipeline [\#214](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/214)
+- This features extend the existing tests by making use of the refence dataset [\#190](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/190)
 
 ## [v3.2.2](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.2.2) (2018-11-23)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.2.0...v3.2.2)
 
 **Fixed bugs:**
@@ -201,6 +249,7 @@
 - Root-deployment concurrent execution limit overriding is broken for bosh-pipeline [\#210](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/210)
 
 ## [v3.2.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.2.0) (2018-11-22)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.1.2...v3.2.0)
 
 **Closed issues:**
@@ -210,11 +259,16 @@
 **Merged pull requests:**
 
 - pipeline\(\*\): introduce concurrent update limitations [\#208](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/208)
+- Document source of docker image used for terraform [\#198](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/198)
+- bosh config server / credhub variables fingerprint [\#194](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/194)
+- 12 non bosh io boshrelease support [\#179](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/179)
 
 ## [v3.1.2](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.1.2) (2018-11-21)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.1.1...v3.1.2)
 
 ## [v3.1.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.1.1) (2018-11-19)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.1.0...v3.1.1)
 
 **Implemented enhancements:**
@@ -230,6 +284,7 @@
 - Errand jobs failed with ` no versions of image available` [\#199](https://github.com/orange-cloudfoundry/cf-ops-automation/issues/199)
 
 ## [v3.1.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.1.0) (2018-09-18)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v3.0.0...v3.1.0)
 
 **Implemented enhancements:**
@@ -242,15 +297,12 @@
 
 **Merged pull requests:**
 
-- Load submodules from the PaaS Template repo in the BOSH pipeline [\#230](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/230)
-- 220 github-release resource type [\#221](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/221)
 - pipeline\(depls\): fix invalid bosh-errand-resource [\#200](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/200)
-- Document source of docker image used for terraform [\#198](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/198)
-- bosh config server / credhub variables fingerprint [\#194](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/194)
 - depls\(utils\) change bosh cancel all tasks vars to bosh cl1 v1 [\#193](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/193)
-- This features extend the existing tests by making use of the refence dataset [\#190](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/190)
+- create a utils task to cancel all running bosh tasks [\#176](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/176)
 
 ## [v3.0.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v3.0.0) (2018-08-09)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v2.2.0...v3.0.0)
 
 **Implemented enhancements:**
@@ -266,10 +318,13 @@
 
 **Merged pull requests:**
 
-- 12 non bosh io boshrelease support [\#179](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/179)
 - tasks\(generate\_manifest\): make files used by spruce optional [\#177](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/177)
+- support iaas-type for deployement-dependencies [\#175](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/175)
+- 145 yaml passwords [\#167](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/167)
+- bootstrap-coa-env\(\*\) [\#164](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/164)
 
 ## [v2.2.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v2.2.0) (2018-07-24)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v2.1.0...v2.2.0)
 
 **Implemented enhancements:**
@@ -294,22 +349,18 @@
 
 **Merged pull requests:**
 
-- create a utils task to cancel all running bosh tasks [\#176](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/176)
-- support iaas-type for deployement-dependencies [\#175](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/175)
 - task\(git\_reset\_wip\): create a commit after reset [\#174](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/174)
 - trigger update-pipeline on each`secrets-repo` commit and `init-concourse-boshrelease-and-stemcell` improvements [\#171](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/171)
 - Online stemcells support [\#169](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/169)
-- 145 yaml passwords [\#167](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/167)
 - Terraform improvements [\#166](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/166)
-- bootstrap-coa-env\(\*\) [\#164](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/164)
 - allow usage of generic key in deployment-dependencies [\#163](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/163)
 - Living doc missing cf app hooks [\#161](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/161)
 - Upgrade script for config repo for upcoming release 2.2.0 [\#160](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/160)
 - pipeline\(depls\): collapse delete task to speed up concourse execution [\#154](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/154)
 - 107 living documentation refactored [\#149](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/149)
-- pipeline\(cf-apps\): injects CF info as environment variable in post-cf-deploy [\#97](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/97)
 
 ## [v2.1.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v2.1.0) (2018-06-20)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.9.1...v2.1.0)
 
 **Implemented enhancements:**
@@ -320,11 +371,14 @@
 **Merged pull requests:**
 
 - pipeline\(tf\): fixes missing `IAAS\_SPEC\_PATH` [\#152](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/152)
+- Add task displaying manifest before it gets deployed [\#142](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/142)
 
 ## [v1.9.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.9.1) (2018-05-29)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v2.0.0...v1.9.1)
 
 ## [v2.0.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v2.0.0) (2018-05-29)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.9.0...v2.0.0)
 
 **Fixed bugs:**
@@ -341,7 +395,6 @@
 
 **Merged pull requests:**
 
-- Add task displaying manifest before it gets deployed [\#142](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/142)
 - task\(terraform\_\*\):fix helm terraform provider [\#140](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/140)
 - pipeline\(depls\): fixes errand job triggering [\#138](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/138)
 - Move out stemcell declararation from deployment-dependencies.yml [\#136](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/136)
@@ -356,12 +409,15 @@
 - pipeline\(sync-\*-branches, bootstrap-all-init\): updates [\#114](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/114)
 
 ## [v1.9.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.9.0) (2018-02-27)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.7.3...v1.9.0)
 
 ## [v1.7.3](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.7.3) (2018-02-22)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.7.2...v1.7.3)
 
 ## [v1.7.2](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.7.2) (2018-02-22)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.8.4...v1.7.2)
 
 **Closed issues:**
@@ -374,8 +430,10 @@
 **Merged pull requests:**
 
 - task\(generate-manifest\): fixes missing support for vars files in a IAAS\_TYPE dir [\#102](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/102)
+- pipeline\(depls,s3-br-upload\): supports offline boshrelease and updates boshrelease upload location - REQUIRES shared/private config feature [\#93](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/93)
 
 ## [v1.8.4](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.8.4) (2018-02-07)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.8.3...v1.8.4)
 
 **Implemented enhancements:**
@@ -388,12 +446,18 @@
 
 **Merged pull requests:**
 
-- pipeline\(depls,s3-br-upload\): supports offline boshrelease and updates boshrelease upload location - REQUIRES shared/private config feature [\#93](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/93)
+- pipeline\(cf-apps\): injects CF info as environment variable in post-cf-deploy [\#97](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/97)
 
 ## [v1.8.3](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.8.3) (2018-01-30)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.8.2...v1.8.3)
 
+**Merged pull requests:**
+
+- Setup additional teams [\#87](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/87)
+
 ## [v1.8.2](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.8.2) (2018-01-23)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.8.1...v1.8.2)
 
 **Implemented enhancements:**
@@ -412,17 +476,18 @@
 
 **Merged pull requests:**
 
-- Setup additional teams [\#87](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/87)
+- script\(generate-depls\): supports shared config with override [\#77](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/77)
 
 ## [v1.8.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.8.1) (2018-01-16)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.8.0...v1.8.1)
 
 **Merged pull requests:**
 
-- script\(generate-depls\): supports shared config with override [\#77](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/77)
 - pipeline\(depls\): restores terraform scan during update-pipeline [\#76](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/76)
 
 ## [v1.8.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.8.0) (2018-01-12)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.7.1...v1.8.0)
 
 **Implemented enhancements:**
@@ -444,9 +509,11 @@
 - pipeline\(depls\): introduces a new staging branch on paas-templates [\#68](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/68)
 
 ## [v1.7.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.7.1) (2017-12-08)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.7.0...v1.7.1)
 
 ## [v1.7.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.7.0) (2017-12-04)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.6.0...v1.7.0)
 
 **Implemented enhancements:**
@@ -460,8 +527,10 @@
 **Merged pull requests:**
 
 - feature: Support ops-files and var-files for \[cloud|runtime\]-config [\#60](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/60)
+- task\(post\_bosh\_deploy\): switch to cf-cli image [\#49](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/49)
 
 ## [v1.6.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.6.0) (2017-11-28)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.5.1...v1.6.0)
 
 **Fixed bugs:**
@@ -475,12 +544,12 @@
 - Fix Tf pipeline [\#57](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/57)
 - pipeline\(depls\): move stemcell support from bosh.io to S3 [\#55](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/55)
 - task\(execute\_deploy\_script\): ensure deploy.sh is always executable [\#54](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/54)
-- task\(post\_bosh\_deploy\): switch to cf-cli image [\#49](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/49)
 - pipeline\(depls\): refactor to extract task variable args into task params [\#48](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/48)
 - Tf dev env refinements [\#47](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/47)
 - tf only pipeline [\#40](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/40)
 
 ## [v1.5.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.5.1) (2017-10-27)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.5.0...v1.5.1)
 
 **Fixed bugs:**
@@ -493,6 +562,7 @@
 - Map the secret full resource to enable tf cross reference tf state [\#45](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/45)
 
 ## [v1.5.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.5.0) (2017-10-26)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.4.1-prod...v1.5.0)
 
 **Merged pull requests:**
@@ -502,12 +572,15 @@
 - pipeline\(depls\): upgrade to bosh-cli-v2 for \[cloud|runtime\]-config [\#41](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/41)
 
 ## [v1.4.1-prod](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.4.1-prod) (2017-10-20)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.4.5...v1.4.1-prod)
 
 ## [v1.4.5](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.4.5) (2017-10-20)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.4.1...v1.4.5)
 
 ## [v1.4.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.4.1) (2017-10-19)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.4.0-prod...v1.4.1)
 
 **Implemented enhancements:**
@@ -520,9 +593,11 @@
 - Don't allow TF to prompt for user input  [\#36](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/36)
 
 ## [v1.4.0-prod](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.4.0-prod) (2017-10-06)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.4.0...v1.4.0-prod)
 
 ## [v1.4.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.4.0) (2017-10-06)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.3-prod...v1.4.0)
 
 **Fixed bugs:**
@@ -544,36 +619,49 @@
 - Feature enable pr ci [\#9](https://github.com/orange-cloudfoundry/cf-ops-automation/pull/9)
 
 ## [v1.3-prod](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.3-prod) (2017-08-01)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.2.2-prod...v1.3-prod)
 
 ## [v1.2.2-prod](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.2.2-prod) (2017-07-18)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.2.1-prod...v1.2.2-prod)
 
 ## [v1.2.1-prod](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.2.1-prod) (2017-07-17)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.2.1...v1.2.1-prod)
 
 ## [v1.2.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.2.1) (2017-07-17)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.2-prod...v1.2.1)
 
 ## [v1.2-prod](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.2-prod) (2017-07-13)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.2...v1.2-prod)
 
 ## [v1.2](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.2) (2017-07-13)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/prod-latest...v1.2)
 
 ## [prod-latest](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/prod-latest) (2017-07-13)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.1-prod...prod-latest)
 
 ## [v1.1-prod](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.1-prod) (2017-07-13)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.1...v1.1-prod)
 
 ## [v1.1](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.1) (2017-07-13)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/prod-stable...v1.1)
 
 ## [prod-stable](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/prod-stable) (2017-07-10)
+
 [Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/v1.0...prod-stable)
 
 ## [v1.0](https://github.com/orange-cloudfoundry/cf-ops-automation/tree/v1.0) (2017-07-06)
 
+[Full Changelog](https://github.com/orange-cloudfoundry/cf-ops-automation/compare/0cdbc6a9abbb62b8a5ab20d976d232204ec38dd2...v1.0)
+
+
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/docs/features/features.html b/docs/features/features.html
index 03096eb49..ff17f92c8 100644
--- a/docs/features/features.html
+++ b/docs/features/features.html
@@ -479,4 +479,4 @@
   pending # Write code here that turns the phrase above into concrete actions
 end</pre></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/offline_support.feature:9</span><h3 id="scenario_9"><span class="keyword">Scenario:</span> <span class="val">Bosh release offline</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/offline_support.feature:12</span><h3 id="scenario_10"><span class="keyword">Scenario:</span> <span class="val">Private Docker registry</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">NYI</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:39</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/offline_support.feature:15</span><h3 id="scenario_11"><span class="keyword">Scenario:</span> <span class="val">Bosh stemcells are retrieved from S3</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div></div><div class="feature"><h2><span class="val">Feature: Terraform support for root deployment</span></h2><p class="narrative">In order to share a terraform across a root deployment<br/>As a paas-template user,<br/>I want to know mechanisms provided by COA<br/></p><div class="background"><h3 id="background_11"><span class="keyword">Background</span> <span class="val"></span></h3><ol><script>makeYellow('cucumber-header');makeYellow('background_11');</script><li id='' class='step undefined'><div class="step_name"><span class="keyword">Given </span><span class="step val">Hello world generated pipelines from reference_dataset</span></div><div class="step_file"><span>features/terraform_support_for_root_deployment.feature:7</span></div><pre>Given("Hello world generated pipelines from reference_dataset") do
   pending # Write code here that turns the phrase above into concrete actions
-end</pre></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/terraform_support_for_root_deployment.feature:9</span><h3 id="scenario_12"><span class="keyword">Scenario:</span> <span class="val">a deployment, or a part, is done using a concourse pipeline</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div></div><script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0m1.180s seconds</strong>";</script><script type="text/javascript">document.getElementById('totals').innerHTML = "12 scenarios (10 undefined, 2 passed)<br />32 steps (10 skipped, 10 undefined, 12 passed)";</script></div></body></html>
+end</pre></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/terraform_support_for_root_deployment.feature:9</span><h3 id="scenario_12"><span class="keyword">Scenario:</span> <span class="val">a deployment, or a part, is done using a concourse pipeline</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div></div><script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0m1.957s seconds</strong>";</script><script type="text/javascript">document.getElementById('totals').innerHTML = "12 scenarios (10 undefined, 2 passed)<br />32 steps (10 skipped, 10 undefined, 12 passed)";</script></div></body></html>
\ No newline at end of file
diff --git a/docs/features/features.md b/docs/features/features.md
index 3c5c74045..4ca685b98 100644
--- a/docs/features/features.md
+++ b/docs/features/features.md
@@ -93,7 +93,7 @@ Feature: Terraform support for root deployment
 
 12 scenarios (10 undefined, 2 passed)
 32 steps (10 skipped, 10 undefined, 12 passed)
-0m2.097s
+0m1.956s
 
 You can implement step definitions for undefined steps with these snippets:
 
diff --git a/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml b/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml
index 409af06bc..723951353 100644
--- a/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml
+++ b/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml
@@ -153,6 +153,7 @@ jobs:
             ./additional-resource/meta-inf.yml
         CUSTOM_SCRIPT_DIR: additional-resource/another-world-root-depls/template
         IAAS_TYPE: ((iaas-type))
+        PROFILES: ((profiles))
     - in_parallel:
       - task: update-cloud-config-for-another-world-root-depls
         attempts: 2
@@ -177,7 +178,8 @@ jobs:
           params:
             OLD_FILE: "another-world-root-depls/cloud-config.yml"
             NEW_FILE: "cloud-config.yml"
-            COMMIT_MESSAGE: "another-world-root-depls cloud-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "another-world-root-depls cloud-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -214,7 +216,8 @@ jobs:
           params:
             OLD_FILE: "another-world-root-depls/runtime-config.yml"
             NEW_FILE: "runtime-config.yml"
-            COMMIT_MESSAGE: "another-world-root-depls runtime-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "another-world-root-depls runtime-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -251,7 +254,8 @@ jobs:
           params:
             OLD_FILE: "another-world-root-depls/cpi-config.yml"
             NEW_FILE: "cpi-config.yml"
-            COMMIT_MESSAGE: "another-world-root-depls cpi-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "another-world-root-depls cpi-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
diff --git a/docs/reference_dataset/pipelines/another-world-root-depls-news-generated.yml b/docs/reference_dataset/pipelines/another-world-root-depls-news-generated.yml
index b85130b10..65f0d9f71 100644
--- a/docs/reference_dataset/pipelines/another-world-root-depls-news-generated.yml
+++ b/docs/reference_dataset/pipelines/another-world-root-depls-news-generated.yml
@@ -13,8 +13,4 @@ resource_types:
       # use latest as no other recent tag available
 resources:
 jobs:
-#      - get: bosh-stemcell
-#        version: { version: ((stemcell-version)) }
-#        trigger: true
-#        attempts: 2
 - name: this-is-an-empty-pipeline
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml
index 626c5f19f..22c4c68cc 100644
--- a/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml
+++ b/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml
@@ -123,19 +123,13 @@ resources:
   type: bosh-io-release
   source:
     repository: cloudfoundry-community/nginx-release
+  version: { version: ((nginx-version)) }
 - name: ntp
   icon:  home-floor-b
   type: bosh-io-release
   source:
     repository: cloudfoundry-community/ntp-release
-- name: vault
-  icon: github-circle
-  type: github-release
-  source:
-    user: cloudfoundry-community
-    repository: vault-boshrelease
-    access_token: ((bot-github-access-token))
-#  version: tag:( (-version) ) # FIXME https://github.com/concourse/concourse/issues/3990
+  version: { version: ((ntp-version)) }
 jobs:
 - name: cancel-all-bosh-tasks
   on_failure:
@@ -287,6 +281,7 @@ jobs:
             ./additional-resource/meta-inf.yml
         CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/template
         IAAS_TYPE: ((iaas-type))
+        PROFILES: ((profiles))
     - in_parallel:
       - task: update-cloud-config-for-hello-world-root-depls
         attempts: 2
@@ -311,7 +306,8 @@ jobs:
           params:
             OLD_FILE: "hello-world-root-depls/cloud-config.yml"
             NEW_FILE: "cloud-config.yml"
-            COMMIT_MESSAGE: "hello-world-root-depls cloud-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "hello-world-root-depls cloud-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -348,7 +344,8 @@ jobs:
           params:
             OLD_FILE: "hello-world-root-depls/runtime-config.yml"
             NEW_FILE: "runtime-config.yml"
-            COMMIT_MESSAGE: "hello-world-root-depls runtime-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "hello-world-root-depls runtime-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -385,7 +382,8 @@ jobs:
           params:
             OLD_FILE: "hello-world-root-depls/cpi-config.yml"
             NEW_FILE: "cpi-config.yml"
-            COMMIT_MESSAGE: "hello-world-root-depls cpi-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "hello-world-root-depls cpi-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -421,15 +419,9 @@ jobs:
       params: { submodules: none}
       trigger: true
     - get: nginx
-      version: { version: ((nginx-version)) }
       trigger: true
       attempts: 2
     - get: ntp
-      version: { version: ((ntp-version)) }
-      trigger: true
-      attempts: 2
-    - get: vault
-      # vault-version is pinned, see resource declaration. This is disabled for now...
       trigger: true
       attempts: 2
     - get: secrets-bosh-deployment-sample
@@ -469,6 +461,7 @@ jobs:
           ./additional-resource/meta-inf.yml
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/bosh-deployment-sample/template
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: execute-bosh-deployment-sample-pre-bosh-deploy
     input_mapping:
       scripts-resource: cf-ops-automation
@@ -476,7 +469,7 @@ jobs:
       credentials-resource: secrets-bosh-deployment-sample
       additional-resource: release-manifest
     output_mapping: {generated-files: pre-bosh-deploy-resource}
-    file: cf-ops-automation/concourse/tasks/spiff_pre_bosh_deploy.yml
+    file: cf-ops-automation/concourse/tasks/pre_bosh_deploy.yml
     params:
       CUSTOM_SCRIPT_DIR: template-resource/hello-world-root-depls/bosh-deployment-sample/template
       SECRETS_DIR: credentials-resource/hello-world-root-depls/bosh-deployment-sample
@@ -563,7 +556,8 @@ jobs:
           params:
             OLD_FILE: hello-world-root-depls/bosh-deployment-sample/bosh-deployment-sample-last-deployment-failure.yml
             NEW_FILE: "interpolated-bosh-deployment-sample.yml"
-            COMMIT_MESSAGE: "Failed to deploy bosh-deployment-sample manifest - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "Failed to deploy bosh-deployment-sample manifest\n\nActive profiles: ${PROFILES}\n[skip ci]"
         - put: secrets-full-writer
           get_params: {submodules: none}
           params:
@@ -577,12 +571,16 @@ jobs:
       releases: 
       - "nginx/*.tgz"
       - "ntp/*.tgz"
-      - "vault/*.tgz"
       ops_files:
       - ops-and-vars-files/operators/*
       vars_files:
       - ops-and-vars-files/vars/*
       cleanup: true
+      no_redact: false
+      dry_run: false
+      fix: false
+      recreate: true
+      skip_drain: ["ngnix"]
   - task: bosh-variables
     input_mapping: {scripts-resource: cf-ops-automation, secrets: secrets-full-writer}
     output_mapping: {result-dir: bosh-variables-result}
@@ -600,15 +598,17 @@ jobs:
     params:
       OLD_FILE: hello-world-root-depls/bosh-deployment-sample/bosh-deployment-sample-fingerprints.json
       NEW_FILE: "credential_fingerprints.json"
-      COMMIT_MESSAGE: "bosh-deployment-sample variable fingerprints auto update - [skip ci]"
+      PROFILES: ((profiles))
+      COMMIT_MESSAGE: "bosh-deployment-sample variable fingerprints auto update.\nDeployment information: $(cat generated-resource/deployment_information.txt)\nActive profiles: ${PROFILES}\n[skip ci]"
   - task: update-bosh-deployment-sample-files
-    input_mapping: {reference-resource: updated-bosh-deployment-sample-fingerprints-secrets, generated-resource: bosh-deployment-sample-deployment}
+    input_mapping: {reference-resource: updated-bosh-deployment-sample-fingerprints-secrets, generated-resource: bosh-deployment-sample-deployment, additional-resource: bosh-variables-result}
     output_mapping: {updated-git-resource: updated-bosh-deployment-sample-secrets}
     file: cf-ops-automation/concourse/tasks/git_update_a_file_from_generated.yml
     params:
       OLD_FILE: hello-world-root-depls/bosh-deployment-sample/bosh-deployment-sample.yml
       NEW_FILE: "manifest.yml"
-      COMMIT_MESSAGE: "bosh-deployment-sample generated manifest auto update - [skip ci]"
+      PROFILES: ((profiles))
+      COMMIT_MESSAGE: "bosh-deployment-sample generated manifest auto update.\nDeployment information: $(cat additional-resource/deployment_information.txt)\nActive profiles: ${PROFILES}\n[skip ci]"
   - put: secrets-full-writer
     get_params: {submodules: none}
     params:
@@ -774,7 +774,6 @@ jobs:
         - |
           echo "check-resource -r $BUILD_PIPELINE_NAME/nginx --from version:((nginx-version))" | tee -a result-dir/flight-plan
           echo "check-resource -r $BUILD_PIPELINE_NAME/ntp --from version:((ntp-version))" | tee -a result-dir/flight-plan
-          echo "check-resource -r $BUILD_PIPELINE_NAME/vault --from tag:((vault-version))" | tee -a result-dir/flight-plan
           echo "check-resource -r $BUILD_PIPELINE_NAME/((stemcell-main-name)) --from version:((stemcell-version))" | tee -a result-dir/flight-plan
       params:
         BUILD_PIPELINE_NAME: hello-world-root-depls-bosh-generated
@@ -822,6 +821,7 @@ jobs:
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/terraform-config/template
       SUFFIX: -tpl.tfvars.yml
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: terraform-plan
     input_mapping: {secret-state-resource: secrets-hello-world-root-depls-limited,spec-resource: paas-templates-hello-world-root-depls}
     file: cf-ops-automation/concourse/tasks/terraform_plan_cloudfoundry.yml
@@ -829,6 +829,8 @@ jobs:
       SPEC_PATH: "hello-world-root-depls/terraform-config/spec"
       SECRET_STATE_FILE_PATH: "hello-world-root-depls/terraform-config"
       IAAS_SPEC_PATH: "hello-world-root-depls/terraform-config/spec-((iaas-type))"
+      PROFILES_SPEC_PATH_PREFIX: "hello-world-root-depls/terraform-config/spec-"
+      PROFILES: ((profiles))
 - name: approve-and-enforce-terraform-consistency
   serial: true
   serial_groups: [terraform]
@@ -868,6 +870,7 @@ jobs:
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/terraform-config/template
       SUFFIX: -tpl.tfvars.yml
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: terraform-apply
     input_mapping: {secret-state-resource: secrets-hello-world-root-depls-limited,spec-resource: paas-templates-hello-world-root-depls}
     output_mapping: {generated-files: terraform-cf}
@@ -876,6 +879,8 @@ jobs:
       SPEC_PATH: "hello-world-root-depls/terraform-config/spec"
       SECRET_STATE_FILE_PATH: "hello-world-root-depls/terraform-config"
       IAAS_SPEC_PATH: "hello-world-root-depls/terraform-config/spec-((iaas-type))"
+      PROFILES_SPEC_PATH_PREFIX: "hello-world-root-depls/terraform-config/spec-"
+      PROFILES: ((profiles))
     ensure:
       task: update-terraform-state-file
       input_mapping: {reference-resource: secrets-full-writer, generated-resource: terraform-cf}
@@ -884,7 +889,8 @@ jobs:
       params:
         OLD_FILE: "hello-world-root-depls/terraform-config/terraform.tfstate"
         NEW_FILE: "terraform.tfstate"
-        COMMIT_MESSAGE: "Terraform TFState auto update"
+        PROFILES: ((profiles))
+        COMMIT_MESSAGE: "Terraform TFState auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
       on_failure:
         put: failure-alert
         params:
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml
index fd9d9eac1..274861fe2 100644
--- a/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml
+++ b/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml
@@ -153,7 +153,8 @@ jobs:
       params:
         OLD_FILE: hello-world-root-depls/cf-apps-deployments/generic-app/generic-app_manifest.yml
         NEW_FILE: "generic-app_manifest.yml"
-        COMMIT_MESSAGE: "generic-app generated CF manifest auto update - [skip ci]"
+        PROFILES: ((profiles))
+        COMMIT_MESSAGE: "generic-app generated CF manifest auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
     - put: secrets-full-writer
       get_params: {submodules: none}
       params:
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml
index ad3fdc1ad..7a0dc9b09 100644
--- a/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml
+++ b/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml
@@ -93,10 +93,11 @@ jobs:
           ./additional-resource/meta-inf.yml
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/pipeline-sample/concourse-pipeline-config
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: execute-pipeline-sample-pre-deploy
     input_mapping: {scripts-resource: cf-ops-automation, template-resource: paas-templates-pipeline-sample, credentials-resource: secrets-pipeline-sample, additional-resource: spruced-files}
     output_mapping: {generated-files: pre-deploy-resource}
-    file: cf-ops-automation/concourse/tasks/spiff_pre_bosh_deploy.yml
+    file: cf-ops-automation/concourse/tasks/pre_bosh_deploy.yml
     params:
       CUSTOM_SCRIPT_DIR: template-resource/hello-world-root-depls/pipeline-sample/concourse-pipeline-config
       SECRETS_DIR: credentials-resource/hello-world-root-depls/pipeline-sample
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-news-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-news-generated.yml
index a686e1627..7e3c60321 100644
--- a/docs/reference_dataset/pipelines/hello-world-root-depls-news-generated.yml
+++ b/docs/reference_dataset/pipelines/hello-world-root-depls-news-generated.yml
@@ -12,10 +12,6 @@ resource_types:
       repository: ((docker-registry-url))cftoolsmiths/cron-resource
       # use latest as no other recent tag available
 resources:
-#- name: bosh-stemcell
-#  type: bosh-io-stemcell
-#  source:
-#    name: ((stemcell-name))
 - name: failure-alert
   icon: slack
   type: slack-notification
@@ -32,12 +28,6 @@ resources:
     proxy: ((slack-proxy))
     proxy_https_tunnel: ((slack-proxy-https-tunnel))
     disable: ((slack-disable))
-#- name: secrets-complete
-#  type: git
-#  source:
-#    uri: ((secrets-uri))
-#    branch: master
-#    skip_ssl_verification: true
 - name: paas-templates-full
   icon: home-assistant
   type: git
@@ -70,18 +60,7 @@ resources:
   type: bosh-io-release
   source:
     repository: cloudfoundry-community/ntp-release
-- name: vault
-  icon: github-circle
-  type: github-release
-  source:
-    user: cloudfoundry-community
-    repository: vault-boshrelease
-    access_token: ((bot-github-access-token))
 jobs:
-#      - get: bosh-stemcell
-#        version: { version: ((stemcell-version)) }
-#        trigger: true
-#        attempts: 2
 - name: check-nginx
   serial_groups: [concurrent-group-0]
   on_failure:
@@ -196,60 +175,3 @@ jobs:
         text_file: ntp-message/update_notif
         icon_url: http://cl.ly/image/3e1h0H3H2s0P/concourse-logo.png
         username: Concourse
-- name: check-vault
-  serial_groups: [concurrent-group-2]
-  on_failure:
-    put: failure-alert
-    params:
-      channel: ((slack-channel))
-      text: Failed [[$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME]($ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME)].
-      icon_url: http://cl.ly/image/3e1h0H3H2s0P/concourse-logo.png
-      username: Concourse
-  plan:
-    - in_parallel:
-      - get: monday-morning
-        trigger: true
-      - get: vault
-        attempts: 2
-        params: {tarball: false}
-      - get: paas-templates-full
-        params: { submodules: none}
-      - get: cf-ops-automation
-        params: { submodules: none}
-    - task: generate-update-message
-      input_mapping: {boshrelease: vault}
-      output_mapping: {message: vault-message}
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source:
-            repository: ((docker-registry-url))governmentpaas/curl-ssl
-            tag: 2857fdbaea59594c06cf9c6e32027091b67d4767
-        inputs:
-          - name: boshrelease
-        outputs:
-          - name: message
-        run:
-          path: sh
-          args:
-          - -exc
-          - |
-            MESSAGE_FILE=message/update_notif
-            NEW_VERSION=$(cat boshrelease/version)
-            RELEASE_URL=$(cat boshrelease/url|sed 's|/d/|/releases/|'|sed 's/?v=/?version=/')
-            if [ "${NEW_VERSION}" != "${CURRENT_VERSION}" ]
-            then
-              echo "New version of vault detected: [${NEW_VERSION}](${RELEASE_URL})." >${MESSAGE_FILE}
-              echo "hello-world-root-depls is using ${CURRENT_VERSION} of vault" >>${MESSAGE_FILE}
-            else
-              echo "hello-world-root-depls is  running the latest vault (ie [${NEW_VERSION}](${RELEASE_URL}))." >${MESSAGE_FILE}
-            fi
-      params:
-        CURRENT_VERSION: ((vault-version))
-    - put: new-version-alert
-      params:
-        channel: ((slack-channel))
-        text_file: vault-message/update_notif
-        icon_url: http://cl.ly/image/3e1h0H3H2s0P/concourse-logo.png
-        username: Concourse
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-s3-br-upload-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-s3-br-upload-generated.yml
index 32c89d23f..80cc3a8fc 100644
--- a/docs/reference_dataset/pipelines/hello-world-root-depls-s3-br-upload-generated.yml
+++ b/docs/reference_dataset/pipelines/hello-world-root-depls-s3-br-upload-generated.yml
@@ -67,24 +67,6 @@ resources:
     secret_access_key: ((s3-br-secret-key))
     endpoint: ((s3-br-endpoint))
     skip_ssl_verification: ((s3-br-skip-ssl-verification))
-- name: vault
-  icon: github-circle
-  type: github-release
-  source:
-    user: cloudfoundry-community
-    repository: vault-boshrelease
-    access_token: ((bot-github-access-token))
-- name: vault-s3
-  icon: home-floor-a
-  type: s3
-  source:
-    bucket: ((s3-br-bucket))
-    region_name: ((s3-br-region-name))
-    regexp: cloudfoundry-community/vault-(.*).tgz
-    access_key_id: ((s3-br-access-key-id))
-    secret_access_key: ((s3-br-secret-key))
-    endpoint: ((s3-br-endpoint))
-    skip_ssl_verification: ((s3-br-skip-ssl-verification))
 jobs:
 - name: init-concourse-boshrelease-for-hello-world-root-depls
   on_failure:
@@ -119,7 +101,6 @@ jobs:
         - |
           echo "check-resource -r $BUILD_PIPELINE_NAME/nginx --from version:((nginx-version))" >> result-dir/flight-plan
           echo "check-resource -r $BUILD_PIPELINE_NAME/ntp --from version:((ntp-version))" >> result-dir/flight-plan
-          echo "check-resource -r $BUILD_PIPELINE_NAME/vault --from tag:((vault-version))" >> result-dir/flight-plan
       params:
         BUILD_PIPELINE_NAME: hello-world-root-depls-s3-br-upload-generated
   - task: fly-into-concourse
@@ -161,7 +142,6 @@ jobs:
         - |
           echo "trigger-job -j $BUILD_PIPELINE_NAME/upload-current-nginx" >> result-dir/flight-plan
           echo "trigger-job -j $BUILD_PIPELINE_NAME/upload-current-ntp" >> result-dir/flight-plan
-          echo "trigger-job -j $BUILD_PIPELINE_NAME/upload-current-vault" >> result-dir/flight-plan
       params:
         BUILD_PIPELINE_NAME: hello-world-root-depls-s3-br-upload-generated
   - task: fly-into-concourse
@@ -365,102 +345,6 @@ jobs:
       params:
         file: ntp/*.tgz
         acl: public-read
-- name: upload-current-vault
-  serial_groups: [vault,concurrent-group-2]
-  on_failure:
-    put: failure-alert
-    params:
-      channel: ((slack-channel))
-      text: Failed [[$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME]($ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME)].
-      icon_url: http://cl.ly/image/3e1h0H3H2s0P/concourse-logo.png
-      username: Concourse
-  plan:
-    - in_parallel:
-      - get: vault
-        attempts: 2
-        version: { tag: "((vault-version))" }
-        trigger: true
-        params: {tarball: true}
-      - get: cf-ops-automation
-        params: { submodules: none}
-        attempts: 2
-        passed: [ init-concourse-boshrelease-for-hello-world-root-depls ]
-    - task: generate-vault-name
-      input_mapping: {release: vault}
-      output_mapping: {result-dir: vault}
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source:
-            repository: ((docker-registry-url))governmentpaas/curl-ssl
-            tag: 2857fdbaea59594c06cf9c6e32027091b67d4767
-        inputs:
-          - name: release
-        outputs:
-          - name: result-dir
-        run:
-          path: sh
-          args:
-          - -exc
-          - |
-            VERSION=$(cat release/version)
-            cp release/${RELEASE_PREFIX}-${VERSION}.tgz result-dir/${RELEASE_PREFIX}-${TARGET_VERSION}.tgz
-        params:
-          RELEASE_PREFIX: vault
-          TARGET_VERSION: ((vault-version))
-    - put: vault-s3
-      params:
-        file: vault/*.tgz
-        acl: public-read
-- name: upload-latest-vault
-  serial_groups: [vault,concurrent-group-2]
-  on_failure:
-    put: failure-alert
-    params:
-      channel: ((slack-channel))
-      text: Failed [[$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME]($ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME)].
-      icon_url: http://cl.ly/image/3e1h0H3H2s0P/concourse-logo.png
-      username: Concourse
-  plan:
-    - in_parallel:
-      - get: vault
-        attempts: 2
-        version: every
-        trigger: true
-        params: {tarball: true}
-      - get: cf-ops-automation
-        params: { submodules: none}
-        attempts: 2
-        passed: [ upload-current-vault ]
-    - task: generate-vault-name
-      input_mapping: {release: vault}
-      output_mapping: {result-dir: vault}
-      config:
-        platform: linux
-        image_resource:
-          type: docker-image
-          source:
-            repository: ((docker-registry-url))governmentpaas/curl-ssl
-            tag: 2857fdbaea59594c06cf9c6e32027091b67d4767
-        inputs:
-          - name: release
-        outputs:
-          - name: result-dir
-        run:
-          path: sh
-          args:
-          - -exc
-          - |
-            VERSION=$(cat release/version)
-            cp release/${RELEASE_PREFIX}-${VERSION}.tgz result-dir/${RELEASE_PREFIX}-${VERSION}.tgz
-        params:
-          RELEASE_PREFIX: vault
-          TARGET_VERSION: ((vault-version))
-    - put: vault-s3
-      params:
-        file: vault/*.tgz
-        acl: public-read
 groups:
 - name: Hello-world-root-depls
   jobs:
@@ -470,15 +354,9 @@ groups:
   - upload-latest-nginx
   - upload-current-ntp
   - upload-latest-ntp
-  - upload-current-vault
-  - upload-latest-vault
 - name: "n*"
   jobs:
   - upload-current-nginx
   - upload-latest-nginx
   - upload-current-ntp
   - upload-latest-ntp
-- name: "v*"
-  jobs:
-  - upload-current-vault
-  - upload-latest-vault
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-tf-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-tf-generated.yml
index 7563fd5cb..90c2da8f1 100644
--- a/docs/reference_dataset/pipelines/hello-world-root-depls-tf-generated.yml
+++ b/docs/reference_dataset/pipelines/hello-world-root-depls-tf-generated.yml
@@ -87,6 +87,7 @@ jobs:
         YML_TEMPLATE_DIR: additional-resource/hello-world-root-depls/terraform-config/template
         CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/terraform-config/template
         SUFFIX: -tpl.tfvars.yml
+        PROFILES: ((profiles))
     - task: terraform-apply
       input_mapping: {secret-state-resource: secrets-hello-world-root-depls,spec-resource: paas-templates-full}
       output_mapping: {generated-files: terraform-cf}
@@ -95,6 +96,8 @@ jobs:
         SPEC_PATH: "hello-world-root-depls/terraform-config/spec"
         SECRET_STATE_FILE_PATH: "hello-world-root-depls/terraform-config"
         IAAS_SPEC_PATH: "hello-world-root-depls/terraform-config/spec-((iaas-type))"
+        PROFILE_SPEC_PATH_PREFIX: "hello-world-root-depls/terraform-config/spec-"
+        PROFILES: ((profiles))
       ensure:
         task: update-terraform-state-file
         input_mapping: {reference-resource: secrets-hello-world-root-depls, generated-resource: terraform-cf}
@@ -103,7 +106,8 @@ jobs:
         params:
           OLD_FILE: "hello-world-root-depls/terraform-config/terraform.tfstate"
           NEW_FILE: "terraform.tfstate"
-          COMMIT_MESSAGE: "Terraform Cloudfoundry auto update - [skip ci]"
+          PROFILES: ((profiles))
+          COMMIT_MESSAGE: "Terraform Cloudfoundry auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
         on_failure:
           put: failure-alert
           params:
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-update-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-update-generated.yml
index 559ccac14..fd701dca6 100644
--- a/docs/reference_dataset/pipelines/hello-world-root-depls-update-generated.yml
+++ b/docs/reference_dataset/pipelines/hello-world-root-depls-update-generated.yml
@@ -86,6 +86,7 @@ jobs:
       ROOT_DEPLOYMENT: hello-world-root-depls
       IAAS_TYPE: ((iaas-type))
       EXCLUDE_PIPELINES: depls
+      PROFILES: ((profiles))
   - task: copy-and-filter-generated-pipeline
     input_mapping: {templates: paas-templates-hello-world-root-depls,config: secrets-hello-world-root-depls-for-pipeline}
     config: