diff --git a/.cargo/config.toml b/.cargo/config.toml
deleted file mode 100644
index 4fa072f4..00000000
--- a/.cargo/config.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))']
-rustflags = [
-    "-Ctarget-feature=+aes,+ssse3",
-]
-
-[target.'cfg(target_arch = "aarch64")']
-rustflags = [
-    "-Ctarget-feature=+aes,+crypto,+neon",
-]
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 0d2dfb17..a3663f56 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -46,6 +46,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       BUILD_EXTRA_FEATURES: "openssl-vendored local-redir"
+      RUSTFLAGS: "-Ctarget-feature=+aes,+ssse3"
     strategy:
       matrix:
         # os: [ubuntu-latest, macos-latest]
@@ -69,6 +70,8 @@ jobs:
 
   build-windows:
     runs-on: windows-latest
+    env:
+      RUSTFLAGS: "-Ctarget-feature=+aes,+ssse3"
     # env:
     #   OPENSSL_STATIC: "1"
     #   OPENSSL_DIR: "C:\\Program Files\\OpenSSL-Win64\\"
diff --git a/build/Dockerfile.aarch64-unknown-linux-gnu b/build/Dockerfile.aarch64-unknown-linux-gnu
index 3f768ba6..abeeab55 100644
--- a/build/Dockerfile.aarch64-unknown-linux-gnu
+++ b/build/Dockerfile.aarch64-unknown-linux-gnu
@@ -1,3 +1,3 @@
 FROM rustembedded/cross:aarch64-unknown-linux-gnu
 
-# ENV RUSTFLAGS="-Ctarget-feature=+aes,+neon"
+ENV RUSTFLAGS="-Ctarget-feature=+aes,+neon,+crypto"
diff --git a/build/Dockerfile.arm-unknown-linux-gnueabihf b/build/Dockerfile.arm-unknown-linux-gnueabihf
index 3f582f10..ceaf039d 100644
--- a/build/Dockerfile.arm-unknown-linux-gnueabihf
+++ b/build/Dockerfile.arm-unknown-linux-gnueabihf
@@ -1,3 +1,3 @@
 FROM rustembedded/cross:arm-unknown-linux-gnueabihf
 
-# ENV RUSTFLAGS="-Ctarget-feature=+aes"
+ENV RUSTFLAGS="-Ctarget-feature=+aes"
diff --git a/build/Dockerfile.x86_64-pc-windows-gnu b/build/Dockerfile.x86_64-pc-windows-gnu
index 8cbbfb68..502e7b08 100644
--- a/build/Dockerfile.x86_64-pc-windows-gnu
+++ b/build/Dockerfile.x86_64-pc-windows-gnu
@@ -19,7 +19,5 @@ RUN curl -LO https://download.libsodium.org/libsodium/releases/libsodium-$SODIUM
     V=1 make -j${nprocs} && make install && \
     cd .. && rm -rf libsodium-$SODIUM_VERS.tar.gz libsodium-$SODIUM_VERS
 
-# ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3" \
-#     SODIUM_LIB_DIR=/usr/x86_64-w64-mingw32/lib
-
-ENV SODIUM_LIB_DIR=/usr/x86_64-w64-mingw32/lib
+ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3" \
+    SODIUM_LIB_DIR=/usr/x86_64-w64-mingw32/lib
diff --git a/build/Dockerfile.x86_64-unknown-linux-gnu b/build/Dockerfile.x86_64-unknown-linux-gnu
index 1c9cf41a..a1bca71e 100644
--- a/build/Dockerfile.x86_64-unknown-linux-gnu
+++ b/build/Dockerfile.x86_64-unknown-linux-gnu
@@ -1,3 +1,3 @@
 FROM rustembedded/cross:x86_64-unknown-linux-gnu
 
-# ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"
+ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"
diff --git a/build/Dockerfile.x86_64-unknown-linux-musl b/build/Dockerfile.x86_64-unknown-linux-musl
index 8e9b48dc..e5f9768c 100644
--- a/build/Dockerfile.x86_64-unknown-linux-musl
+++ b/build/Dockerfile.x86_64-unknown-linux-musl
@@ -1,3 +1,3 @@
 FROM rustembedded/cross:x86_64-unknown-linux-musl
 
-# ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"
+ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"