diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a996703
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.*~
+~*
+*~
diff --git a/Dockerfile b/Dockerfile
index 6d5bade..f55fa85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM registry.gitlab.com/wolutator/base-build-env:latest
 
-MAINTAINER Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
+LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
+LABEL ImageName="registry.gitlab.com/wolutator/build-env-arduino"
 
 ARG ArduinoPackage=arduino-cli-latest-linux64.tar.bz2
 ARG ArduinoUID="2252"
@@ -9,7 +10,8 @@ ENV USER arduino
 
 RUN \
   apt update && \
-  apt install -y wget && \
+  apt install -y vim.tiny && \
+  apt install -y python-cheetah && \
   rm -rf /var/lib/apt/lists/* && \
   cd /tmp && \
   wget https://downloads.arduino.cc/arduino-cli/${ArduinoPackage} && \
@@ -30,7 +32,8 @@ COPY arduino-cli.yaml /home/$USER/.arduino15/
 RUN \
   arduino-cli core update-index && \
   arduino-cli core install arduino:avr && \
-  arduino-cli core install esp8266:esp8266 
+  arduino-cli core install esp8266:esp8266@2.5.0 && \
+  sed -i 's/#if DEBUG/#ifdef DEBUG/' ~/.arduino15/packages/esp8266/hardware/esp8266/2.5.0/tools/sdk/libc/xtensa-lx106-elf/include/sys/reent.h 
   
 
 CMD ["/bin/bash"]