diff --git a/ci/VERSIONS b/ci/VERSIONS
new file mode 100644
index 00000000..79c524b3
--- /dev/null
+++ b/ci/VERSIONS
@@ -0,0 +1 @@
+MONGODB_VERSION=3.6.18
diff --git a/ci/dl-packages-src b/ci/dl-packages-src
new file mode 100644
index 00000000..edaf19f8
--- /dev/null
+++ b/ci/dl-packages-src
@@ -0,0 +1,5 @@
+# the file creates an associate array that is iterated over to do two things:
+# 1. downloads the vendor packages using the value part of the associative array
+# 2. creates a new config/blobs.yml file using the key part of the associative array
+declare -A downloads
+downloads[mongodb/mongodb-linux-x86_64-${MONGODB_VERSION}.tar.gz]="https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB_VERSION}.tgz"
\ No newline at end of file
diff --git a/ci/files/datadog_addon.yml b/ci/files/datadog_addon.yml
deleted file mode 100644
index 865d9f54..00000000
--- a/ci/files/datadog_addon.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- type: replace
-  path: /releases?/-
-  value:
-    name: datadog-agent
-    version: latest
-
-- type: replace
-  path: /addons?/-
-  value:
-    name: dd-agent
-    jobs:
-    - name: dd-agent
-      release: datadog-agent
-    properties:
-      dd:
-        use_dogstatsd: yes
-        api_key: ((datadog_api_key))
-        friendly_hostname: false
-        use_uuid_hostname: true
-        tags:
-        - "product:enterprise_archive"
-        - "customer:cs"
-        - "environment:deployment_testing"
-        - "cloud:vsphere"
-        - "country:USA"
-        - "region:nam"
-        - "version:latest"
-
-- type: replace
-  path: /tags?
-  value:
-    owner: datadog
-    email: support@datadoghq.com
diff --git a/ci/files/manifest.yml b/ci/files/manifest.yml
deleted file mode 100644
index 79aa6c57..00000000
--- a/ci/files/manifest.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-instance_groups:
-- azs:
-  - z1
-  - z2
-  - z3
-  env:
-    persistent_disk_fs: xfs
-  instances: 3
-  env:
-    persistent_disk_fs: xfs
-  jobs:
-  - name: bpm
-    release: bpm
-  - name: cfgsvr
-    release: mongodb-services
-    properties:
-      port: 23758
-      replication:
-        replica_set_name: mongo-config-shared
-      server_certificate:
-        certificate: ((mongo_ca.certificate))
-        private_key: ((mongo_ca.private_key))
-  name: mdbconf-shared
-  networks:
-  - name: default
-  release: mongodb-services
-  stemcell: ubuntu
-  vm_type: default
-- azs:
-  - z1
-  - z2
-  - z3
-  instances: 1
-  jobs:
-  - name: bpm
-    release: bpm
-  - name: mongos
-    release: mongodb-services
-    properties:
-      server_certificate:
-        certificate: ((mongo_ca.certificate))
-        private_key: ((mongo_ca.private_key))
-      users:
-      - name: root
-        password: ((root_password))
-        roles:
-        - role: root
-          db: admin
-      - name: smarsh
-        password: myP@ssword
-        roles:
-        - role: userAdminAnyDatabase
-          db: admin
-  name: mongos-shared
-  networks:
-  - name: default
-  stemcell: ubuntu
-  vm_type: default
-- azs:
-  - z1
-  - z2
-  - z3
-  env:
-    persistent_disk_fs: xfs
-  instances: 3
-  jobs:
-  - name: bpm
-    release: bpm
-  - name: shardsvr
-    release: mongodb-services
-    properties:
-      server_certificate:
-        certificate: ((mongo_ca.certificate))
-        private_key: ((mongo_ca.private_key))
-      replication:
-        replica_set_name: mongo-data-shared
-      users:
-      - name: root
-        password: ((root_password))
-        roles:
-        - role: root
-          db: admin
-  name: mdb-shared
-  networks:
-  - name: default
-  release: mongodb-services
-  stemcell: ubuntu
-  vm_type: default
-
-- name: acceptance_tests
-  lifecycle: errand
-  azs: [z1]
-  instances: 1
-  vm_type: default
-  stemcell: ubuntu
-  networks:
-  - name: default
-  jobs:
-  - name: mongodb-acceptance-tests
-    release: mongodb-services
-    properties:
-      mongo_test_suite: [ readwrite, replicaset ]
-      user:
-        username: root
-        password: ((root_password))
-name: mongodb
-releases:
-- name: mongodb-services
-  version: latest
-- name: "bpm"
-  version: "1.0.4"
-  url: "https://bosh.io/d/github.com/cloudfoundry-incubator/bpm-release?v=1.0.4"
-  sha1: "41df19697d6a69d2552bc2c132928157fa91abe0"
-stemcells:
-- alias: ubuntu
-  os: ubuntu-xenial
-  version: latest
-update:
-  canaries: 1
-  canary_watch_time: 30000-240000
-  max_in_flight: 1
-  serial: false
-  update_watch_time: 30000-240000
-variables:
-- name: root_password
-  type: password
-- name: mongo_ca
-  type: certificate
-  options:
-    is_ca: true
-    common_name: MongoDB CA
-features:
-  use_dns_addresses: false
diff --git a/ci/files/use_old_stemcell.yml b/ci/files/use_old_stemcell.yml
deleted file mode 100644
index c1464129..00000000
--- a/ci/files/use_old_stemcell.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- type: replace
-  path: /stemcells/-
-  value:
-    alias: old_xenial
-    os: ubuntu-xenial
-    version: '621.50'
-
-- type: replace
-  path: /instance_groups/name=mdb-shared/stemcell
-  value: old_xenial
-
-- type: replace
-  path: /instance_groups/name=mdbconf-shared/stemcell
-  value: old_xenial
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 163098b9..7e212663 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -1,134 +1,99 @@
+---
 anchors:
