diff --git a/.drone.yml b/.drone.yml
index 97ddb40..0137386 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,19 +8,8 @@ steps:
   - which make || apk add make
   - make fetch
 
-- name: build
+- name: build_upload_all
   image: openjdk:13-alpine
-  commands:
-  - which make || apk add make
-  - make build PLUGIN_ES=es66x ES_VERSION=6.8.0
-- name: build-7
-  image: openjdk:13-alpine
-  commands:
-  - which make || apk add make
-  - make build PLUGIN_ES=es70x ES_VERSION=7.1.1
-
-- name: upload
-  image: python:3.7-alpine
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: aws_access_key
@@ -28,22 +17,6 @@ steps:
       from_secret: aws_secret_key
   commands:
   - which make || apk add make
+  - which pip || apk add --update python py-pip python-dev
   - which aws || pip install awscli
-  - make upload
-  when:
-    event:
-    - tag
-- name: upload-7
-  image: python:3.7-alpine
-  environment:
-    AWS_ACCESS_KEY_ID:
-      from_secret: aws_access_key
-    AWS_SECRET_ACCESS_KEY:
-      from_secret: aws_secret_key
-  commands:
-  - which make || apk add make
-  - which aws || pip install awscli
-  - make upload PLUGIN_ES=es70x ES_VERSION=7.0.1
-  when:
-    event:
-    - tag
+  - ./build_upload_all.sh
diff --git a/Makefile b/Makefile
index 957fe5d..75bd3f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-PLUGIN_VERSION ?= 1.18.0
+PLUGIN_VERSION ?= 1.18.5
 PLUGIN_ES ?= es66x
-ES_VERSION ?= 6.8.0
+ES_VERSION ?= 6.8.3
 
 S3_BUCKETS ?= zero-downtime
 S3_PREFIX ?= logging/elasticsearch
@@ -25,7 +25,7 @@ fetch:
 
 build: $(PACKAGE_FILE)
 
-$(PACKAGE_FILE):
+$(PACKAGE_FILE): fetch
 	cd elasticsearch-readonlyrest-plugin && ./gradlew --no-daemon --exclude-task test --stacktrace $(PLUGIN_ES):ror '-PesVersion=$(ES_VERSION)'
 
 upload: $(PACKAGE_FILE)
diff --git a/build_upload_all.sh b/build_upload_all.sh
new file mode 100755
index 0000000..e2b465b
--- /dev/null
+++ b/build_upload_all.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+# Build all supported / currently used versions
+
+make build PLUGIN_ES=es63x ES_VERSION=6.4.3
+make build PLUGIN_ES=es66x ES_VERSION=6.8.3
+make build PLUGIN_ES=es73x ES_VERSION=7.3.1
+
+make upload PLUGIN_ES=es63x ES_VERSION=6.4.3
+make upload PLUGIN_ES=es66x ES_VERSION=6.8.3
+make upload PLUGIN_ES=es73x ES_VERSION=7.3.1