diff --git a/.env.dist b/.env.dist
new file mode 100644
index 0000000..448bfba
--- /dev/null
+++ b/.env.dist
@@ -0,0 +1,3 @@
+HOSTNAME=Enterprise
+XAUTHORITY=~/.Xauthority
+BANKFILES=~/Investimentos
diff --git a/Dockerfile b/Dockerfile
index abe6d97..10304e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Run Warsaw in a container
 
 # Base docker image
-FROM debian:stretch-slim
+FROM debian:buster-slim
 LABEL maintainer "Fabio Rodrigues Ribeiro <farribeiro@gmail.com>"
 
 ENV USER=ff
@@ -18,27 +18,28 @@ RUN apt-get update && \
 		wget \
 		firefox-esr \
 		firefox-esr-l10n-pt-br \
-		libc6 \
+		# libc6 \
 		# libcurl4 \
-		libdbus-1-3 \
-		libgcc1 \
-		libgdk-pixbuf2.0-0 \
-		libglib2.0-0 \
-		libgtk2.0-0 \
+		# libdbus-1-3 \
+		# libgcc1 \
+		# libgdk-pixbuf2.0-0 \
+		# libglib2.0-0 \
+		# libgtk2.0-0 \
 		libnss3-tools \
-		libpango-1.0-0 \
-		libpython2.7-minimal \
-		libpython2.7-stdlib \
+		# libpango-1.0-0 \
+		# libpython2.7-minimal \
+		# libpython2.7-stdlib \
 		# libssl1.0.0 \
-		libstdc++6 \
-		libx11-6 \
-		libxi6 \
+		# libstdc++6 \
+		# libx11-6 \
+		# libxi6 \
 		openssl \
 		procps \
 		python-gpg \
 		python-openssl \
-		python2.7 \
-		sed \
+		# python2.7 \
+		python3 \
+		# sed \
 		sudo \
 		xauth \
 		zenity \
diff --git a/docker-compose.yml b/docker-compose.yml
index d8dd921..f9489b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,5 +21,5 @@ services:
       - /dev/shm:/dev/shm
       - /tmp/.X11-unix:/tmp/.X11-unix
       - ${XAUTHORITY}:/tmp/.docker.xauth:ro
-      - ~/BankFiles:/home/ff/Downloads
+      - ${BANKFILES}:/home/ff/Downloads
       - /etc/machine-id:/etc/machine-id:ro
diff --git a/startup.sh b/startup.sh
index d8563a5..d8cfbf6 100644
--- a/startup.sh
+++ b/startup.sh
@@ -19,9 +19,10 @@ then
   && sudo apt update \
   && sudo apt -y upgrade \
   && sudo apt -y install /src/GBPCEFwr64.deb
-else
-  sudo /etc/init.d/warsaw start
+#else
+  # sudo /etc/init.d/warsaw start
 fi
+sudo /etc/init.d/warsaw start
 
 /usr/local/bin/warsaw/core \
 && firefox -no-remote -private-window --class CaixaEconomica --name CaixaEconomica https://www.caixa.gov.br