diff --git a/Dockerfile b/Dockerfile
index ce74698924c54e1e02642dc934a2722374ac7542..3cf73736bf04e9ce87d0a8b0449d5013d13bea40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v14.1.2-ubi8
+ARG GITLAB_VERSION=v14.2.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=14.1.2
+ARG BASE_TAG=14.2.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/README.md b/README.md
index 7308a36cf5560b304281611d41361acd1bf3fcaf..7f4903fe2307cfef9241db46dc3f3a3c20a2b682 100644
--- a/README.md
+++ b/README.md
@@ -37,5 +37,5 @@ Some of the GitLab containers are build ontop of previous containers, building t
   * gitaly
 - Phase 4
   * gitlab-sidekiq
-  * gitlab-task-runner
+  * gitlab-toolbox
   * gitlab-webservice
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 240492f79da1206e6b316578b43691664a9f2d2e..b4c1e421abe15e894907a0e21737ff6ba4dfc94a 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-14.1.2}
+TAG=${1:-14.2.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index be7a3b8e0644a8682df35c8e8ab454a080ec6cea..9197fe69806bf0aa1084e7c2d30d9a7e56598393 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-shell"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "14.1.2"
+  - "14.2.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-ruby"
-  BASE_TAG: "14.1.2"
+  BASE_TAG: "14.2.0"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Shell"
@@ -22,7 +22,7 @@ labels:
   org.opencontainers.image.url: "https://about.gitlab.com/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Gitlab"
-  org.opencontainers.image.version: "14.1.2"
+  org.opencontainers.image.version: "14.2.0"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "gitlab, git, gitops"
   ## This value can be "opensource" or "commercial"
@@ -47,18 +47,18 @@ maintainers:
     username: "adam.martin"
     cht_member: true
 resources: 
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-shell.tar.gz"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "dab78e5894b98663ddaa5628e2f6d517e8e5f660faf1f408b9698b9f6a71ce8a"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-logger.tar.gz"
+      value: "4502c2f8db2ce094cc680c6eb131c5ac3b4da24cd8a1cf6d856cd248c8394719"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-logger.tar.gz"
     filename: "gitlab-logger.tar.gz"
     validation:
       type: "sha256"
-      value: "afe1470c7f1d137bf568ce36bd617299926c91bd05bf0b94e409861b2d72af06"
-  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.2-ubi8/gitlab-gomplate.tar.gz"
+      value: "42e4fc9d762e631287e681d75de6a2d13d407457f3ddeee0f4671788a48f0434"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-gomplate.tar.gz"
     filename: "gitlab-gomplate.tar.gz"
     validation:
       type: "sha256"
-      value: "986efb42b63df897200953c5c39993cb58ccb60185d3ed6e1425a4ffe16f040b"
+      value: "3ccc8dab21551e51b7a36a3e68513b5a0b65ff956cc936e820f7d079f89b1812"
diff --git a/scripts/process-wrapper b/scripts/process-wrapper
index 6c5a1bcf8e5fdaf96e9e23d476f17604372e4a48..4a0c678dd8946a196f2fca6237d0de4cfdd1dbd8 100755
--- a/scripts/process-wrapper
+++ b/scripts/process-wrapper
@@ -3,6 +3,7 @@
 set -e
 
 KEYS_DIRECTORY="${KEYS_DIRECTORY:-/etc/ssh}"
+SSH_DAEMON="${SSH_DAEMON:-openssh}"
 
 if ls $KEYS_DIRECTORY/ssh_host_* 1> /dev/null 2>&1; then
   echo "Using existing Host Keys"
@@ -21,15 +22,20 @@ else
   fi
 fi
 
-if [ "${USE_GITLAB_LOGGER-0}" -eq 1 ]; then
-  /usr/local/bin/gitlab-logger /var/log/gitlab-shell &
+
+if [ "${SSH_DAEMON}" == "gitlab-sshd" ]; then 
+  /srv/gitlab-shell/bin/gitlab-sshd -config-dir /srv/gitlab-shell
 else
-  if command -v xtail >/dev/null; then
-    xtail /var/log/gitlab-shell &
+  if [ "${USE_GITLAB_LOGGER-0}" -eq 1 ]; then
+    /usr/local/bin/gitlab-logger /var/log/gitlab-shell &
   else
-    touch /var/log/gitlab-shell/ssh.log
-    tail -f /var/log/gitlab-shell/* &
+    if command -v xtail >/dev/null; then
+      xtail /var/log/gitlab-shell &
+    else
+      touch /var/log/gitlab-shell/ssh.log
+      tail -f /var/log/gitlab-shell/* &
+    fi
   fi
-fi
 
-/usr/sbin/sshd -D -E /var/log/gitlab-shell/ssh.log
+  /usr/sbin/sshd -D -E /var/log/gitlab-shell/ssh.log  
+fi