diff --git a/build-docker.sh b/build-docker.sh
index 5c8d66fc3..f2a194037 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-IMAGE=trezor-firmware-build.nixos
+CONTAINER_NAME=trezor-firmware-build.nix
 
 TAG=${1:-master}
 REPOSITORY=${2:-local}
@@ -15,7 +15,7 @@ else
 fi
 
 wget -nc -P ci/ http://dl-cdn.alpinelinux.org/alpine/v3.12/releases/x86_64/alpine-minirootfs-3.12.0-x86_64.tar.gz
-docker build -t "$IMAGE" ci/
+docker build -t "$CONTAINER_NAME" ci/
 
 USER=$(ls -lnd . | awk '{ print $3 }')
 GROUP=$(ls -lnd . | awk '{ print $4 }')
@@ -35,7 +35,7 @@ for BITCOIN_ONLY in 0 1; do
     -v $(pwd)/build/core"${DIRSUFFIX}":/build:z \
     --env BITCOIN_ONLY="$BITCOIN_ONLY" \
     --env PRODUCTION="$PRODUCTION" \
-    "$IMAGE" \
+    "$CONTAINER_NAME" \
     /nix/var/nix/profiles/default/bin/nix-shell --run "\
       cd /tmp && \
       git clone $REPOSITORY trezor-firmware && \
@@ -61,7 +61,7 @@ for BITCOIN_ONLY in 0 1; do
     -v $(pwd)/build/legacy"${DIRSUFFIX}":/build:z \
     --env BITCOIN_ONLY="$BITCOIN_ONLY" \
     --env MEMORY_PROTECT="$MEMORY_PROTECT" \
-    "$IMAGE" \
+    "$CONTAINER_NAME" \
     /nix/var/nix/profiles/default/bin/nix-shell --run "\
       cd /tmp && \
       git clone $REPOSITORY trezor-firmware && \
diff --git a/ci/environment.yml b/ci/environment.yml
index 78797bb0d..2c79fd574 100644
--- a/ci/environment.yml
+++ b/ci/environment.yml
@@ -4,7 +4,7 @@ environment:
   when: manual
   variables:
     GIT_SUBMODULE_STRATEGY: none  # no need to fetch submodules
-    CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-firmware/environment"
+    CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-firmware/trezor-firmware-build.nix"
   services:
     - docker:dind
   before_script: