diff --git a/Dockerfile b/Dockerfile
index 8e208bc..509e306 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM ubuntu:14.04
-MAINTAINER Bibin Wilson <bibinwilsonn@gmail.com>
+FROM maven:3.3.9-jdk-8
+MAINTAINER Guiomar Tunon <gtunon@naevatec.com>
 
 # Make sure the package repository is up to date.
 RUN apt-get update
@@ -10,13 +10,10 @@ RUN apt-get install -y openssh-server
 RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
 RUN mkdir -p /var/run/sshd
 
-# Install JDK 7 (latest edition)
-RUN apt-get install -y openjdk-7-jdk
-
 # Add user jenkins to the image
 RUN adduser --quiet jenkins
 # Set password for the jenkins user (you may want to alter this).
-RUN echo "jenkins:jenkins" | chpasswd
+RUN echo "jenkins:2uS61XUq" | chpasswd
 
 RUN mkdir /home/jenkins/.m2
 
@@ -24,7 +21,6 @@ ADD settings.xml /home/jenkins/.m2/
 
 RUN chown -R jenkins:jenkins /home/jenkins/.m2/ 
 
-RUN apt-get install -y maven
 # Standard SSH port
 EXPOSE 22