diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a00b867d2d4caaa861ba08161d9d96363c9894e6..ab6dc3fa12bc86473ad22dc56188b32c577913f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,12 @@
 image: docker:latest
 
+variables:
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: "/certs"
+
+services:
+  - docker:dind
+
 before_script:
   - docker info
 
diff --git a/Dockerfile b/Dockerfile
index 35b885001aa1427c2d272f2e85de477556865cb6..7a0a8e26ea920ab21df38b6c05c8f43262614bf0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,6 @@ RUN cd /tmp && \
     unzip t.zip && \
     cd build  && \
     tar zxvf libbbb-*-arm-none-eabi.tar.gz && \
-    TOOLCHAIN=$(ls -d /opt/gcc-arm-none-eabi-*) && \
     cp -lr /tmp/build/libbbb-*-arm-none-eabi/include/* ${TOOLCHAIN}/arm-none-eabi/include/ && \
     cp -lr /tmp/build/libbbb-*-arm-none-eabi/lib/* ${TOOLCHAIN}/arm-none-eabi/lib/