diff --git a/Dockerfile b/Dockerfile
index d633c6871e602b06c78e5e4de600cbe1c8a07950..0ba44b9f3ffe3306cabe01d3257f288e4e533cf5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-ARG GITLAB_VERSION=v12.9.4-ubi8
+ARG GITLAB_VERSION=v12.10.1-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
-ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.1
+ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
+ARG BASE_TAG=12.10.1
 
-ARG UBI_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:12.9.4
+ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.1
+ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${UBI_IMAGE} AS builder
 
@@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}"
 
 FROM ${RUBY_IMAGE}
 
-ARG GITLAB_SHELL_VERSION=v12.0.0
+ARG GITLAB_SHELL_VERSION=v12.2.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/Jenkinsfile b/Jenkinsfile
index e84163b6728a4e024a8af169545b37ed13f6e95e..a51f36044e5a8fb66758f0e1617724771dae532d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "12.9.4")
+dccscrPipeline(version: "12.10.1")
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index e504db5b100c333ac01a92604a9e9470be07ecd7..46b9db9020e4bdb83b87007a04a65ca1c557f779 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-12.9.4}
+TAG=${1:-12.10.1}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index 698bb37160bc337ea482cf23074a152c9fa3a61f..d0fc2968b3533cdebd62dfbad53f30ff3b8aca65 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,6 +1,6 @@
 resources:
-  - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.9.4-ubi8.tar"
-    filename: "ubi8-build-dependencies-v12.9.4-ubi8.tar"
+  - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.1-ubi8.tar"
+    filename: "ubi8-build-dependencies-v12.10.1-ubi8.tar"
     validation:
       type: "sha256"
-      value: "e03f5054afc554cd4ed5560e6146e85bd8e76538fa86a233f8a68143755d7085"
+      value: "41a140d74e91f5ceb8222746ad856e67d1e3e606c7fe0093864b068cb46709c2"
diff --git a/scripts/process-wrapper b/scripts/process-wrapper
index 334be33fced74b053db8ae9c9d1d8c7e5c87e423..32673dcbe3ffeeff05e1533ceede5c61dfa15682 100755
--- a/scripts/process-wrapper
+++ b/scripts/process-wrapper
@@ -22,10 +22,16 @@ else
 fi
 
 echo "Starting OpenSSH"
-touch /var/log/gitlab-shell/ssh.log
 /usr/sbin/sshd -E /var/log/gitlab-shell/ssh.log &
 
 echo "Tailing Logs"
-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
+
 
 wait
diff --git a/sshd_config b/sshd_config
index 9578dd9264879fb01316498031f8c1243035fe68..577aa91092a81f6beb0ce94050e7d735cecc8ded 100644
--- a/sshd_config
+++ b/sshd_config
@@ -50,7 +50,7 @@ PermitRootLogin no
 #PermitEmptyPasswords no
 
 # Change to no to disable s/key passwords
-#ChallengeResponseAuthentication yes
+ChallengeResponseAuthentication no
 
 # Kerberos options
 #KerberosAuthentication no