diff --git a/Dockerfile b/Dockerfile
index 2b53dcc..008e838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,17 @@
-FROM        ubuntu:14.04
+FROM        ubuntu:16.04
 MAINTAINER  Love Nyberg "love.nyberg@lovemusic.se"
-ENV REFRESHED_AT 2015-04-03
+ENV REFRESHED_AT 2018-05-29
 
 # Update system
 RUN apt-get update && \
-	apt-get install -y wget curl dnsutils python-pip python-dev python-apt software-properties-common dmidecode
+	apt-get install -y wget curl dnsutils python-pip python-dev python-apt software-properties-common dmidecode virt-what
 
 # Setup salt ppa
-RUN echo deb http://ppa.launchpad.net/saltstack/salt/ubuntu `lsb_release -sc` main | tee /etc/apt/sources.list.d/saltstack.list && \
-	wget -q -O- "http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4759FA960E27C0A6" | apt-key add -
+RUN echo deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main | tee /etc/apt/sources.list.d/saltstack.list && \
+	wget -q -O- "https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub" | apt-key add -
 
 # Install salt master/minion/cloud/api
-ENV SALT_VERSION 2014.7.2+ds-1trusty2
+ENV SALT_VERSION 2018.3.0+ds-1
 RUN apt-get update && \
 	apt-get install -y salt-master=$SALT_VERSION salt-minion=$SALT_VERSION \
 	salt-cloud=$SALT_VERSION salt-api=$SALT_VERSION
diff --git a/start.sh b/start.sh
index f59f874..9f06400 100755
--- a/start.sh
+++ b/start.sh
@@ -12,7 +12,7 @@ echo $SALT_NAME > /etc/salt/minion_id
 # If salt master also start minion in background
 if [ $SALT_USE == "master" ]; then
   echo "INFO: Starting salt-minion and auto connect to salt-master"
-  sudo service salt-minion start
+  service salt-minion start
 fi
 
 # Set salt grains
@@ -23,4 +23,4 @@ fi
 
 # Start salt-$SALT_USE
 echo "INFO: Starting salt-$SALT_USE with log level $LOG_LEVEL with hostname $SALT_NAME"
-sudo /usr/bin/salt-$SALT_USE --log-level=$LOG_LEVEL $OPTIONS
+/usr/bin/salt-$SALT_USE --log-level=$LOG_LEVEL $OPTIONS