diff --git a/Dockerfile b/Dockerfile
index 4345602412242a8011d72128b3b6e6d7a7518ca5..4b451a93cd3952021a5200f541fc4cd57ff943be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-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-rails
-ARG BASE_TAG=13.5.4
+ARG BASE_TAG=13.6.0
 
 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
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 2b01c5e87d0513188c3aaefefcd9434a51a678ec..b4f4c6a943fcae631d8fcc3eee8d657f6c4a84a9 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 af1d37ddfe00662810708e4d566446e1c0711d65..f4043d836545366e9e692b628499876aee6ac417 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,11 +1,11 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitlab-sidekiq-ee.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-sidekiq-ee.tar.gz"
     filename: "gitlab-sidekiq-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "d22db020d8ef990e06582c356ea7f75fc39843eb19d8101aa62ef7d3b02b4c4a"
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitlab-python.tar.gz"
+      value: "1c2c3e898d8d98d1161794f06b253f39274c5d66d26b24af0163d73ff9bf815b"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-python.tar.gz"
     filename: "gitlab-python.tar.gz"
     validation:
       type: "sha256"
-      value: "8cd4fbc021b59d139b335b77062c7f4fb0ee003fd9b4c8fd5e52754fe8b39e4f"
+      value: "8fd47f8a7e0389c92a1626a7c92a6cd53e8ab768fc6a058d1c52a4439342b761"
diff --git a/scripts/process-wrapper b/scripts/process-wrapper
index 7644ff0031b87959c128ea3c453492ae1a137378..89fe61c6359ef7b0ec1386d9e43f3535d41ee88d 100755
--- a/scripts/process-wrapper
+++ b/scripts/process-wrapper
@@ -13,10 +13,11 @@ if [[ "${SIDEKIQ_CLUSTER^^}" = 'TRUE' ]]; then
         negate_flag=''
     fi
 
-    if [[ "${SIDEKIQ_EXPERIMENTAL_QUEUE_SELECTOR}" = 'true' ]]; then
-      experimental_queue_selector_flag='--experimental-queue-selector'
+    # Remove experimental part in https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/646
+    if [[ "${SIDEKIQ_QUEUE_SELECTOR}" = 'true' || "${SIDEKIQ_EXPERIMENTAL_QUEUE_SELECTOR}" = 'true' ]]; then
+      queue_selector_flag='--queue-selector'
     else
-      experimental_queue_selector_flag=''
+      queue_selector_flag=''
     fi
 
     # sidekiq-cluster offers two things:
@@ -42,7 +43,7 @@ if [[ "${SIDEKIQ_CLUSTER^^}" = 'TRUE' ]]; then
             --min-concurrency ${SIDEKIQ_CONCURRENCY_MIN:-$SIDEKIQ_CONCURRENCY} \
             --max-concurrency ${SIDEKIQ_CONCURRENCY_MAX:-$SIDEKIQ_CONCURRENCY} \
             -t $SIDEKIQ_TIMEOUT \
-            $experimental_queue_selector_flag \
+            $queue_selector_flag \
             $negate_flag \
             "${queues}"
         ) &