diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c3bee035d..c14effd41f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,8 @@ variables:
   PIPENV_VENV_IN_PROJECT: "true"
   PIPENV_CACHE_DIR: ".cache/"
 
+  # No need for TLS because everything runs on the same machine
+  DOCKER_TLS_CERTDIR: ""
 stages:
   - environment
   - prebuild
diff --git a/ci/environment.yml b/ci/environment.yml
index 3f7ea2ac46..68650f978a 100644
--- a/ci/environment.yml
+++ b/ci/environment.yml
@@ -1,6 +1,6 @@
 environment:
   stage: environment
-  image: docker:18.09.6
+  image: docker
   variables:
     GIT_SUBMODULE_STRATEGY: none  # no need to fetch submodules
     CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-firmware/environment"