diff --git a/.github/workflows/built_and_test.yml b/.github/workflows/built_and_test.yml
index 1a842c711..15f686a1d 100644
--- a/.github/workflows/built_and_test.yml
+++ b/.github/workflows/built_and_test.yml
@@ -10,12 +10,13 @@ on:
   push:
 
 env:
-  env_file: ${{ github.event.inputs.env_file || 'versions/wmde4.env' }}
+  env_file: ${{ github.event.inputs.env_file || 'versions/wmde5.env' }}
 
 jobs:
 
   build_wikibase:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
 
@@ -91,6 +92,7 @@ jobs:
 
   build_wikibase_bundle:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     needs:
       - build_wikibase
     steps:
@@ -167,6 +169,7 @@ jobs:
 
   build_quickstatements:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
 
@@ -220,6 +223,7 @@ jobs:
 
   build_wdqs:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
 
@@ -274,6 +278,7 @@ jobs:
 
   build_wdqs_proxy:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
 
@@ -319,6 +324,7 @@ jobs:
 
   build_wdqs_frontend:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
 
@@ -386,6 +392,7 @@ jobs:
 
   build_elasticsearch:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
 
@@ -456,7 +463,7 @@ jobs:
       - build_wdqs_proxy
       - build_quickstatements
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
       - name: Get Wikibase docker image artifact
@@ -485,7 +492,7 @@ jobs:
           path: test/log
 
   test_upgrade_base:
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
@@ -521,7 +528,7 @@ jobs:
           path: test/log
 
   test_upgrade_bundle:
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
@@ -555,7 +562,7 @@ jobs:
 
   test_example:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
 
@@ -576,6 +583,7 @@ jobs:
     needs:
       - test_wikibase
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
       - uses: c-py/action-dotenv-to-setenv@v3
diff --git a/Docker/build/Elasticsearch/Dockerfile b/Docker/build/Elasticsearch/Dockerfile
index 72d56a29d..63acea6f1 100644
--- a/Docker/build/Elasticsearch/Dockerfile
+++ b/Docker/build/Elasticsearch/Dockerfile
@@ -1,8 +1,8 @@
 ARG ELASTICSEARCH_VERSION
 FROM elasticsearch:${ELASTICSEARCH_VERSION}
 
-ARG ELASTICSEARCH_VERSION
-RUN ./bin/elasticsearch-plugin install org.wikimedia.search:extra:${ELASTICSEARCH_VERSION}
+ARG ELASTICSEARCH_PLUGIN_EXTRA_VERSION
+RUN ./bin/elasticsearch-plugin install org.wikimedia.search:extra:${ELASTICSEARCH_PLUGIN_EXTRA_VERSION}
 
 ARG ELASTICSEARCH_VERSION
 RUN ./bin/elasticsearch-plugin install org.wikimedia.search.highlighter:experimental-highlighter-elasticsearch-plugin:${ELASTICSEARCH_VERSION}
diff --git a/build/build_elasticsearch_docker.sh b/build/build_elasticsearch_docker.sh
index 2e31862bf..1bc32b9e6 100644
--- a/build/build_elasticsearch_docker.sh
+++ b/build/build_elasticsearch_docker.sh
@@ -4,6 +4,7 @@ set -e
 echo "Building elasticseach $ELASTICSEARCH_VERSION"
 docker build \
     --build-arg=ELASTICSEARCH_VERSION="$ELASTICSEARCH_VERSION" \
+    --build-arg=ELASTICSEARCH_PLUGIN_EXTRA_VERSION="$ELASTICSEARCH_PLUGIN_EXTRA_VERSION" \
     Docker/build/Elasticsearch/ -t "$1"
 
 docker save "$1" | gzip -"$GZIP_COMPRESSION_RATE"f > "$(pwd)"/artifacts/elasticsearch.docker.tar.gz
diff --git a/publish/docker-compose.yml b/publish/docker-compose.yml
index fb151768b..3f9d70a15 100644
--- a/publish/docker-compose.yml
+++ b/publish/docker-compose.yml
@@ -50,6 +50,7 @@ services:
       - RELEASE_VERSION
       - WMDE_RELEASE_VERSION
       - ELASTICSEARCH_VERSION
+      - ELASTICSEARCH_PLUGIN_EXTRA_VERSION
 
       - DOCKER_HUB_REPOSITORY_NAME
       - DOCKER_HUB_ACCESS_TOKEN
diff --git a/versions/wmde0.env b/versions/wmde0.env
index 711e99bac..a0cf85f87 100644
--- a/versions/wmde0.env
+++ b/versions/wmde0.env
@@ -16,6 +16,7 @@ RELEASE_MAJOR_VERSION=1.35
 RELEASE_VERSION=1.35.0
 
 ELASTICSEARCH_VERSION=6.5.4
