diff --git a/.travis.yml b/.travis.yml
index b694caf8..424aba9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,14 +59,16 @@ script:
   - platformio update
   - platformio platform update
 # Run the builds (Mega must be last so that the hex file isn't cleaned up)
-  - platformio run -e teensy35 -e teensy41 -e black_F407VE -e megaatmega2561 -e megaatmega2560
+  - platformio run -e teensy35 -e teensy36 -e teensy41 -e black_F407VE -e megaatmega2561 -e megaatmega2560
 # Uploading the firmware to speeduino.com (Only on master)
   - |
     if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
       # Upload ini and hex files to speeduino.com server
       curl -v https://speeduino.com:2078 || true
       curl -v --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pio/build/megaatmega2560/firmware.hex" "https://speeduino.com:2078/bin/master.hex"
-      curl -v --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pio/build/teensy35/firmware.hex" "https://speeduino.com:2078/teensy35/master.hex"
+      curl -v --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pio/build/teensy35/firmware.hex" "https://speeduino.com:2078/teensy35/master-teensy35.hex"
+      curl -v --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pio/build/teensy36/firmware.hex" "https://speeduino.com:2078/teensy36/master-teensy36.hex"
+      curl -v --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pio/build/teensy41/firmware.hex" "https://speeduino.com:2078/teensy41/master-teensy41.hex"
       curl --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./reference/speeduino.ini" "https://speeduino.com:2078/master.ini"
     fi
 # Run the remote unit tests (only on master)
diff --git a/platformio.ini b/platformio.ini
index edf03e71..dcebb707 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -33,12 +33,11 @@ board=teensy35
 framework=arduino
 lib_deps = EEPROM, FlexCAN, SD
 
-[env:DropBearT]
+[env:teensy36]
 platform=teensy
-board=teensy35
+board=teensy36
 framework=arduino
 lib_deps = EEPROM, FlexCAN, SD
-build_flags = -DUSE_MC33810 ;-DUSE_SPI_EEPROM=6
 
 [env:teensy41]
 platform=teensy