diff --git a/Cross.toml b/Cross.toml
index b61873b..d16d10f 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,2 +1,2 @@
 [target.x86_64-unknown-linux-musl]
-image = "burntsushi/x86_64-unknown-linux-musl:v0.1.14"
+image = "burntsushi/cross:x86_64-unknown-linux-musl"
diff --git a/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/ci/docker/x86_64-unknown-linux-musl/Dockerfile
index 5e40f9e..0405c0c 100644
--- a/ci/docker/x86_64-unknown-linux-musl/Dockerfile
+++ b/ci/docker/x86_64-unknown-linux-musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM japaric/x86_64-unknown-linux-musl:v0.1.14
+FROM rustembedded/cross:x86_64-unknown-linux-musl
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
diff --git a/ci/utils.sh b/ci/utils.sh
index f3dc96d..f9c5933 100644
--- a/ci/utils.sh
+++ b/ci/utils.sh
@@ -99,7 +99,9 @@ is_osx() {
 
 builder() {
     if is_musl && is_x86_64; then
-        cargo install cross
+        # cargo install cross
+        # To work around https://github.com/rust-embedded/cross/issues/357
+        cargo install --git https://github.com/rust-embedded/cross --force
         echo "cross"
     else
         echo "cargo"