+ELASTICSEARCH_PLUGIN_EXTRA_VERSION=6.5.4
 
 PHP_VERSION=7.3
 COMPOSER_IMAGE_NAME=docker-registry.wikimedia.org/releng/composer-php73
diff --git a/versions/wmde1.env b/versions/wmde1.env
index 7d3b3f1c0..643a6f6bc 100644
--- a/versions/wmde1.env
+++ b/versions/wmde1.env
@@ -19,6 +19,7 @@ RELEASE_MAJOR_VERSION=1.35
 RELEASE_VERSION=1.35.2
 
 ELASTICSEARCH_VERSION=6.5.4
+ELASTICSEARCH_PLUGIN_EXTRA_VERSION=6.5.4
 
 PHP_VERSION=7.3
 COMPOSER_IMAGE_NAME=docker-registry.wikimedia.org/releng/composer-php73
diff --git a/versions/wmde2.env b/versions/wmde2.env
index 24d3d96a6..1d1ee7325 100644
--- a/versions/wmde2.env
+++ b/versions/wmde2.env
@@ -16,6 +16,7 @@ RELEASE_MAJOR_VERSION=1.35
 RELEASE_VERSION=1.35.4
 
 ELASTICSEARCH_VERSION=6.5.4
+ELASTICSEARCH_PLUGIN_EXTRA_VERSION=6.5.4
 
 PHP_VERSION=7.4
 COMPOSER_IMAGE_NAME=docker-registry.wikimedia.org/releng/composer-php73
diff --git a/versions/wmde3.env b/versions/wmde3.env
index 9f3b30f93..f679aaf04 100644
--- a/versions/wmde3.env
+++ b/versions/wmde3.env
@@ -16,6 +16,7 @@ RELEASE_MAJOR_VERSION=1.35
 RELEASE_VERSION=1.35.5
 
 ELASTICSEARCH_VERSION=6.5.4
+ELASTICSEARCH_PLUGIN_EXTRA_VERSION=6.5.4
 
 PHP_VERSION=7.4
 COMPOSER_IMAGE_NAME=docker-registry.wikimedia.org/releng/composer-php73
diff --git a/versions/wmde4.env b/versions/wmde4.env
index 4769b5fb0..da40e3540 100644
--- a/versions/wmde4.env
+++ b/versions/wmde4.env
@@ -19,6 +19,7 @@ RELEASE_MAJOR_VERSION=1.36
 RELEASE_VERSION=1.36.3
 
 ELASTICSEARCH_VERSION=6.5.4
+ELASTICSEARCH_PLUGIN_EXTRA_VERSION=6.5.4
 
 PHP_VERSION=7.4
 COMPOSER_IMAGE_NAME=docker-registry.wikimedia.org/releng/composer-php74
diff --git a/versions/wmde5.env b/versions/wmde5.env
new file mode 100644
index 000000000..b49de4d30
--- /dev/null
+++ b/versions/wmde5.env
@@ -0,0 +1,26 @@
+WMDE_RELEASE_VERSION=wmde.5
+WIKIBASE_BRANCH_NAME=REL1_36
+MEDIAWIKI_BRANCH_NAME=REL1_36
+
+WDQS_VERSION=0.3.97
+WDQS_FRONTEND_COMMIT_HASH=3be93201ca2efad44f36430b8cf3a2c94cb22ebf
+QUICKSTATEMENTS_COMMIT_HASH=757d238cf6d306f9daf8276f620415cf09f4afe6
+MAGNUSTOOLS_COMMIT_HASH=7db2f401390df471d9650010ce059e4308d0cc9e
+WIKIBASELOCALMEDIA_COMMIT_HASH=813418de797ac63778770c0bc20994b62fc8d610
+WIKIBASEEDTF_COMMIT_HASH=38b94853d1ece0e2dd742aa5aa925d51916a0a28
+
+BUNDLE_EXT_EXTENSIONS=WikibaseLocalMedia,WikibaseEdtf
+BUNDLE_WMF_EXTENSIONS=Babel,cldr,CirrusSearch,ConfirmEdit,Elastica,EntitySchema,Nuke,OAuth,Scribunto,SyntaxHighlight_GeSHi,UniversalLanguageSelector,VisualEditor,WikibaseCirrusSearch,WikibaseManifest
+
+MEDIAWIKI_MAJOR_VERSION=1.36
+MEDIAWIKI_VERSION=1.36.3
+
+RELEASE_MAJOR_VERSION=1.36
+RELEASE_VERSION=1.36.3
+
+ELASTICSEARCH_VERSION=6.8.23
+ELASTICSEARCH_PLUGIN_EXTRA_VERSION=6.8.23-wmf1
+
+PHP_VERSION=7.4
+COMPOSER_IMAGE_NAME=docker-registry.wikimedia.org/releng/composer-php74
+COMPOSER_IMAGE_VERSION=latest
\ No newline at end of file