-  blobstore_credentials: &blobstore_credentials
-    AWS_ACCESS_KEY_ID: ((smarsh_bosh_releases_bucket_access_key_id))
-    AWS_SECRET_ACCESS_KEY: ((smarsh_bosh_releases_bucket_secret_access_key))
   smarsh_releases_bucket: &smarsh_releases_bucket
     bucket: smarsh-bosh-releases
-    access_key_id: ((smarsh_bosh_releases_bucket_access_key_id))
-    secret_access_key: ((smarsh_bosh_releases_bucket_secret_access_key))
+    access_key_id: ((aws-access-key-id))
+    secret_access_key: ((aws-secret-access-key))
+  blobstore_credentials: &blobstore_credentials
+    AWS_ACCESS_KEY_ID: ((aws-access-key-id))
+    AWS_SECRET_ACCESS_KEY: ((aws-secret-access-key))
+  bosh-creds: &bosh-creds
+    jumpbox_key: ((jumpbox-key))
+    ca_cert: ((ca-cert))
+    BOSH_ENVIRONMENT: ((bosh-environment))
 
 resources:
-# Docker images
-- name: pcf-ops
-  type: docker-image
-  source:
-    repository: engineerbetter/pcf-ops
-    tag: latest
-
-# Git
-- name: mongodb_bosh_release_git
-  type: git
-  source:
-    ignore_paths:
-    - releases
-    - .final_builds
-    - README.md
-    branch: master
-    uri: https://github.com/Smarsh/mongodb-boshrelease.git
+  - name: boshcli2
+    type: registry-image
+    source:
+      repository: afamuzoka/boshcli2
+      username: ((docker.username))
+      password: ((docker.password))
+      tag: latest
 
-- name: mongodb_bosh_release_version
-  type: semver
-  source:
-    driver: git
-    branch: version
-    file: version
-    uri: git@github.com:Smarsh/mongodb-boshrelease.git
-    private_key: ((mongodb_bosh_release_deploy_key))
+  - name: version
+    type: semver
+    source:
+      driver: s3
+      << : *smarsh_releases_bucket
+      region: eu-west-2
+      key: sredataservices/((bosh-release-name))/version
+      initial_version: ((initial_version))
 
