diff --git a/Dockerfile b/Dockerfile
index 1b555d2..cc0de02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,18 @@
-FROM sameersbn/ubuntu:14.04.20170123
-MAINTAINER sameer@damagehead.com
+FROM ubuntu:18.04
+MAINTAINER Dimitrios Desyllas <pcmagas@disroot.org>
 
-ENV OPENFIRE_VERSION=3.10.3 \
-    OPENFIRE_USER=openfire \
-    OPENFIRE_DATA_DIR=/var/lib/openfire \
+ENV OPENFIRE_USER=openfire\
+    OPENFIRE_DATA_DIR=/var/lib/openfire\
     OPENFIRE_LOG_DIR=/var/log/openfire
 
+ARG OPENFIRE_VERSION=4.2.3
+
 RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-7-jre \
- && wget "http://download.igniterealtime.org/openfire/openfire_${OPENFIRE_VERSION}_all.deb" -O /tmp/openfire_${OPENFIRE_VERSION}_all.deb \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y curl openjdk-8-jre sudo \
+ && curl -L "https://github.com/igniterealtime/Openfire/releases/download/v${OPENFIRE_VERSION}/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 \
+ && DEBIAN_FRONTEND=noninteractive apt-get purge -y curl \
  && rm -rf openfire_${OPENFIRE_VERSION}_all.deb \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e64684c..3b4e6c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,20 @@
-Openfire:
-  image: sameersbn/openfire:3.10.3-19
-  ports:
-    - "9090:9090"
-    - "5222:5222"
-    - "7777:7777"
-  volumes:
-    - /srv/docker/openfire/openfire:/var/lib/openfire
+version: '3'
+services:
+  openfire:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: pcmagas/openfire:4.2.3-ubuntu
+    ports:
+      - "9090:9090"
+      - "9091:9091"
+      - "7777:7777"
+      - "7443:7443"
+      - "7070:7070"
+      - "5222:5222"
+      - "5223:5223"
+      - "5229:5229"
+      - "3478:3478"
+      - "3479:3479"
+    volumes:
+      - /volumes/openfire/openfire:/var/lib/openfire