diff --git a/.gitlab-ci-template.yml b/.gitlab-ci-template.yml
index d2fc6c4..a645d9e 100644
--- a/.gitlab-ci-template.yml
+++ b/.gitlab-ci-template.yml
@@ -26,8 +26,7 @@
       if [ -n "$BUILD_FOLDER" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg BUILD_FOLDER=$BUILD_FOLDER"; fi
       if [ -n "$IMAGE_NAME" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg IMAGE_NAME=$IMAGE_NAME"; fi
       if [ -n "$MAIN_CLASS" ]; then BUILD_ARGS="$BUILD_ARGS --build-arg MAIN_CLASS=$MAIN_CLASS"; fi
-      if [ -n "$BUILD_ARGS" ]; then BUILD_ARGS="$BUILD_ARGS $BUILD_ARGS"; fi
-      
+
       docker build $BUILD_ARGS -t $DOCKER_IMAGE:$TAG -f $DOCKERFILE_PATH .
       
       if [[ "$TAG" == "dev" || "$TAG" == "production" || "$TAG" == "pipeline" ]]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index 2d10d97..902fcef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,10 +20,6 @@ services:
   frontend:
     image: registry.boomlab.party/rheinsw/rheinsw-mono-repo/frontend
     container_name: frontend
-    volumes:
-      - ./frontend.env:/app/.env  # Mount it as .env at runtime
-#    env_file:
-#      - ./frontend.env
     ports:
       - "5100:3000"
     restart: on-failure
diff --git a/frontend/.gitlab-ci.yml b/frontend/.gitlab-ci.yml
index 99b6ccb..ff7825d 100644
--- a/frontend/.gitlab-ci.yml
+++ b/frontend/.gitlab-ci.yml
@@ -19,6 +19,5 @@ docker_frontend:
     IMAGE_NAME: frontend
     WORKDIR_PATH: frontend
     DOCKERFILE_PATH: Dockerfile
-    BUILD_ARGS: "--build-arg HCAPTCHA_SITE_KEY=$HCAPTCHA_SITE_KEY"
   needs:
     - build_frontend
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 7982ced..f89869b 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -13,13 +13,6 @@ RUN npm ci
 # Copy entire project
 COPY . .
 
-## Set it as an environment variable for the build process
-#ARG HCAPTCHA_SITE_KEY
-#ENV NEXT_PUBLIC_HCAPTCHA_SITE_KEY=$HCAPTCHA_SITE_KEY
-#
-## Create a .env file before build
-#RUN echo "NEXT_PUBLIC_HCAPTCHA_SITE_KEY=$HCAPTCHA_SITE_KEY"
-
 # Build the Next.js app
 RUN npm run build
 
@@ -35,4 +28,4 @@ COPY --from=builder /app ./
 EXPOSE 3000
 
 # Start Next.js in production mode
-CMD ["/bin/sh", "-c", "set -a && [ -f .env ] && . .env && set +a && next start"]
+CMD ["npm", "run", "start"]