diff --git a/bigtop-deploy/juju/hadoop-processing/bundle.yaml b/bigtop-deploy/juju/hadoop-processing/bundle.yaml
index 7893d8c296..6c162f27c2 100644
--- a/bigtop-deploy/juju/hadoop-processing/bundle.yaml
+++ b/bigtop-deploy/juju/hadoop-processing/bundle.yaml
@@ -1,6 +1,6 @@
 services:
   namenode:
-    charm: "cs:xenial/hadoop-namenode-6"
+    charm: "cs:xenial/hadoop-namenode-8"
     num_units: 1
     annotations:
       gui-x: "500"
@@ -8,7 +8,7 @@ services:
     to:
       - "0"
   resourcemanager:
-    charm: "cs:xenial/hadoop-resourcemanager-6"
+    charm: "cs:xenial/hadoop-resourcemanager-8"
     num_units: 1
     annotations:
       gui-x: "500"
@@ -16,7 +16,7 @@ services:
     to:
       - "0"
   slave:
-    charm: "cs:xenial/hadoop-slave-6"
+    charm: "cs:xenial/hadoop-slave-8"
     num_units: 3
     annotations:
       gui-x: "0"
@@ -26,7 +26,7 @@ services:
       - "2"
       - "3"
   plugin:
-    charm: "cs:xenial/hadoop-plugin-6"
+    charm: "cs:xenial/hadoop-plugin-8"
     annotations:
       gui-x: "1000"
       gui-y: "400"
@@ -52,7 +52,7 @@ services:
       gui-x: "250"
       gui-y: "400"
   rsyslog:
-    charm: "cs:~bigdata-dev/xenial/rsyslog-6"
+    charm: "cs:~bigdata-dev/xenial/rsyslog-7"
     num_units: 1
     annotations:
       gui-x: "1000"
diff --git a/bigtop-deploy/juju/hadoop-spark/bundle.yaml b/bigtop-deploy/juju/hadoop-spark/bundle.yaml
index 67b9bb7493..2bb4e855a3 100644
--- a/bigtop-deploy/juju/hadoop-spark/bundle.yaml
+++ b/bigtop-deploy/juju/hadoop-spark/bundle.yaml
@@ -1,6 +1,6 @@
 services:
   namenode:
-    charm: "cs:xenial/hadoop-namenode-6"
+    charm: "cs:xenial/hadoop-namenode-8"
     num_units: 1
     annotations:
       gui-x: "500"
@@ -8,7 +8,7 @@ services:
     to:
       - "0"
   resourcemanager:
-    charm: "cs:xenial/hadoop-resourcemanager-6"
+    charm: "cs:xenial/hadoop-resourcemanager-8"
     num_units: 1
     annotations:
       gui-x: "500"
@@ -16,7 +16,7 @@ services:
     to:
       - "0"
   slave:
-    charm: "cs:xenial/hadoop-slave-6"
+    charm: "cs:xenial/hadoop-slave-8"
     num_units: 3
     annotations:
       gui-x: "0"
@@ -26,7 +26,7 @@ services:
       - "2"
       - "3"
   plugin:
-    charm: "cs:xenial/hadoop-plugin-6"
+    charm: "cs:xenial/hadoop-plugin-8"
     annotations:
       gui-x: "1000"
       gui-y: "400"
@@ -39,7 +39,7 @@ services:
     to:
       - "4"
   spark:
-    charm: "cs:xenial/spark-15"
+    charm: "cs:xenial/spark-17"
     num_units: 1
     options:
       spark_execution_mode: "yarn-client"
@@ -72,7 +72,7 @@ services:
       gui-x: "250"
       gui-y: "400"
   rsyslog:
-    charm: "cs:~bigdata-dev/xenial/rsyslog-6"
+    charm: "cs:~bigdata-dev/xenial/rsyslog-7"
     num_units: 1
     annotations:
       gui-x: "1000"
diff --git a/bigtop-deploy/juju/spark-processing/bundle.yaml b/bigtop-deploy/juju/spark-processing/bundle.yaml
index c309b45dee..6ccb639e7a 100644
--- a/bigtop-deploy/juju/spark-processing/bundle.yaml
+++ b/bigtop-deploy/juju/spark-processing/bundle.yaml
@@ -1,6 +1,6 @@
 services:
   spark:
-    charm: "cs:xenial/spark-15"
+    charm: "cs:xenial/spark-17"
     num_units: 2
     annotations:
       gui-x: "500"
@@ -32,7 +32,7 @@ services:
       gui-x: "250"
       gui-y: "400"
   rsyslog:
-    charm: "cs:~bigdata-dev/xenial/rsyslog-6"
+    charm: "cs:~bigdata-dev/xenial/rsyslog-7"
     num_units: 1
     annotations:
       gui-x: "1000"
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/metadata.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/metadata.yaml
index e5bbc3cf5f..9e4601e1c7 100644
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/metadata.yaml
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/metadata.yaml
@@ -1,5 +1,6 @@
 name: hadoop-slave
 summary: Combined slave node (DataNode + NodeManager) from Apache Bigtop.
+maintainer: Juju Big Data <bigdata@lists.ubuntu.com>
 description: >
   Hadoop is a software platform that lets one easily write and
   run applications that process vast amounts of data.