diff --git a/build.sh b/build.sh
index 0d65517..aba28ea 100644
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,6 @@ SRCDIR=${SELF%/*}
 . "${SRCDIR}"/lib/common.sh
 
 target=aarch64-unknown-linux-gnu
-base=aimee-os.org/build/base
 while [ $# -gt 0 ]; do
     case "$1" in
     -t|--target)
@@ -24,9 +23,13 @@ while [ $# -gt 0 ]; do
     shift
 done
 
+if [ -z "${base-}" ]; then
+    base=aimee-os.org/build/cross-"${target}"
+fi
+
 set -e
 
 cid=$(buildah from "${base}")
 buildah_run_script "${cid}" "${SRCDIR}"/lib/sync.sh
-buildah_run_script "${cid}" "${SRCDIR}"/crossdev.sh "${target}"
-buildah commit --rm "${cid}" aimee-os.org/build/cross-"${target}"
+buildah_run_script "${cid}" "${SRCDIR}"/rust-cross.sh "${target}"
+buildah commit --rm "${cid}" aimee-os.org/build/rust-cross-"${target}"
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
index b321707..11bb8a2 100644
--- a/ci/Jenkinsfile
+++ b/ci/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
 
         stage('Build') {
             steps {
-                sh 'sh -e build.sh --base git.pyrocufflink.net/aimeeos/build/base'
+                sh 'sh -e build.sh --base git.pyrocufflink.net/aimeeos/build/cross-aarch64-unknown-linux-gnu'
             }
         }
 
@@ -41,7 +41,7 @@ pipeline {
                             git.pyrocufflink.net
                         """
                     }
-                    sh 'buildah push aimee-os.org/build/cross-aarch64-unknown-linux-gnu git.pyrocufflink.net/aimeeos/build/cross-aarch64-unknown-linux-gnu'
+                    sh 'buildah push aimee-os.org/build/rust-cross-aarch64-unknown-linux-gnu git.pyrocufflink.net/aimeeos/build/rust-cross-aarch64-unknown-linux-gnu'
                 }
             }
         }
diff --git a/crossdev.sh b/rust-cross.sh
similarity index 59%
rename from crossdev.sh
rename to rust-cross.sh
index 24f884e..c8e9843 100755
--- a/crossdev.sh
+++ b/rust-cross.sh
@@ -4,26 +4,6 @@ set -e
 
 target=$1
 
-USE=-nls \
-emerge -kvnj sys-devel/gettext
-
-mkdir -p /var/db/repos/crossdev/profiles /var/db/repos/crossdev/metadata
-echo crossdev > /var/db/repos/crossdev/profiles/repo_name
-echo 'masters = gentoo' > /var/db/repos/crossdev/metadata/layout.conf
-chown -R portage:portage /var/db/repos/crossdev
-mkdir -p /etc/portage/repos.conf
-cat > /etc/portage/repos.conf/crossdev.conf <<EOF
-[crossdev]
-location = /var/db/repos/crossdev
-priority = 10
-masters = gentoo
-auto-sync = no
-EOF
-
-emerge -kvnj --rebuilt-binaries=y sys-devel/crossdev
-
-crossdev --stable -t "$1"
-
 ln -s /var/db/repos/gentoo/sys-devel/rust-std /var/db/repos/crossdev/cross-${target}/
 
 case ${target%%-*} in