diff --git a/Dockerfile b/Dockerfile
index 0dee9f4cf5e5e17aad65ae9d270cf4ce28f7513b..18bfc72d1fd249e979642c82aa5d207288f3bf1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-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/gitlab-rails
-ARG BASE_TAG=13.2.0
+ARG BASE_TAG=13.3.6
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 68393cd098a081c8923daddab16ee951bb6f5474..a1ee26dbbe60252bd25f40e820816310147c228c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @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 a8cf2ee571575e5d00ff4e0d9f8636e8749ebbfa..6d72ee12c03f7d23467748a2edb9b46c036ea85c 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 ba3e85c866c43e44ecdae8bb6621d5f67b0c9c95..081c8c5323df79eab4f164be9de1d848680693bc 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,11 +1,11 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-task-runner-ee.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.3.6-ubi8/gitlab-task-runner-ee.tar.gz"
     filename: "gitlab-task-runner-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "ed7a08756e6c81546ac62bd8f64022d15fac6e2d5ae263e4bbfec36a94a0e564"
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.2.0-ubi8/gitlab-python.tar.gz"
+      value: "1af5de579d6e50a88f84e41e4ec9dd987c3f2b2522c67889816403c5f930d626"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.3.6-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "de90479c921f72b62b7fc2ad3d203f64eee3c47027aca44547a5e1350b633686"
+      value: "384b8f3a96dc7a0628e97cb63bb0ad4e6619c218a8b0e1c5a00be84a57066769"
diff --git a/scripts/lib/object_storage_backup.rb b/scripts/lib/object_storage_backup.rb
index fd8dae6361cef6b7e6477d9bd9e565d8f95c4f07..67a78a45ecc968d929d6c7a2fe2050020b9cd21c 100644
--- a/scripts/lib/object_storage_backup.rb
+++ b/scripts/lib/object_storage_backup.rb
@@ -73,11 +73,11 @@ class ObjectStorageBackup
   end
 
   def upload_to_object_storage(source_path)
+    dir_name = File.basename(source_path)
     if @backend == "s3"
-      dir_name = File.basename(source_path)
       cmd = %W(s3cmd --stop-on-error sync #{source_path}/ s3://#{@remote_bucket_name}/#{dir_name}/)
     elsif @backend == "gcs"
-      cmd = %W(gsutil -m rsync -r #{source_path}/ gs://#{@remote_bucket_name})
+      cmd = %W(gsutil -m rsync -r #{source_path}/ gs://#{@remote_bucket_name}/#{dir_name})
     end
 
     output, status = run_cmd(cmd)