diff --git a/Dockerfile b/Dockerfile
index 6b57fa3..3371f3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,13 @@ FROM debian:stable-slim
 
 #ARG ARCH=amd64
 ARG NRF_CONNECT_TAG=v2.3.0
+# Should be for selected NRF_CONNECT_TAG
+ARG ZEPHYR_NEEDED_TAG=0.15.2
 # For new versions - xz
 ARG ZEPHYR_ARCHIVE_EXTENSION=gz
-# Should be for selected NRF_CONNECT_TAG
-ENV ZEPHYR_TAG=0.15.2
+
+# For entrypoint file
+ENV ZEPHYR_TAG=$ZEPHYR_NEEDED_TAG
 
 RUN ARCH="$(dpkg --print-architecture)" && \
     case $ARCH in \
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d2a36b..7e79ce0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,5 +7,6 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        - NRF_CONNECT_TAG=v2.4.2
-        - ZEPHYR_TAG=0.16.1
+        - NRF_CONNECT_TAG=v2.3.0
+        - ZEPHYR_NEEDED_TAG=0.15.2
+        - ZEPHYR_ARCHIVE_EXTENSION=gz