diff --git a/Dockerfile b/Dockerfile
index 918165fb..b8eca167 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 LABEL maintainer="Luiz Filho <lfilho@gmail.com>"
 
-# Let the container know that there is no tty
-ENV DEBIAN_FRONTEND noninteractive
 ENV TERM xterm-256color
 
 # Bootstrapping packages needed for installation
@@ -23,8 +21,8 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8 && \
 # Install dependencies
 # `universe` is needed for ruby
 # `security` is needed for fontconfig and fc-cache
-RUN \
-  add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe security" && \
+# Let the container know that there is no tty
+RUN DEBIAN_FRONTEND=noninteractive \
   add-apt-repository ppa:aacebedo/fasd && \
   apt-get update && \
   apt-get -yqq install \