diff --git a/.travis.yml b/.travis.yml
index 1b07feb8..297a7197 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ compiler:
   - gcc
 
 env:
-  - GOAL=stm32
+  - GOAL=stm32 TOOLCHAIN_SHORTVER=7-2017q4 TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major
   - GOAL=unix
   - GOAL=src
 
@@ -40,9 +40,9 @@ install:
     - pip3 install --user --no-deps git+https://github.com/trezor/python-trezor@master
 
 before_script:
-    - test "$GOAL" != "stm32" || wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
-    - test "$GOAL" != "stm32" || tar xfj gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
-    - test "$GOAL" != "stm32" || export PATH=$PWD/gcc-arm-none-eabi-6-2017-q2-update/bin:$PATH
+    - test "$GOAL" != "stm32" || wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/$TOOLCHAIN_SHORTVER/$TOOLCHAIN_LONGVER-linux.tar.bz2
+    - test "$GOAL" != "stm32" || tar xfj $TOOLCHAIN_LONGVER-linux.tar.bz2
+    - test "$GOAL" != "stm32" || export PATH=$PWD/$TOOLCHAIN_LONGVER/bin:$PATH
 
 script:
   - test "$GOAL" != "stm32" || make vendorheader
diff --git a/Dockerfile b/Dockerfile
index fe9282b5..18b21a3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update && apt-get install -y \
 
 # download and setup toolchain
 
-ENV TOOLCHAIN_SHORTVER=6-2017q2
-ENV TOOLCHAIN_LONGVER=gcc-arm-none-eabi-6-2017-q2-update
+ENV TOOLCHAIN_SHORTVER=7-2017q4
+ENV TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major
 RUN cd /opt && wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/$TOOLCHAIN_SHORTVER/$TOOLCHAIN_LONGVER-linux.tar.bz2 && tar xfj $TOOLCHAIN_LONGVER-linux.tar.bz2
 ENV PATH=/opt/$TOOLCHAIN_LONGVER/bin:$PATH