diff --git a/.drone.yml b/.drone.yml
index c45d3f7..2ecf75b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,12 +24,15 @@ steps:
     - pip install -U platformio
     # Build image
     - platformio run --environment d1_mini
-    # Upload image
-    - platformio run --target upload --environment d1_mini
-    # Build Filesystem Image
-#    - platformio run --target buildfs --environment d1_mini    
+    # Build file system image
+    - platformio run --target buildfs --environment d1_mini
+    # Upload image with espota-gateway
+    curl -s --request POST --url http://espota.ctdo.de:8180/ --header 'Content-Type: multipart/form-data' --form ip=$lastknownip --form firmware=@.pio/build/d1_mini/firmware.bin -N
+    # TODO: Upload file system image with espota-gateway, if the device is available again (or leave it to espota-gateway to retry often enough)
+    #- platformio run --target upload --environment d1_mini
     # (Build if necessary and) Upload Filesystem Image (here: OTA)
-    - platformio run --target uploadfs --environment d1_mini
+    # - platformio run --target uploadfs --environment d1_mini
+    
   environment:
     hostname:
       from_secret: hostname