diff --git a/.ci/travis-ci b/.ci/travis-ci
index 678fb9a99c..923557554c 100755
--- a/.ci/travis-ci
+++ b/.ci/travis-ci
@@ -1,9 +1,24 @@
+# Copyright 2019 Shift Cryptosecurity AG
+# Copyright 2020 Shift Crypto AG
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #!/bin/bash
 
 set -e
 set -x
 
-CONTAINER=shiftcrypto/firmware_v2:15
+CONTAINER=shiftcrypto/firmware_v2:16
 
 if [ "$1" == "pull" ] ; then
 	docker pull "$CONTAINER"
diff --git a/Dockerfile b/Dockerfile
index 57c42e4dc3..ddc5e69fc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 # Copyright 2019 Shift Cryptosecurity AG
+# Copyright 2020 Shift Crypto AG
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -121,7 +122,7 @@ ENV GOPATH /opt/go
 ENV GOROOT /opt/go_dist/go
 ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
 RUN mkdir -p /opt/go_dist && \
-    curl https://dl.google.com/go/go1.11.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
+    curl https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz | tar -xz -C /opt/go_dist
 
 RUN go get -v -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
 
diff --git a/rust-toolchain b/rust-toolchain
index 8bd4ff0a8a..372cf402c7 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-04-06
+1.44.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 500fd95de3..de884ab6c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Copyright (c) 2015-2016 Lucas Betschart, Douglas J. Bakkum
 # Copyright 2019 Shift Cryptosecurity AG
+# Copyright 2020 Shift Crypto AG
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -448,9 +449,6 @@ foreach(type ${RUST_LIBS})
     # https://github.com/rust-lang/rust/issues/66740
     RUSTC_BOOTSTRAP=1
     ${CARGO} build --manifest-path ${LIBBITBOX02_RUST_SOURCE_DIR}/Cargo.toml --features target-${type} --target-dir ${RUST_BINARY_DIR} ${RUST_CARGO_FLAG} ${RUST_TARGET_ARCH_ARG}
-    # Rust packages stdlib functions which we must remove/weaken on the arm target
-    COMMAND
-    if test "x${RUST_TARGET_ARCH}" = "xthumbv7em-none-eabi" \; then ${CMAKE_OBJCOPY} -N memset -N memcpy -N memmove -W memcmp ${lib} \; fi
     COMMAND
     ${CMAKE_COMMAND} -E copy ${lib} ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/lib${type}_rust_c.a
     BYPRODUCTS