diff --git a/Dockerfile b/Dockerfile
index 879d78f64..c313628d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,7 +55,7 @@ ENV PATH /root/nanopb/generator:$PATH
 
 # Build libopencm3
 WORKDIR /root
-RUN git clone -b docker-v8 https://github.com/keepkey/libopencm3.git libopencm3
+RUN git clone -b docker-v9 https://github.com/keepkey/libopencm3.git libopencm3
 WORKDIR /root/libopencm3
 RUN make
 
diff --git a/lib/board/timer.c b/lib/board/timer.c
index 29af2ce57..3d3042a30 100644
--- a/lib/board/timer.c
+++ b/lib/board/timer.c
@@ -247,7 +247,7 @@ void timer_init(void)
 
 #ifndef EMULATOR
     // Set up the timer.
-    timer_reset(TIM4);
+    rcc_periph_reset_pulse(RST_TIM4);
     timer_enable_irq(TIM4, TIM_DIER_UIE);
     timer_set_mode(TIM4, TIM_CR1_CKD_CK_INT, TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
 
diff --git a/scripts/build/docker/device/debug.sh b/scripts/build/docker/device/debug.sh
index c2fa6a7fc..d04af7c04 100755
--- a/scripts/build/docker/device/debug.sh
+++ b/scripts/build/docker/device/debug.sh
@@ -3,7 +3,7 @@
 KEEPKEY_FIRMWARE="$(dirname "$(dirname "$(dirname "$(dirname "$( cd "$(dirname "$0")" ; pwd -P )")")")")"
 cd $KEEPKEY_FIRMWARE
 
-IMAGETAG=kktech/firmware:v8
+IMAGETAG=kktech/firmware:v9
 
 docker image inspect $IMAGETAG > /dev/null || docker pull $IMAGETAG
 
diff --git a/scripts/build/docker/device/release.sh b/scripts/build/docker/device/release.sh
index 86e02d25d..fcf655611 100755
--- a/scripts/build/docker/device/release.sh
+++ b/scripts/build/docker/device/release.sh
@@ -3,7 +3,7 @@
 KEEPKEY_FIRMWARE="$(dirname "$(dirname "$(dirname "$(dirname "$( cd "$(dirname "$0")" ; pwd -P )")")")")"
 cd $KEEPKEY_FIRMWARE
 
-IMAGETAG=kktech/firmware:v8
+IMAGETAG=kktech/firmware:v9
 
 docker image inspect $IMAGETAG > /dev/null || docker pull $IMAGETAG
 
diff --git a/tools/blupdater/blupdater.ld b/tools/blupdater/blupdater.ld
index c69522a0c..b0f86b5bf 100644
--- a/tools/blupdater/blupdater.ld
+++ b/tools/blupdater/blupdater.ld
@@ -20,7 +20,8 @@ SECTIONS
         KEEP(*(.header));
     } >rom AT >rom
 }
-INCLUDE libopencm3_stm32f2.ld
+
+INCLUDE cortex-m-generic.ld
 
 SECTIONS
 {
diff --git a/tools/bootloader/bootloader.ld b/tools/bootloader/bootloader.ld
index 16d815303..d71691334 100644
--- a/tools/bootloader/bootloader.ld
+++ b/tools/bootloader/bootloader.ld
@@ -25,7 +25,7 @@ SECTIONS
     } >ram
 }
 
-INCLUDE libopencm3_stm32f2.ld
+INCLUDE cortex-m-generic.ld
 
 SECTIONS
 {
diff --git a/tools/bootstrap/bootstrap.ld b/tools/bootstrap/bootstrap.ld
index 88591ac84..8b0ba3dd1 100644
--- a/tools/bootstrap/bootstrap.ld
+++ b/tools/bootstrap/bootstrap.ld
@@ -7,9 +7,7 @@ MEMORY
     ram (rwx)    : ORIGIN = 0x20000000, LENGTH = 0x00020000
 }
 
-
-
-INCLUDE libopencm3_stm32f2.ld
+INCLUDE cortex-m-generic.ld
 
 _ram_start = ORIGIN(ram);
 _ram_end = ORIGIN(ram) + LENGTH(ram);
diff --git a/tools/display_test/display_test.ld b/tools/display_test/display_test.ld
index f21dd07e4..9645ed326 100644
--- a/tools/display_test/display_test.ld
+++ b/tools/display_test/display_test.ld
@@ -18,7 +18,7 @@ MEMORY
     comram (rwx) : ORIGIN = 0x2001F800, LENGTH = 0x800
 }
 
-INCLUDE libopencm3_stm32f2.ld
+INCLUDE cortex-m-generic.ld
 
 SECTIONS
 {
diff --git a/tools/firmware/keepkey.ld b/tools/firmware/keepkey.ld
index f16424339..964b43676 100644
--- a/tools/firmware/keepkey.ld
+++ b/tools/firmware/keepkey.ld
@@ -30,7 +30,7 @@ SECTIONS
     } >rom AT >rom
 }
 
-INCLUDE libopencm3_stm32f2.ld
+INCLUDE cortex-m-generic.ld
 
 SECTIONS
 {