diff --git a/Dockerfile b/Dockerfile
index 5796f5c7a73c36626829b6e164350c50868710f9..14da0a8f20e75475ee33dc6a2d896dac4eeb22a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-ARG GITLAB_VERSION=v13.2.0-ubi8
+ARG GITLAB_VERSION=v13.3.6-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/git-base
-ARG BASE_TAG=13.2.0
+ARG BASE_TAG=13.3.6
 
 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 FROM ${GIT_IMAGE}
 
-ARG GITALY_SERVER_VERSION=v13.2.0
+ARG GITALY_SERVER_VERSION=v13.3.6
 ARG GITLAB_USER=git
 ARG DNF_OPTS
 
@@ -22,7 +22,6 @@ LABEL source="https://gitlab.com/gitlab-org/gitaly" \
       description="Gitaly is a Git RPC service for handling all the git calls made by GitLab."
 
 ADD gitaly.tar.gz /
-ADD gitlab-shell.tar.gz /
 
 COPY scripts/ /scripts/
 COPY config.toml /etc/gitaly/config.toml
@@ -33,19 +32,16 @@ RUN dnf clean all \
     && dnf ${DNF_OPTS} install -by --nodocs procps net-tools libicu openssh-clients \
     && rm -f /usr/local/tmp/openssh-server-*.rpm /usr/libexec/openssh/ssh-keysign \
     && adduser -m ${GITLAB_USER} \
-    && mkdir -p /etc/gitaly /var/log/gitaly /home/${GITLAB_USER}/repositories \
+    && mkdir -p /etc/gitaly /var/log/gitaly /home/${GITLAB_USER}/repositories /srv/gitlab-shell \
     && touch /var/log/gitaly/gitaly.log \
     && touch /var/log/gitaly/gitlab-shell.log \
-    && cp /srv/gitlab-shell/config.yml.example /etc/gitaly/shell-config.yml \
-    && ln -s /etc/gitaly/shell-config.yml /srv/gitlab-shell/config.yml \
     && chown -R ${GITLAB_USER}:${GITLAB_USER} \
       /scripts \
       /etc/gitaly \
       /var/log/gitaly \
       /home/${GITLAB_USER}/repositories \
       /srv/gitaly-ruby \
-      /srv/gitlab-shell \
-      /etc/gitaly/shell-config.yml
+      /srv/gitlab-shell
 
 USER ${GITLAB_USER}:${GITLAB_USER}
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 06ba1fffc26630a97859ca4986e4dc8c72ebb1ac..5144a6bdcccf5189c15633b12f4d41ac8f87800f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,3 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.2.0")
+dccscrPipeline(version: "13.3.6")
 
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index ba473c67c5fa211da68eb13224c6ac1fed94e334..6eaed1d0265f249c6f87d682851db84083f818df 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.2.0}
+TAG=${1:-13.3.6}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index c1ea847808290e70cfe37b413f741f57d1f0bba4..6d64188f1fb7ad0459d6b3fe98edf98e973d0701 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,11 +1,6 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitaly.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.3.6-ubi8/gitaly.tar.gz"
     filename: "gitaly.tar.gz"
     validation:
       type: "sha256"
-      value: "f9bbe8957efb4e7624b428289072db0636b85c663c2c856328f5e320b09fff78"
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-shell.tar.gz"
-    filename: "gitlab-shell.tar.gz"
-    validation:
-      type: "sha256"
-      value: "d41395c0a2f0121a7342beafc48747d0f7d83992999272521ed882b89b378932"
+      value: "899c65abb06434e4e7a2002dfe18e823ef372c0060e558e28a174b2d5676f568"