diff --git a/Dockerfile b/Dockerfile
index 5700fb9..0736a59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.hottis.de/dockerized/base-build-env:latest
+FROM registry.hottis.de/dockerized/base-build-env:1.3.0
 
 LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
 LABEL ImageName="registry.hottis.de/dockerized/build-env-arduino"
@@ -34,8 +34,8 @@ RUN \
   arduino-cli core update-index && \
   arduino-cli core install arduino:avr && \
   arduino-cli core install arduino:samd && \
-  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 
+  arduino-cli core install esp8266:esp8266 && \
+  arduino-cli core install esp32:esp32
   
 
 CMD ["/bin/bash"]
diff --git a/arduino-cli.yaml b/arduino-cli.yaml
index adda5ca..f4aa241 100644
--- a/arduino-cli.yaml
+++ b/arduino-cli.yaml
@@ -4,3 +4,5 @@ arduino_data: /home/arduino/.arduino15
 board_manager:
   additional_urls:
   - http://arduino.esp8266.com/stable/package_esp8266com_index.json
+  - https://dl.espressif.com/dl/package_esp32_index.json
+