diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 449fdcd2d..4e4b40ff6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,48 +1,60 @@
 image: debian:stable
 
 before_script:
-  - dpkg --add-architecture i386
-  - dpkg --add-architecture arm64
-  - dpkg --add-architecture armhf
-  - dpkg --add-architecture riscv64
   - apt-get update -qq
-  - apt-get install -y
-      libc6-dev:amd64 gcc make
-      binfmt-support qemu-user-static
-      gcc-i686-linux-gnu libc6-dev-i386-cross libc6:i386
-      gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6:arm64
-      gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6:armhf
-      gcc-riscv64-linux-gnu libc6-dev-riscv64-cross libc6:riscv64
-  - update-binfmts --enable qemu-aarch64
-  - update-binfmts --enable qemu-arm
-  - update-binfmts --enable qemu-riscv64
+  - apt-get install -y make binfmt-support qemu-user-static
 
 x86-64:
   stage: test
   script:
+    - dpkg --add-architecture arm64
+    - apt-get update -qq
+    - apt-get install -y libc6-dev:amd64 gcc
     - make -C tests test-native
 
 i686:
   stage: test
   script:
+    - dpkg --add-architecture i386
+    - apt-get update -qq
+    - apt-get install -y gcc-i686-linux-gnu libc6-dev-i386-cross libc6:i386
     - make -C tests test-ia32 CC_IA32=i686-linux-gnu-gcc
 
 aarch64:
   stage: test
   script:
+    - dpkg --add-architecture arm64
+    - apt-get update -qq
+    - apt-get install -y gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6:arm64
     - make -C tests test-aarch64 CC_AARCH64=aarch64-linux-gnu-gcc
 
 armhf:
   stage: test
   script:
+    - dpkg --add-architecture armhf
+    - apt-get update -qq
+    - apt-get install -y gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6:armhf
     - make -C tests test-armv7 CC_ARMv7="arm-linux-gnueabihf-gcc -marm"
 
+
 armhf-thumb:
   stage: test
   script:
+    - dpkg --add-architecture armhf
+    - apt-get update -qq
+    - apt-get install -y gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6:armhf
     - make -C tests test-armv7 CC_ARMv7="arm-linux-gnueabihf-gcc -mthumb"
 
+
 riscv:
   stage: test
   script:
-    - make -C tests test-riscv CC_RISCV="riscv64-linux-gnu-gcc"
+    - dpkg --add-architecture riscv64
+    - apt-get update -qq
+    - apt-get install -y gcc-riscv64-linux-gnu
+    - echo /usr/local/lib/riscv64-linux-gnu   >>/etc/ld.so.conf.d/riscv64-linux-gnu.conf
+    - echo /lib/riscv64-linux-gnu             >>/etc/ld.so.conf.d/riscv64-linux-gnu.conf
+    - echo /usr/lib/riscv64-linux-gnu         >>/etc/ld.so.conf.d/riscv64-linux-gnu.conf
+    - echo /usr/riscv64-linux-gnu/lib         >>/etc/ld.so.conf.d/riscv64-linux-gnu.conf
+    - ln -s /usr/riscv64-linux-gnu/lib/ld-linux-riscv64-lp64d.so.1 /lib
+    - make -C tests test-riscv CC_RISCV="riscv64-linux-gnu-gcc -static"