diff --git a/.env b/.env
index 1943a9c..1390a1f 100644
--- a/.env
+++ b/.env
@@ -23,7 +23,7 @@ MINIO_ROOT_PASSWORD=CHANGEME
 MINIO_BUCKET=aviation
 MINIO_PROTOCOL=http
 MINIO_PORT=9000
-MINIO_PORT_INTERNAL=9001
+MINIO_INTERNAL_PORT=9001
 MINIO_BROWSER_REDIRECT_URL=${NGINX_PROTOCOL}://${NGINX_HOST}:${NGINX_HTTP_PORT}/minio/
 
 UI_PORT=3000
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c1a3fc..89976bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,7 +78,7 @@ services:
       - minio:/data
     ports:
       - "${MINIO_PORT:-9000}:9000"
-      - "${MINIO_PORT_INTERNAL:-9001}:9001"
+      - "${MINIO_INTERNAL_PORT:-9001}:9001"
     networks:
       - backend
     profiles:
diff --git a/nginx/templates/nossl.conf.template b/nginx/templates/nossl.conf.template
index 7f55269..c45b682 100644
--- a/nginx/templates/nossl.conf.template
+++ b/nginx/templates/nossl.conf.template
@@ -5,7 +5,7 @@ server {
     server_name  ${NGINX_HOST};
 
     location /api/ {
-        proxy_pass         http://${NGINX_INTERNAL_HOST}:5000/api/;
+        proxy_pass         http://${NGINX_INTERNAL_HOST}:${API_PORT}/api/;
         proxy_set_header   Host $host;
         proxy_set_header   X-Real-IP $remote_addr;
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -13,7 +13,7 @@ server {
     }
 
     location /minio/ {
-        proxy_pass         http://${NGINX_INTERNAL_HOST}:9001/;
+        proxy_pass         http://${NGINX_INTERNAL_HOST}:${MINIO_INTERNAL_PORT}/;
         proxy_set_header   Host $host;
         proxy_set_header   X-Real-IP $remote_addr;
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -22,7 +22,7 @@ server {
 
     # Reverse proxy for the UI and default catch-all
     location / {
-        proxy_pass         http://${NGINX_INTERNAL_HOST}:3000/;
+        proxy_pass         http://${NGINX_INTERNAL_HOST}:${UI_PORT}/;
         proxy_set_header   Host $host;
         proxy_set_header   X-Real-IP $remote_addr;
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/nginx/templates/ssl.conf.template b/nginx/templates/ssl.conf.template
index 635d0e7..2daae9c 100644
--- a/nginx/templates/ssl.conf.template
+++ b/nginx/templates/ssl.conf.template
@@ -25,7 +25,7 @@ server {
     # ssl_prefer_server_ciphers on;
 
     location /api/ {
-        proxy_pass         http://${NGINX_INTERNAL_HOST}:5000/api/;
+        proxy_pass         http://${NGINX_INTERNAL_HOST}:${API_PORT}/api/;
         proxy_set_header   Host $host;
         proxy_set_header   X-Real-IP $remote_addr;
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -33,7 +33,7 @@ server {
     }
 
     location /minio/ {
-        proxy_pass         http://${NGINX_INTERNAL_HOST}:9001/;
+        proxy_pass         http://${NGINX_INTERNAL_HOST}:${MINIO_INTERNAL_PORT}/;
         proxy_set_header   Host $host;
         proxy_set_header   X-Real-IP $remote_addr;
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -42,7 +42,7 @@ server {
 
     # Reverse proxy for the UI and default catch-all
     location / {
-        proxy_pass         http://${NGINX_INTERNAL_HOST}:3000/;
+        proxy_pass         http://${NGINX_INTERNAL_HOST}:${UI_PORT}/;
         proxy_set_header   Host $host;
         proxy_set_header   X-Real-IP $remote_addr;
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;