diff --git a/installer/Dockerfile b/installer/Dockerfile
index e9f9f0787..7de075aef 100644
--- a/installer/Dockerfile
+++ b/installer/Dockerfile
@@ -39,7 +39,6 @@ ARG DOCKER_IMAGE_TAG=dev \
     GITHUB_COMMIT
 
 ENV MAXKB_VERSION="${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_COMMIT})" \
-    MAXKB_CONFIG_TYPE=ENV \
     MAXKB_DB_NAME=maxkb \
     MAXKB_DB_HOST=127.0.0.1 \
     MAXKB_DB_PORT=5432  \
@@ -55,10 +54,9 @@ ENV MAXKB_VERSION="${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_C
     MAXKB_LOCAL_MODEL_HOST=127.0.0.1 \
     MAXKB_LOCAL_MODEL_PORT=11636 \
     MAXKB_LOCAL_MODEL_PROTOCOL=http \
-    MAXKB_SANDBOX=1 \
     PATH=/opt/py3/bin:$PATH \
-    PIP_TARGET=/opt/maxkb/python-packages \
-    PYTHONUNBUFFERED=1
+    PIP_TARGET=/opt/maxkb/python-packages
+
 
 WORKDIR /opt/maxkb-app
 COPY --from=stage-build /opt/maxkb-app /opt/maxkb-app
diff --git a/installer/Dockerfile-base b/installer/Dockerfile-base
index 3f3ae1438..c0c1142e5 100644
--- a/installer/Dockerfile-base
+++ b/installer/Dockerfile-base
@@ -38,7 +38,10 @@ ENV PGDATA=/opt/maxkb/data/postgresql/pgdata \
     POSTGRES_MAX_CONNECTIONS=1000 \
     REDIS_PASSWORD=Password123@redis \
     LANG=en_US.UTF-8 \
+    PYTHONUNBUFFERED=1 \
+    MAXKB_CONFIG_TYPE=ENV \
     MAXKB_LOG_LEVEL=INFO \
+    MAXKB_SANDBOX=1 \
     MAXKB_SANDBOX_PYTHON_PACKAGE_PATHS="/opt/py3/lib/python3.11/site-packages,/opt/maxkb-app/sandbox/python-packages,/opt/maxkb/python-packages" \
     MAXKB_SANDBOX_PYTHON_BANNED_KEYWORDS="subprocess.,system(,exec(,pty.,eval(,compile(,shutil.,input(,__import__" \
     MAXKB_ADMIN_PATH=/admin