diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
index 200302c..8712f47 100644
--- a/.github/workflows/release-image.yml
+++ b/.github/workflows/release-image.yml
@@ -21,6 +21,8 @@ jobs:
       with:
         context: containers
         push: true
-        platforms: linux/amd64,linux/arm64
+        # cross-compiling arm64 is currently not working 
+        # platforms: linux/amd64,linux/arm64
+        platforms: linux/amd64
         tags: ghcr.io/rustic-rs/rustic_server:latest,ghcr.io/rustic-rs/rustic_server:${{ github.ref_name }}
         build-args: RUSTIC_SERVER_VERSION=${{ github.ref_name }}
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 0000000..8368761
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,21 @@
+[target.x86_64-pc-windows-gnu]
+# additional commands to run prior to building the package
+pre-build = [
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update && apt-get --assume-yes install nasm:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH",
+]
+
+[target.x86_64-pc-windows-gnu.env]
+passthrough = [
+  "AWS_LC_SYS_PREBUILT_NASM=1",
+]
+
+[target.x86_64-unknown-netbsd]
+pre-build = [
+  "cargo install --force --locked bindgen-cli",
+]
+
+[target.armv7-unknown-linux-gnueabihf]
+pre-build = [
+  "cargo install --force --locked bindgen-cli",
+]
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 2bf0d8e..3d9002f 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -10,7 +10,14 @@ ci = "github"
 # The installers to generate for each app
 installers = ["shell", "powershell", "msi"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+targets = [
+  "aarch64-apple-darwin",
+#   "aarch64-unknown-linux-musl",
+  "x86_64-apple-darwin",
+#   "x86_64-unknown-linux-gnu",
+  "x86_64-unknown-linux-musl",
+  "x86_64-pc-windows-msvc",
+]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program