-# S3
-- name: mongodb_bosh_candidate_release_s3
-  type: s3
-  source:
-    << : *smarsh_releases_bucket
-    regexp: mongodb/candidates/mongodb-(.*).tgz
+  - name: git-repo
+    type: git
+    icon: github-circle
+    source:
+      uri: ((git.url))
+      branch: ((git.branch))
+      private_key: ((git-private-key.private_key))
+      
+  - name: git-golang
+    type: git
+    icon: github-circle
+    source:
+      uri: https://github.com/bosh-packages/golang-release.git
+      fetch_tags: true
+      branch: v0.9.0 
+  
+  - name: s3-final-release
+    type: s3
+    source:
+      << : *smarsh_releases_bucket
+      regexp: sredataservices/release/((bosh-release-name))-(.*).tgz
 
-- name: mongodb_bosh_release_s3
-  type: s3
-  source:
-    << : *smarsh_releases_bucket
-    regexp: mongodb/mongodb-(.*).tgz
-
-# Stemcells
-- name: old_xenial_stemcell
-  type: bosh-io-stemcell
-  source:
-    name: bosh-warden-boshlite-ubuntu-xenial-go_agent
-    version_family: '621.50'
-
-- name: xenial_stemcell
-  type: bosh-io-stemcell
-  source:
-    name: bosh-warden-boshlite-ubuntu-xenial-go_agent
 
 jobs:
-- name: create_candidate_release
-  serial: true
-  plan:
-  - get: mongodb_bosh_release_version
-    params:
-      bump: patch
-      pre: rc
-  - get: mongodb_bosh_release_git
-    trigger: true
-  - task: create_release
-    file: mongodb_bosh_release_git/ci/tasks/create_release.yml
-    params:
-      <<: *blobstore_credentials
-  - put: mongodb_bosh_candidate_release_s3
-    params:
-      file: release_tarball/mongodb-*.tgz
-  - put: mongodb_bosh_release_version
-    params:
-      file: mongodb_bosh_release_version/version
-
-- name: system_test_candidate_release
-  serial: true
-  serial_groups:
-  - mongodb_release
-  plan:
-  - get: mongodb_bosh_candidate_release_s3
-    passed:
-    - create_candidate_release
-  - get: mongodb_bosh_release_git
-    trigger: true
-    passed:
-    - create_candidate_release
-  - get: mongodb_bosh_release_version
-    passed:
-    - create_candidate_release
-  - get: xenial_stemcell
-  - get: old_xenial_stemcell
-  - task: system_tests
-    file: mongodb_bosh_release_git/ci/tasks/system_test.yml
-    privileged: true
-    timeout: 90m
 
