diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b1345b0..4cffdb6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,86 +56,86 @@ jobs:
             arch: i386
             compiler: gcc -m32
             cross_compile: i686-linux-gnu
-            variant: i386
             pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
+            variant: i386
 
           - container: "debian:stable"
             arch: i386
             compiler: gcc -m32
             cross_compile: i686-linux-gnu
-            variant: i386
             pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
+            variant: i386
 
           - container: "debian:bookworm"
             arch: i386
             compiler: gcc -m32
             cross_compile: i686-linux-gnu
-            variant: i386
             pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
+            variant: i386
 
           - container: "debian:buster"
             arch: i386
             compiler: gcc -m32
             cross_compile: i686-linux-gnu
-            variant: i386
             pkg_config_path: /usr/lib/i386-linux-gnu/pkgconfig
+            variant: i386
 
           # Debian cross compilation builds
           - container: "debian:testing"
             arch: armhf
             compiler: arm-linux-gnueabihf-gcc
             cross_compile: arm-linux-gnueabihf
-            variant: cross-compile
             pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig
+            variant: cross-compile
 
           - container: "debian:testing"
             arch: arm64
             compiler: aarch64-linux-gnu-gcc
             cross_compile: aarch64-linux-gnu
-            variant: cross-compile
             pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
+            variant: cross-compile
 
           - container: "debian:testing"
             arch: ppc64el
             compiler: powerpc64le-linux-gnu-gcc
             cross_compile: powerpc64le-linux-gnu
-            variant: cross-compile
             pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
+            variant: cross-compile
 
           - container: "debian:testing"
             arch: s390x
             compiler: s390x-linux-gnu-gcc
             cross_compile: s390x-linux-gnu
-            variant: cross-compile
             pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
+            variant: cross-compile
 
           - container: "debian:stable"
             arch: armhf
             compiler: arm-linux-gnueabihf-gcc
             cross_compile: arm-linux-gnueabihf
-            variant: cross-compile
             pkg_config_path: /usr/lib/arm-linux-gnueabihf/pkgconfig
+            variant: cross-compile
 
           - container: "debian:stable"
             arch: arm64
             compiler: aarch64-linux-gnu-gcc
             cross_compile: aarch64-linux-gnu
-            variant: cross-compile
             pkg_config_path: /usr/lib/aarch64-linux-gnu/pkgconfig
+            variant: cross-compile
 
           - container: "debian:stable"
             arch: ppc64el
             compiler: powerpc64le-linux-gnu-gcc
             cross_compile: powerpc64le-linux-gnu
-            variant: cross-compile
             pkg_config_path: /usr/lib/powerpc64le-linux-gnu/pkgconfig
+            variant: cross-compile
 
           - container: "debian:stable"
             arch: s390x
             compiler: s390x-linux-gnu-gcc
             cross_compile: s390x-linux-gnu
-            variant: cross-compile
             pkg_config_path: /usr/lib/s390x-linux-gnu/pkgconfig
+            variant: cross-compile
 
     container:
       image: ${{ matrix.container }}
@@ -144,8 +144,8 @@ jobs:
         CC: ${{ matrix.compiler }}
         CROSS_COMPILE: ${{ matrix.cross_compile }}
         MODE: ${{ matrix.mode }}
-        VARIANT: ${{ matrix.variant }}
         PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }}
+        VARIANT: ${{ matrix.variant }}
 
     steps:
     - name: Show OS
diff --git a/ci/ubuntu.i386.sh b/ci/ubuntu.i386.sh
deleted file mode 120000
index 813bdf9..0000000
--- a/ci/ubuntu.i386.sh
+++ /dev/null
@@ -1 +0,0 @@
-debian.i386.sh
\ No newline at end of file
diff --git a/ci/ubuntu.sanitizers.sh b/ci/ubuntu.sanitizers.sh
deleted file mode 120000
index 53cd941..0000000
--- a/ci/ubuntu.sanitizers.sh
+++ /dev/null
@@ -1 +0,0 @@
-debian.sanitizers.sh
\ No newline at end of file