diff --git a/qa/suites/rgw/hadoop-s3a/hadoop/default.yaml b/qa/suites/rgw/hadoop-s3a/hadoop/default.yaml
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/qa/suites/rgw/hadoop-s3a/hadoop/default.yaml
@@ -0,0 +1 @@
+
diff --git a/qa/suites/rgw/hadoop-s3a/hadoop/trunk.yaml b/qa/suites/rgw/hadoop-s3a/hadoop/trunk.yaml
new file mode 100644
index 0000000000000..a6962c9f8623b
--- /dev/null
+++ b/qa/suites/rgw/hadoop-s3a/hadoop/trunk.yaml
@@ -0,0 +1,3 @@
+overrides:
+  s3a-hadoop:
+    hadoop-version: 'trunk'
diff --git a/qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml b/qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml
deleted file mode 100644
index 7fd0dcf942b31..0000000000000
--- a/qa/suites/rgw/hadoop-s3a/hadoop/v27.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  s3a-hadoop:
-    hadoop-version: '2.7.3'
diff --git a/qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml b/qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml
index 20a06baab3934..85ea85041a195 100644
--- a/qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml
+++ b/qa/suites/rgw/hadoop-s3a/hadoop/v28.yaml
@@ -1,3 +1,3 @@
 overrides:
   s3a-hadoop:
-    hadoop-version: '2.8.0'
+    hadoop-version: '2.8.5'
diff --git a/qa/suites/rgw/hadoop-s3a/hadoop/v32.yaml b/qa/suites/rgw/hadoop-s3a/hadoop/v32.yaml
new file mode 100644
index 0000000000000..d017b756b78f0
--- /dev/null
+++ b/qa/suites/rgw/hadoop-s3a/hadoop/v32.yaml
@@ -0,0 +1,3 @@
+overrides:
+  s3a-hadoop:
+    hadoop-version: '3.2.0'
diff --git a/qa/suites/rgw/hadoop-s3a/supported-distros/.qa b/qa/suites/rgw/hadoop-s3a/supported-distros/.qa
new file mode 120000
index 0000000000000..fea2489fdf6d9
--- /dev/null
+++ b/qa/suites/rgw/hadoop-s3a/supported-distros/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/hadoop-s3a/supported-distros/centos_latest.yaml b/qa/suites/rgw/hadoop-s3a/supported-distros/centos_latest.yaml
new file mode 120000
index 0000000000000..bd9854e702982
--- /dev/null
+++ b/qa/suites/rgw/hadoop-s3a/supported-distros/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/hadoop-s3a/supported-random-distro$ b/qa/suites/rgw/hadoop-s3a/supported-random-distro$
deleted file mode 120000
index 0862b4457b37a..0000000000000
--- a/qa/suites/rgw/hadoop-s3a/supported-random-distro$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file
diff --git a/qa/tasks/s3a_hadoop.py b/qa/tasks/s3a_hadoop.py
index 364c8bed99a17..691e12c85dff5 100644
--- a/qa/tasks/s3a_hadoop.py
+++ b/qa/tasks/s3a_hadoop.py
@@ -36,8 +36,8 @@ def task(ctx, config):
     rgw_node = rgws.remotes.keys()[0]
     # get versions
     maven_major = config.get('maven-major', 'maven-3')
-    maven_version = config.get('maven-version', '3.3.9')
-    hadoop_ver = config.get('hadoop-version', '2.7.3')
+    maven_version = config.get('maven-version', '3.6.0')
+    hadoop_ver = config.get('hadoop-version', '2.9.2')
     bucket_name = config.get('bucket-name', 's3atest')
     access_key = config.get('access-key', 'EGAQRD2ULOIFKFSKCT4F')
     dnsmasq_name = config.get('dnsmasq-name', 's3.ceph.com')
@@ -48,10 +48,13 @@ def task(ctx, config):
     # set versions for cloning the repo
     apache_maven = 'apache-maven-{maven_version}-bin.tar.gz'.format(
         maven_version=maven_version)
-    maven_link = 'http://apache.mirrors.lucidnetworks.net/maven/' + \
+    maven_link = 'http://www-us.apache.org/dist/maven/' + \
         '{maven_major}/{maven_version}/binaries/'.format(maven_major=maven_major, maven_version=maven_version) + apache_maven
     hadoop_git = 'https://github.com/apache/hadoop'
     hadoop_rel = 'hadoop-{ver} rel/release-{ver}'.format(ver=hadoop_ver)
+    if hadoop_ver == 'trunk':
+        # just checkout a new branch out of trunk
+        hadoop_rel = 'hadoop-ceph-trunk'
     install_prereq(rgw_node)
     rgw_node.run(
         args=[