diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 1efe839..24eb023 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -136,10 +136,8 @@ jobs:
     runs-on: linux-arm64
     env:
       AR_x86_64_unknown_linux_gnu: x86_64-linux-gnu-ar
-      CC_x86_64_unknown_linux_gnu: x86_64-linux-gnu-gcc
-      CFLAGS: -fPIC
-      CXX_x86_64_unknown_linux_gnu: x86_64-linux-gnu-g++
-      CXXFLAGS: -fPIC
+      CC_x86_64_unknown_linux_gnu: x86_64-linux-gnu-gcc -fPIC
+      CXX_x86_64_unknown_linux_gnu: x86_64-linux-gnu-g++ -fPIC
       CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER: x86_64-linux-gnu-gcc
       CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -C link-arg=--sysroot=/opt/ruds-x64-sysroot -C link-arg=-Wl,-rpath,$ORIGIN -L native=/opt/ruds-x64-sysroot/usr/lib/x86_64-linux-gnu -L native=/opt/ruds-x64-sysroot/lib/x86_64-linux-gnu
       PKG_CONFIG_ALLOW_CROSS: "1"
diff --git a/crates/bds-ui/tests/packaging_assets.rs b/crates/bds-ui/tests/packaging_assets.rs
index ffde105..c8ca9ce 100644
--- a/crates/bds-ui/tests/packaging_assets.rs
+++ b/crates/bds-ui/tests/packaging_assets.rs
@@ -148,8 +148,8 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() {
         "publish",
         "PKG_CONFIG_ALLOW_CROSS",
         "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER",
-        "CFLAGS: -fPIC",
-        "CXXFLAGS: -fPIC",
+        "CC_x86_64_unknown_linux_gnu: x86_64-linux-gnu-gcc -fPIC",
+        "CXX_x86_64_unknown_linux_gnu: x86_64-linux-gnu-g++ -fPIC",
     ] {
         assert!(
             workflow.contains(required),