diff --git a/Dockerfile b/Dockerfile
index d3a4c2dd75..0f4a406bae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,13 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
-ARG API_URI
+ARG NEXT_PUBLIC_API_URI
 ARG SENTRY_DSN
 ARG SENTRY_APM
 ARG DEMO_MODE
 ARG GTM_ID
-ENV API_URI ${API_URI:-http://localhost:8000/graphql/}
-RUN API_URI=${API_URI} npm run build:export
+ENV NEXT_PUBLIC_API_URI ${NEXT_PUBLIC_API_URI:-http://localhost:8000/graphql/}
+RUN NEXT_PUBLIC_API_URI=${NEXT_PUBLIC_API_URI} npm run build:export
 
 FROM nginx:stable
 WORKDIR /app
diff --git a/Dockerfile.dev b/Dockerfile.dev
index c02fc9acea..2b6eacd040 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -3,8 +3,8 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
-ARG API_URI
-ENV API_URI ${API_URI:-http://localhost:8000/graphql/}
+ARG NEXT_PUBLIC_API_URI
+ENV NEXT_PUBLIC_API_URI ${NEXT_PUBLIC_API_URI:-http://localhost:8000/graphql/}
 
 EXPOSE 3000
-CMD npm start -- --hostname 0.0.0.0
+CMD npm start