diff --git a/Dockerfile b/Dockerfile
index 0aa411d7574b7db97db8c98ab9d0e47ecba1b9c0..ca8d22d8fdb2291d8de7c1b0a3206637829370fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-ARG GITLAB_VERSION=v13.5.4-ubi8
+ARG GITLAB_VERSION=v13.6.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.5.4
+ARG BASE_TAG=13.6.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${RUBY_IMAGE}
 
-ARG GITLAB_SHELL_VERSION=v13.11.0
+ARG GITLAB_SHELL_VERSION=v13.13.0
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 11e5b2480007a3b3ad5f698bcf5be9a4c79ee825..8fe25224789c3f2a591bd673cc01bbaca6f3b886 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.5.4")
+dccscrPipeline(version: "13.6.0")
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index 47572b2d2f4c42426bcb976b25d95d291aa19bbb..02ca90dd3ae557d7eef1beca24465ac59a710c61 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.5.4}
+TAG=${1:-13.6.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index fc08921e074fffbe6eca4144ecf346838186e122..83c26b96c3e839801d2380c5d01399d7892c965c 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,6 +1,6 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitlab-shell.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-shell.tar.gz"
     filename: "gitlab-shell.tar.gz"
     validation:
       type: "sha256"
-      value: "0cda44329e385accb75429da9a1c07e943d3d9d995007f36504442fdc908db81"
+      value: "c972a8c0915713e04ebe8ca30c48812ecf3025cd905b5cd849f3005c85768b44"
diff --git a/scripts/healthcheck b/scripts/healthcheck
index e6625d42269379728b43fd38d71b49cbe2e26a47..e0887fb7501771dc691a67314ea9d0c4f935f837 100755
--- a/scripts/healthcheck
+++ b/scripts/healthcheck
@@ -3,4 +3,4 @@
 set -e
 
 # Check that sshd is running
-/usr/bin/pgrep "sshd"
+/bin/ps "$(cat /srv/sshd/sshd.pid)"