--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -1,19 +1,17 @@
 FROM ubuntu:20.04
 
+ARG RUST_TOOLCHAIN=
+ARG FEATURE=
+
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
+ENV FEATURE=$FEATURE
+ENV CARGO_HOME="/cargo-home"
+ENV PATH="/cargo-home/bin:$PATH"
 
 RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake
-
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
-ARG RUST_TOOLCHAIN=
-ARG FEATURE=
-
-ENV FEATURE=$FEATURE
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
--- a/.docker/docker-compose.tmp-dev.j2
+++ b/.docker/docker-compose.tmp-dev.j2
@@ -8,6 +8,8 @@
         - "FEATURE={{ FEATURE }}"
       context: ../
       dockerfile: .docker/Dockerfile-chain-dev
+    environment:
+      - FEATURE={{ FEATURE }}
     expose:
       - 9944
       - 9933