diff --git a/Dockerfile b/Dockerfile
index 837a6d4ce..d0c078571 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # ZoneMinder
 
-FROM ubuntu:trusty
-MAINTAINER Kyle Johnson <kjohnson@gnulnx.net>
+FROM ubuntu:xenial
+MAINTAINER Markos Vakondios <mvakondios@gmail.com>
 
 # Resynchronize the package index files 
 RUN apt-get update && \
@@ -10,8 +10,8 @@ RUN apt-get update && \
 	libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
 	libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm cmake libjpeg-turbo8-dev \
 	libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev libav-tools mysql-client \
-	apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server \
-	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore7 vlc-data libcurl4-openssl-dev \
+	apache2 php php-mysql libapache2-mod-php php-cli openssh-server \
+	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore8 vlc-data libcurl4-openssl-dev \
 	libavformat-dev libswscale-dev libavutil-dev libavcodec-dev libavfilter-dev \
 	libavresample-dev libavdevice-dev libpostproc-dev libv4l-dev libtool libnetpbm10-dev \
 	libmime-lite-perl dh-autoreconf dpatch \
@@ -47,7 +47,7 @@ RUN mkdir /var/run/sshd
 
 # Adding apache virtual hosts file
 ADD utils/docker/apache-vhost /etc/apache2/sites-available/000-default.conf
-ADD utils/docker/phpdate.ini /etc/php5/apache2/conf.d/25-phpdate.ini
+ADD utils/docker/phpdate.ini /etc/php/7.0/apache2/conf.d/25-phpdate.ini
 
 # Set the root passwd
 RUN echo 'root:root' | chpasswd
diff --git a/utils/docker/setup.sh b/utils/docker/setup.sh
index fbd3592f0..5c8881936 100755
--- a/utils/docker/setup.sh
+++ b/utils/docker/setup.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
 # Start MySQL
-/usr/bin/mysqld_safe & 
+# For Xenial the following won't start mysqld
+#/usr/bin/mysqld_safe & 
+# Use this instead:
+service mysql start
 
 # Give MySQL time to wake up
 SECONDS_LEFT=120