diff --git a/Dockerfile b/Dockerfile
index 4530cc4..cd512e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,17 @@
 FROM sameersbn/ubuntu:14.04.20160504
 MAINTAINER sameer@damagehead.com
 
-ENV OPENFIRE_VERSION=3.10.3 \
+ENV OPENFIRE_VERSION=4.0.2 \
     OPENFIRE_USER=openfire \
     OPENFIRE_DATA_DIR=/var/lib/openfire \
     OPENFIRE_LOG_DIR=/var/log/openfire
 
 RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-7-jre \
+ && apt-get install -y software-properties-common python-software-properties \
+ && add-apt-repository ppa:openjdk-r/ppa \
+ && apt-get update \
+ && apt-get install -y openjdk-8-jre openjdk-7-jre \
+ && update-java-alternatives --jre-headless -s java-1.8.0-openjdk-amd64 \
  && wget "http://download.igniterealtime.org/openfire/openfire_${OPENFIRE_VERSION}_all.deb" -O /tmp/openfire_${OPENFIRE_VERSION}_all.deb \
  && dpkg -i /tmp/openfire_${OPENFIRE_VERSION}_all.deb \
  && mv /var/lib/openfire/plugins/admin /usr/share/openfire/plugin-admin \
diff --git a/README.md b/README.md
index 6d912c8..21930eb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/openfire/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/openfire)
 
-# sameersbn/openfire:3.10.3-10
+# sameersbn/openfire:4.0.2-1
 
 - [Introduction](#introduction)
   - [Contributing](#contributing)
@@ -48,7 +48,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/openfire)
 
 ```bash
-docker pull sameersbn/openfire:3.10.3-10
+docker pull sameersbn/openfire:4.0.2-1
 ```
 
 Alternatively you can build the image yourself.
@@ -65,7 +65,7 @@ Start Openfire using:
 docker run --name openfire -d --restart=always \
   --publish 9090:9090 --publish 5222:5222 --publish 7777:7777 \
   --volume /srv/docker/openfire:/var/lib/openfire \
-  sameersbn/openfire:3.10.3-10
+  sameersbn/openfire:4.0.2-1
 ```
 
 *Alternatively, you can use the sample [docker-compose.yml](docker-compose.yml) file to start the container using [Docker Compose](https://docs.docker.com/compose/)*
@@ -102,7 +102,7 @@ To upgrade to newer releases:
   1. Download the updated Docker image:
 
   ```bash
-  docker pull sameersbn/openfire:3.10.3-10
+  docker pull sameersbn/openfire:4.0.2-1
   ```
 
   2. Stop the currently running image:
@@ -122,7 +122,7 @@ To upgrade to newer releases:
   ```bash
   docker run -name openfire -d \
     [OPTIONS] \
-    sameersbn/openfire:3.10.3-10
+    sameersbn/openfire:4.0.2-1
   ```
 
 ## Shell Access
diff --git a/VERSION b/VERSION
index 9720277..2e18714 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.10.3-10
+4.0.2-1
diff --git a/docker-compose.yml b/docker-compose.yml
index 234da61..9b8e4c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 Openfire:
-  image: sameersbn/openfire:3.10.3-10
+  image: sameersbn/openfire:4.0.2-1
   ports:
     - "9090:9090"
     - "5222:5222"