diff --git a/packages/postgres-database/docker/Dockerfile b/packages/postgres-database/docker/Dockerfile
index 63f84d107623..09cb7f30c7bc 100644
--- a/packages/postgres-database/docker/Dockerfile
+++ b/packages/postgres-database/docker/Dockerfile
@@ -55,11 +55,5 @@ COPY entrypoint.bash /home/entrypoint.bash
 
 RUN chmod +x /home/entrypoint.bash
 
-ENV POSTGRES_USER=scu \
-  POSTGRES_PASSWORD=adminadmin \
-  POSTGRES_HOST=postgres \
-  POSTGRES_PORT=5432 \
-  POSTGRES_DB=simcoredb
-
 ENTRYPOINT [ "/bin/bash", "/home/entrypoint.bash" ]
 CMD [ "sc-pg", "upgrade" ]
diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile
index ef5e199bdd56..c468ad87cae5 100644
--- a/services/dask-sidecar/Dockerfile
+++ b/services/dask-sidecar/Dockerfile
@@ -5,7 +5,7 @@ ARG PYTHON_VERSION="3.11.9"
 ARG UV_VERSION="0.7"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
-FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-bookworm AS base
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log
diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile
index ca2cf6bbd501..1465e5664b20 100644
--- a/services/migration/Dockerfile
+++ b/services/migration/Dockerfile
@@ -84,14 +84,7 @@ FROM base AS production
 
 ENV PYTHONOPTIMIZE=TRUE
 
-# testing defaults
-ENV POSTGRES_USER=scu \
-  POSTGRES_PASSWORD=adminadmin \
-  POSTGRES_HOST=postgres \
-  POSTGRES_PORT=5432 \
-  POSTGRES_DB=simcoredb \
-  SC_DONE_MARK_FILE=migration.done
-
+ENV SC_DONE_MARK_FILE=migration.done
 
 WORKDIR /home/scu
 
diff --git a/services/static-webserver/client/tools/qooxdoo-kit/builder/Dockerfile b/services/static-webserver/client/tools/qooxdoo-kit/builder/Dockerfile
index 0cf8363fd236..079f6dda84b0 100644
--- a/services/static-webserver/client/tools/qooxdoo-kit/builder/Dockerfile
+++ b/services/static-webserver/client/tools/qooxdoo-kit/builder/Dockerfile
@@ -84,7 +84,7 @@ FROM server-base AS production
 COPY --from=build-client \
   --chown=${SC_USER_NAME}:${SC_USER_NAME} \
   /project/build-output "/static-content"
-ENV SC_BUILD_TARGET production
+ENV SC_BUILD_TARGET=production
 
 FROM server-base AS development
-ENV SC_BUILD_TARGET development
+ENV SC_BUILD_TARGET=development
diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile
index d7f0fdf554f9..fa76987a70b5 100644
--- a/services/storage/Dockerfile
+++ b/services/storage/Dockerfile
@@ -65,8 +65,8 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 ENV PATH="${VIRTUAL_ENV}/bin:$PATH"
 
 
-ENV SC_BUILD_TARGET base
-ENV SC_BOOT_MODE default
+ENV SC_BUILD_TARGET=base
+ENV SC_BOOT_MODE=default
 
 EXPOSE 8080
 # -------------------------- -------------------------------
@@ -81,7 +81,7 @@ EXPOSE 8080
 
 FROM base AS build
 
-ENV SC_BUILD_TARGET build
+ENV SC_BUILD_TARGET=build
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
   set -eux \
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
index 2c0d83ed0a01..fd6d8f93ad44 100644
--- a/services/web/Dockerfile
+++ b/services/web/Dockerfile
@@ -76,7 +76,7 @@ ENV PATH="${VIRTUAL_ENV}/bin:$PATH"
 
 
 # TODO: eliminate this variable!
-ENV IS_CONTAINER_CONTEXT Yes
+ENV IS_CONTAINER_CONTEXT=Yes
 
 
 EXPOSE 8080
@@ -93,7 +93,7 @@ EXPOSE 8080
 
 FROM base AS build
 
-ENV SC_BUILD_TARGET build
+ENV SC_BUILD_TARGET=build
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
   set -eux \
@@ -206,7 +206,7 @@ CMD ["services/web/server/docker/boot.sh"]
 #
 FROM build AS development
 
-ENV SC_BUILD_TARGET development
+ENV SC_BUILD_TARGET=development
 
 WORKDIR /devel