diff --git a/.drone.yml b/.drone.yml
index ba140e3015ff5b762b62bcc231a9fdc96d7595c2..aac2af4b858c60b1e6106bc087a47b07fa7889c9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,16 +3,16 @@ name: default
 
 steps:
 - name: Projects
-  image: abcminiuser/docker-avr8-toolchain
+  image: abcminiuser/docker-ci-avr8-toolchain
   commands:
   - make -j --quiet all
 
 - name: Bootloaders
-  image: abcminiuser/docker-avr8-toolchain
+  image: abcminiuser/docker-ci-avr8-toolchain
   commands:
   - make --quiet -C Maintenance bootloaders
 
 - name: Tests
-  image: abcminiuser/docker-avr8-toolchain
+  image: abcminiuser/docker-ci-avr8-toolchain
   commands:
   - make --quiet -C BuildTests all
diff --git a/LUFA/Build/DMBS/DMBS/gcc.mk b/LUFA/Build/DMBS/DMBS/gcc.mk
index 73065dcec43a8b169a4028599d4979433f524d81..79b95ab76689a8553dd6a30f6b262cacc51c807e 100644
--- a/LUFA/Build/DMBS/DMBS/gcc.mk
+++ b/LUFA/Build/DMBS/DMBS/gcc.mk
@@ -115,7 +115,7 @@ ifneq ($(findstring $(ARCH), AVR8 XMEGA),)
 else ifneq ($(findstring $(ARCH), UC3),)
    BASE_CC_FLAGS += -mpart=$(MCU:at32%=%) -masm-addr-pseudos
 endif
-BASE_CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections
+BASE_CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections -fdiagnostics-color
 BASE_CC_FLAGS += -I.
 BASE_CC_FLAGS += -DARCH=ARCH_$(ARCH)
 ifneq ($(F_CPU),)