diff --git a/.env b/.env
new file mode 100644
index 0000000..10bda98
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+MISP_TAG=2.4.121
+PHP_VER=20180731
diff --git a/modules/Dockerfile b/modules/Dockerfile
index 9decf5c..75b13c0 100644
--- a/modules/Dockerfile
+++ b/modules/Dockerfile
@@ -1,6 +1,5 @@
 FROM python:3.7-slim-buster  as builder
 ENV DEBIAN_FRONTEND noninteractive
-ARG VERSION=2.4.120
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
                 git \
@@ -15,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Build MISP Modules
     WORKDIR /srv
-    RUN git clone --branch v${VERSION} --depth 1  https://github.com/MISP/misp-modules.git
+    RUN git clone --branch v${MISP_TAG} --depth 1  https://github.com/MISP/misp-modules.git
     RUN mkdir /wheel
     WORKDIR /srv/misp-modules
     RUN sed -i 's/-e //g' REQUIREMENTS
diff --git a/server/Dockerfile b/server/Dockerfile
index ba0d344..739989a 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,6 +1,3 @@
-ARG MISP_TAG=2.4.120
-ARG PHP_VER=20180731
-
 FROM composer as composer-build
     ARG MISP_TAG
     WORKDIR /tmp