diff --git a/.env.example b/.env.example
index 982b7a1e..c5f8f302 100644
--- a/.env.example
+++ b/.env.example
@@ -3,8 +3,8 @@ TZ=UTC
 SECRET_KEY=change-me
 
 # URLs
-PUBLIC_APP_URL=https://localhost:3000
-PUBLIC_SERVER_URL=https://localhost:3100
+PUBLIC_APP_URL=http://localhost:3000
+PUBLIC_SERVER_URL=http://localhost:3100
 
 # Database
 POSTGRES_HOST=localhost
diff --git a/client/Dockerfile b/client/Dockerfile
index c4e156d9..9d1de4ba 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -46,4 +46,6 @@ RUN pnpm install -F client --frozen-lockfile --prod
 
 EXPOSE 3000
 
+ENV PORT 3000
+
 CMD [ "pnpm", "run", "start:client" ]
\ No newline at end of file
diff --git a/server/Dockerfile b/server/Dockerfile
index ebd600db..51fff336 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -42,4 +42,6 @@ RUN pnpm install -F server --frozen-lockfile --prod
 
 EXPOSE 3100
 
+ENV PORT 3100
+
 CMD [ "pnpm", "run", "start:server" ]
\ No newline at end of file
diff --git a/server/src/config/app.config.ts b/server/src/config/app.config.ts
index 7ddf4caf..d7f2bda4 100644
--- a/server/src/config/app.config.ts
+++ b/server/src/config/app.config.ts
@@ -4,7 +4,7 @@ export default registerAs('app', () => ({
   timezone: process.env.TZ,
   environment: process.env.NODE_ENV,
   secretKey: process.env.SECRET_KEY,
-  port: parseInt(process.env.SERVER_PORT, 10) || 3100,
+  port: parseInt(process.env.PORT, 10) || 3100,
   url: process.env.PUBLIC_APP_URL || 'http://localhost:3000',
   serverUrl: process.env.PUBLIC_SERVER_URL || 'http://localhost:3100',
 }));