diff --git a/storm-nimbus/Dockerfile b/storm-nimbus/Dockerfile
index 5051bea..9249562 100644
--- a/storm-nimbus/Dockerfile
+++ b/storm-nimbus/Dockerfile
@@ -1,4 +1,4 @@
-FROM wurstmeister/storm:0.9.4
+FROM wurstmeister/storm:latest
 MAINTAINER Wurstmeister
 
 RUN /usr/bin/config-supervisord.sh nimbus 
diff --git a/storm-supervisor/Dockerfile b/storm-supervisor/Dockerfile
index eea1593..86946bd 100644
--- a/storm-supervisor/Dockerfile
+++ b/storm-supervisor/Dockerfile
@@ -1,4 +1,4 @@
-FROM wurstmeister/storm:0.9.4
+FROM wurstmeister/storm:latest
 MAINTAINER Wurstmeister
 
 EXPOSE 6700
diff --git a/storm-ui/Dockerfile b/storm-ui/Dockerfile
index 5a7eae1..c3df7d5 100644
--- a/storm-ui/Dockerfile
+++ b/storm-ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM wurstmeister/storm:0.9.4
+FROM wurstmeister/storm:latest
 MAINTAINER Wurstmeister
 RUN /usr/bin/config-supervisord.sh ui
 
diff --git a/storm/Dockerfile b/storm/Dockerfile
index 21b088d..9175bf4 100644
--- a/storm/Dockerfile
+++ b/storm/Dockerfile
@@ -1,6 +1,23 @@
 FROM wurstmeister/base
 
 MAINTAINER Wurstmeister 
+# Install Java.
+RUN \
+  apt-get update && \
+  apt-get install -y software-properties-common && \
+  echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
+  add-apt-repository -y ppa:webupd8team/java && \
+  apt-get update && \
+  apt-get install -y oracle-java8-installer && \
+  rm -rf /var/lib/apt/lists/* && \
+  rm -rf /var/cache/oracle-jdk8-installer
+
+
+# Define working directory.
+WORKDIR /data
+
+# Define commonly used JAVA_HOME variable
+ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 
 RUN wget -q -O - http://mirrors.sonic.net/apache/storm/apache-storm-0.9.4/apache-storm-0.9.4.tar.gz | tar -xzf - -C /opt