-- name: create_final_release
-  serial: true
-  serial_groups:
-  - mongodb_release
-  plan:
-  - get: pcf-ops
-  - get: mongodb_bosh_candidate_release_s3
-    trigger: true
-    passed:
-    - system_test_candidate_release
-  - get: mongodb_bosh_release_git
-    passed:
-    - system_test_candidate_release
-  - get: mongodb_bosh_release_version
-    passed:
-    - system_test_candidate_release
-    params:
-      bump: final
-  - task: create_final_release
-    file: mongodb_bosh_release_git/ci/tasks/create_final_release.yml
-    params:
-      <<: *blobstore_credentials
-    privileged: true
-  - put: mongodb_bosh_release_s3
-    params:
-      file: release_tarball/mongodb-*.tgz
-  - put: mongodb_bosh_release_version
-    params:
-      file: mongodb_bosh_release_version/version
+  - name: cut-release
+    public: true
+    serial: true
+    plan:
+      - in_parallel:
+        - get: git-repo
+          trigger: true
+          version: latest
+        - get: git-golang
+          trigger: false
+        - get: boshcli2
+      - get: version
+        trigger: false
+        params:
+          bump: patch
+      - task: add-blobs
+        file: git-repo/ci/tasks/add-blobs.yml
+        image: boshcli2
+        params: 
+          << : *blobstore_credentials
+          << : *bosh-creds
+          BLOBSTORE: smarsh-bosh-release-blobs
+        input_mapping: {golang-release: git-golang}
+      - task: create-final-release
+        file: git-repo/ci/tasks/create-final-release.yml
+        image: boshcli2
+        params: 
+          << : *blobstore_credentials
+          << : *bosh-creds
+          BLOBSTORE: smarsh-bosh-release-blobs
+      - put: s3-final-release
+        params:
+          file: release-tarball/((bosh-release-name))-*.tgz
+      # - put: git-repo
+      #   params:
+      #     rebase: true
+      #     repository: finalized-release
+      #     tag: version/tag-name
+      #     annotate: version/annotate-msg 
+      # - put: version
+      #   params: {file: version/number}
+      
diff --git a/ci/tasks/add-blobs.sh b/ci/tasks/add-blobs.sh
new file mode 100755
index 00000000..bdc8d8aa
--- /dev/null
+++ b/ci/tasks/add-blobs.sh
@@ -0,0 +1,179 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ $(echo $TERM | grep -v xterm) ]]; then
+  export TERM=xterm
+fi
+
+SHELL=/bin/bash
+ROOT_DIR=$(pwd)
+OUTPUT_DIR=../add-blob-release
+SOURCE_DL_DIR=.downloads
+BOSH_RELEASE_VERSION_FILE=../version/number
+SOURCE_VERSION_FILE="$(pwd)/ci/VERSIONS"
+RELEASE_NAME=$(bosh int config/final.yml --path /final_name)
+PRERELEASE_REPO=../git-prerelease-repo
+RUN_PIPELINE=0 # if script is running locally then 0 if in consourse pipeline then 1
+
+BOLD=$(tput bold)
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
+MAGENTA=$(tput setaf 5)
+RESET=$(tput sgr0)
+
+
+logerror() {
+  echo
+  echo 1>&2 "###"
+  echo 1>&2 "###"
+  printf "### ${BOLD}${RED}${1}${RESET}\n" 1>&2
+  echo 1>&2 "###"
+  echo 1>&2
+}
+
+loginfo() {
+  echo
+  echo "###"
+  echo "###"
+  printf "### ${BOLD}${GREEN}${1}${RESET}\n"
+  echo "###"
+  echo
+}
+
+download() {
+  local file=${1}
+  local url=${2}
+
+  loginfo "Downloading ${url} ..."
+  curl --fail -L -o $file $url 
+}
+
+addBlob() {
+  local path=${1}
+  local blobPath=${2}
+
+  loginfo "Track blob ${blobPath} for inclusion in release"
+  bosh add-blob $path ${blobPath}
+}
+
+main() {
+
+  if [[ -f ${SOURCE_VERSION_FILE} ]] ; then 
+    source ${SOURCE_VERSION_FILE}
+    if [[ -f ci/dl-packages-src ]] ; then
+      source ci/dl-packages-src
+    else
+      logerror "Missing local versioning file in ci/dl-packages-src"
+      exit 2
+    fi
+  else
+    logerror "Missing source download file in ci/VERSIONS"
+    exit 2
+  fi
+
+
+  # Are we running inside a concourse pipeline
+  # i wonder if theres something else i can use
+  if [[ -f  ${BOSH_RELEASE_VERSION_FILE} ]] ; then
+    BOSH_RELEASE_VERSION=$(cat ${BOSH_RELEASE_VERSION_FILE})
+    RUN_PIPELINE=1
+  else 
+    BOSH_RELEASE_VERSION='SNAPSHOT'
+  fi
+
+  BOSH_RELEASE_FILE=${RELEASE_NAME}-${BOSH_RELEASE_VERSION}.tgz
+
+  [[ ! -d ${SOURCE_DL_DIR} ]] && mkdir ${SOURCE_DL_DIR}
+  
+  for key in "${!downloads[@]}" 
+  do
+    local file=${SOURCE_DL_DIR}/$(basename ${key})
+    local blobPath=${key}
+
+    download ${file} ${downloads[${key}]}
+
+  done
+  
+  # remove blobs
+  > config/blobs.yml
+
+  for key in "${!downloads[@]}" 
+  do
+    local file=${SOURCE_DL_DIR}/$(basename ${key})
+    local blobPath=${key}
+
+    addBlob ${file} ${blobPath}
+
+  done
+
+  rm -fr ${SOURCE_DL_DIR}
+
+  
+  if [[ ${RUN_PIPELINE} -eq 1 ]] ; then
+    
+    loginfo "Create release version ${BOSH_RELEASE_VERSION}"
+    
+    # fix - removing .final_builds folder is not necessary when running locally however when running in a pipeline 
+    # which uses bosh version 6.2.1 bosh create-release --force fails
+    # that requires this hidden directory to be renamed/removed
+    rm -fr .final_builds
+    
+    BRANCH=$(git name-rev --name-only $(git rev-list  HEAD --date-order --max-count 1))
+    
+    git status
+
+    git checkout ${BRANCH}
+
+    if [[ -d ../golang-release ]]; then
+      loginfo "Download GoLang vendor package"
+      bosh vendor-package golang-1.9-linux ../golang-release
+    fi
+
+    tarBallPath=${OUTPUT_DIR}/${BOSH_RELEASE_FILE}
+    
+    loginfo "Create release version ${BOSH_RELEASE_VERSION}"
+    bosh create-release --force --name ${RELEASE_NAME} --version=${BOSH_RELEASE_VERSION} --timestamp-version --tarball=${tarBallPath}
+    
+    cat << EOF > config/final.yml
+---
+blobstore:
+  provider: s3
+  options:
+    bucket_name: ${BLOBSTORE}
+final_name: ${RELEASE_NAME}
+EOF
+
+## Create private.yml for BOSH to use our AWS keys
+    cat << EOF > config/private.yml
+---
+blobstore:
+  provider: s3
+  options:
+    credentials_source: env_or_profile
+EOF
+
+    loginfo "Upload blobs ${BOSH_RELEASE_VERSION}"
+    bosh blobs
+    bosh -n upload-blobs
+  
+    if [[ -n "$(git status --porcelain)" ]]; then
+
+      git config --global user.email "CI@localhost"
+      git config --global user.name "CI Bot "
+
+      git status
+      git update-index --assume-unchanged config/final.yml
+      git add -A
+      git status
+      git commit -m "Adding blob, ${BOSH_RELEASE_FILE} to ${BLOBSTORE} via concourse"
+      [[ -d ${PRERELEASE_REPO} ]] && mkdir -p ${PRERELEASE_REPO}
+      cp -r . ${PRERELEASE_REPO}
+    fi
+  fi
+
+}
+
+bosh reset-release
+main
diff --git a/ci/tasks/add-blobs.yml b/ci/tasks/add-blobs.yml
new file mode 100644
index 00000000..570d82f9
--- /dev/null
+++ b/ci/tasks/add-blobs.yml
@@ -0,0 +1,12 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+- name: version
+- name: golang-release
+outputs:
+- name: add-blob-release
+- name: git-prerelease-repo
+run:
+  path: ci/tasks/add-blobs.sh
+  dir: git-repo
\ No newline at end of file
diff --git a/ci/tasks/create-final-release.sh b/ci/tasks/create-final-release.sh
new file mode 100755
index 00000000..1b7563d4
--- /dev/null
+++ b/ci/tasks/create-final-release.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+set -euo pipefail
+
+SHELL=/bin/bash
+ROOT_DIR=$(pwd)
+
+if [[ $(echo $TERM | grep -v xterm) ]]; then
+  export TERM=xterm
+fi
+
+GITHUB_REPO="git-repo"
+BOSH_RELEASE_VERSION=$(cat ${ROOT_DIR}/version/version)
+BOSH_RELEASE_VERSION_FILE=../version/number
+RELEASE_NAME=$(bosh int ${GITHUB_REPO}/config/final.yml --path /final_name)
+BOSH_RELEASE_FILE=${RELEASE_NAME}-${BOSH_RELEASE_VERSION}.tgz
+PRERELEASE_REPO=./git-prerelease-repo
+RUN_PIPELINE=0 # if script is running locally then 0 if in consourse pipeline then 1
+
+BOLD=$(tput bold)
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
+MAGENTA=$(tput setaf 5)
+RESET=$(tput sgr0)
+
+loginfo() {
+  echo
+  echo "###"
+  echo "###"
+  printf "### ${BOLD}${GREEN}${1}${RESET}\n"
+  echo "###"
+  echo
+}
+
+loginfo "Configuring files, keys, certs and directories"
+
+set +x
+
+echo "$jumpbox_key" | jq -r .private_key > jumpbox.key 
+echo "$ca_cert" | jq -r .certificate > ca_cert.crt
+
+set -x
+
+loginfo "Configuring BOSH environment"
+
+bosh alias-env $BOSH_ENVIRONMENT -e $BOSH_ENVIRONMENT --ca-cert ${ROOT_DIR}/ca_cert.crt
+export BOSH_ALL_PROXY=ssh+socks5://jumpbox@${BOSH_ENVIRONMENT}:22?private-key=${ROOT_DIR}/jumpbox.key
+
+## change directories into the master branch of the repository that is cloned, not the branched clone
+pushd $PRERELEASE_REPO
+
+  git config --global user.email "ci@localhost"
+  git config --global user.name "CI Bot"
+
+  loginfo "Cutting a final release"
+
+  ## Download all of the blobs and packages from the boshrelease bucket that is read only
+
+      
+      cat << EOF > config/final.yml
+---
+blobstore:
+  provider: s3
+  options:
+    bucket_name: ${BLOBSTORE}
+name: ${RELEASE_NAME}
+EOF
+
+  ## Create private.yml for BOSH to use our AWS keys
+      cat << EOF > config/private.yml
+---
+blobstore:
+  provider: s3
+  options:
+    credentials_source: env_or_profile
+EOF
+
+  git update-index --assume-unchanged config/final.yml
+
+  # [[ -d .final_builds ]]  && rm -fr .final_builds
+
+  git status
+
+  loginfo "Create final release"
+  bosh finalize-release --name=${RELEASE_NAME} --version=${BOSH_RELEASE_VERSION} ../add-blob-release/${BOSH_RELEASE_FILE}
+
+  git status
+
+  git add config .final_builds releases || true
+  [[ -n "$(git status --porcelain)" ]] && git commit -am "Final release stage change, ${BOSH_RELEASE_VERSION} via concourse"
+
+  loginfo "Create release final release tarball"
+  bosh create-release --tarball=../release-tarball/${BOSH_RELEASE_FILE} --final
+popd
\ No newline at end of file
diff --git a/ci/tasks/create-final-release.yml b/ci/tasks/create-final-release.yml
new file mode 100644
index 00000000..6ba0ec0b
--- /dev/null
+++ b/ci/tasks/create-final-release.yml
@@ -0,0 +1,17 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+- name: git-prerelease-repo
+- name: add-blob-release
+- name: version
+outputs:
+- name: release-tarball
+- name: git-release-repo
+
+run:
+  path: git-repo/ci/tasks/create-final-release.sh
+
+params:
+  AWS_ACCESS_KEY_ID:
+  AWS_SECRET_ACCESS_KEY:
diff --git a/ci/tasks/create-release.sh b/ci/tasks/create-release.sh
new file mode 100755
index 00000000..2adb843f
--- /dev/null
+++ b/ci/tasks/create-release.sh
@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ $(echo $TERM | grep -v xterm) ]]; then
+  export TERM=xterm
+fi
+
+SHELL=/bin/bash
+ROOT_DIR=$(pwd)
+USE_PIPELINE=0
+
+ROOT_PATH=${PWD}
+DEV_RELEASE_DIR=${ROOT_PATH}/s3-dev-release/kafka-dev-release.tgz
+BOSH_RELEASE_VERSION=$(cat ../version/version)
+INPUT_DIR=git-bosh-release
+OUTPUT_DIR=create-release
+PROMOTED_REPO=${INPUT_DIR}-pr
+
+BOLD=$(tput bold)
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
+MAGENTA=$(tput setaf 5)
+RESET=$(tput sgr0)
+
+
+[[ ${USE_PIPELINE} -ne 0 ]] && pushd ./${INPUT_DIR}
+
+VERSION_FILE="${ROOT_DIR}/VERSIONS"
+
+KAFKA_VERSION=${KAFKA_VERSION:?required}
+
+
+if [[ ! -d ../${DEV_RELEASE_DIR} ]] ; then 
+  tarBallFile=./kafka-dev-release.tgz
+else
+  tarBallFile=../${DEV_RELEASE_DIR}/kafka-dev-release.tgz
+fi
+
+
+printf "\n${BOLD}${GREEN}Create final release${RESET}\n"
+
+git config --global user.email "ci@localhost"
+git config --global user.name "CI Bot"
+
+popd
+
+pushd ./${INPUT_DIR}
+tag_name="v${VERSION}"
+
+tag_annotation="Final release ${VERSION} tagged via concourse"
+
+git tag -a "${tag_name}" -m "${tag_annotation}"
+popd
+
+git clone ./${INPUT_DIR} $PROMOTED_REPO
+
+pushd $PROMOTED_REPO
+git status
+
+git checkout master
+git status
+
+cat > config/final.yml <<EOF
+---
+blobstore:
+provider: s3
+options:
+  bucket_name: smarsh-bosh-release-blobs
+  region: eu-west-2
+name: kafka
+EOF
+
+cat > config/private.yml <<EOF
+---
+blobstore:
+provider: s3
+options:
+  credentials_source: env_or_profile
+EOF
+
+bosh finalize-release --version $VERSION $DEV_RELEASE_PATH
+bosh create-release --final --name kafka --version=${VERSION} --timestamp-version --tarball ${tarBallFile}
+
+git status
+git add -A
+
+[[ -n "$(git status --porcelain > /dev/null 2>&1)" ]] && git commit -m "Adding final release $VERSION via concourse"
+popd
+
+
+[[ $USE_PIPELINE -ne 0 ]] && popd
+
+###
diff --git a/ci/tasks/create-release.yml b/ci/tasks/create-release.yml
new file mode 100644
index 00000000..d2df0031
--- /dev/null
+++ b/ci/tasks/create-release.yml
@@ -0,0 +1,8 @@
+platform: linux
+inputs:
+- name: git-bosh-release
+- name: s3-dev-release
+outputs:
+- name: create-release
+run:
+  path: git-bosh-release/ci/tasks/create-release.sh 
\ No newline at end of file
diff --git a/ci/tasks/create_final_release.sh b/ci/tasks/create_final_release.sh
deleted file mode 100755
index 633c0544..00000000
--- a/ci/tasks/create_final_release.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -eux
-
-version="$(cat mongodb_bosh_release_version/version)"
-cd mongodb_bosh_release_git/
-RELEASE_YML=$PWD/releases/mongodb-services/mongodb-services-${version}.yml
-
-echo "creating final release"
-bosh finalize-release ../mongodb_bosh_candidate_release_s3/mongodb-*.tgz \
-  --version "$version" \
-
-bosh create-release "${RELEASE_YML}" \
-  --tarball "../release_tarball/mongodb-$version.tgz"
\ No newline at end of file
diff --git a/ci/tasks/create_final_release.yml b/ci/tasks/create_final_release.yml
deleted file mode 100644
index 7177e90a..00000000
--- a/ci/tasks/create_final_release.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-platform: linux
-image_resource:
-  type: docker-image
-  source:
-    repository: engineerbetter/pcf-ops
-    tag: latest
-
-inputs:
-- name: mongodb_bosh_candidate_release_s3
-- name: mongodb_bosh_release_git
-- name: mongodb_bosh_release_version
-
-outputs:
-- name: release_tarball
-
-run:
-  path: mongodb_bosh_release_git/ci/tasks/create_final_release.sh
diff --git a/ci/tasks/create_release.sh b/ci/tasks/create_release.sh
deleted file mode 100755
index e665b610..00000000
--- a/ci/tasks/create_release.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-version="$(cat mongodb_bosh_release_version/version)"
-cd mongodb_bosh_release_git
-
-# Create candidate release
-bosh create-release --force \
-  --version "$version" \
-  --tarball "../release_tarball/mongodb-$version.tgz"
diff --git a/ci/tasks/create_release.yml b/ci/tasks/create_release.yml
deleted file mode 100644
index 11c95e1a..00000000
--- a/ci/tasks/create_release.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-platform: linux
-image_resource:
-  type: docker-image
-  source:
-    repository: engineerbetter/pcf-ops
-    tag: latest
-
-inputs:
-- name: mongodb_bosh_release_git
-- name: mongodb_bosh_release_version
-
-outputs:
-- name: release_tarball
-
-run:
-  path: mongodb_bosh_release_git/ci/tasks/create_release.sh
diff --git a/ci/tasks/system_test.sh b/ci/tasks/system_test.sh
deleted file mode 100755
index cd08de82..00000000
--- a/ci/tasks/system_test.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-export BOSH_NON_INTERACTIVE=true
-export BOSH_DEPLOYMENT=mongodb
-
-start-bosh \
-  -o /usr/local/bosh-deployment/uaa.yml \
-  -o /usr/local/bosh-deployment/credhub.yml
-source /tmp/local-bosh/director/env
-
-# Upload releases and stemcell
-bosh upload-stemcell xenial_stemcell/*.tgz
-bosh upload-release mongodb_bosh_candidate_release_s3/*.tgz
-
-# Deploy and run acceptance test errand
-bosh deploy mongodb_bosh_release_git/ci/files/manifest.yml
-bosh run-errand acceptance_tests --keep-alive
-
-# Recreate all vms in the deployment and run acceptance test errand
-bosh recreate
-bosh run-errand acceptance_tests --keep-alive
-
-# Restart processes on instances and run acceptance test errand
-bosh restart
-bosh run-errand acceptance_tests --keep-alive
-
-bosh upload-stemcell old_xenial_stemcell/*.tgz
-bosh deploy mongodb_bosh_release_git/ci/files/manifest.yml \
-  -o mongodb_bosh_release_git/ci/files/use_old_stemcell.yml
-bosh run-errand acceptance_tests --keep-alive
diff --git a/ci/tasks/system_test.yml b/ci/tasks/system_test.yml
deleted file mode 100644
index 1b5621ea..00000000
--- a/ci/tasks/system_test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-platform: linux
-image_resource:
-  type: registry-image
-  source:
-    repository: bosh/main-bosh-docker
-
-inputs:
-- name: mongodb_bosh_release_git
-- name: mongodb_bosh_candidate_release_s3
-- name: old_xenial_stemcell
-- name: xenial_stemcell
-
-run:
-  path: mongodb_bosh_release_git/ci/tasks/system_test.sh
diff --git a/config/blobs.yml b/config/blobs.yml
index a5217d1a..bea6d9b4 100644
--- a/config/blobs.yml
+++ b/config/blobs.yml
@@ -1,4 +1,3 @@
-mongodb/mongodb-linux-x86_64-3.6.6.tar.gz:
-  size: 100627358
-  object_id: 35cb3540-3672-4724-7ae9-1be7a1a261c0
-  sha: sha256:db01cf5dc8c53094ae6869d3ef4bce6cd146201282e2729fc987f3141938ab27
+mongodb/mongodb-linux-x86_64-3.6.18.tar.gz:
+  size: 103372089
+  sha: sha256:f7921cc53bf20966c420cc0dbb9e5a3bfe20519f87863cdc2583142cbc20b5b1