diff --git a/Dockerfile b/Dockerfile
index 7901afe..1f7f452 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,10 +8,8 @@ RUN yarn install --frozen-lockfile
 FROM node:14 as builder
 
 WORKDIR /app
-ARG BASE_URL
-ENV BASE_URL $BASE_URL
-ARG NEXT_PUBLIC_APP_URL
-ENV NEXT_PUBLIC_APP_URL $NEXT_PUBLIC_APP_URL
+ENV BASE_URL=APP_BASE_URL_VAR
+ENV NEXT_PUBLIC_APP_URL=APP_NEXT_PUBLIC_APP_URL_VAR
 
 COPY calendso .
 
@@ -30,7 +28,7 @@ COPY --from=builder /app/next-i18next.config.js ./
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/.next ./.next
 COPY --from=builder /app/package.json ./package.json
-COPY  scripts scripts
+COPY scripts scripts
 
 EXPOSE 3000
 CMD ["/app/scripts/start.sh"]
diff --git a/scripts/start.sh b/scripts/start.sh
index dc84684..37315f7 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -x
 
+# Set environment variables
+echo BASE_URL $BASE_URL
+echo NEXT_PUBLIC_APP_URL "$NEXT_PUBLIC_APP_URL"
+find \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_APP_URL_VAR#$NEXT_PUBLIC_APP_URL#g"
+find \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_BASE_URL_VAR#$BASE_URL#g"
+
 /app/scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
 npx prisma migrate deploy
 yarn start