diff --git a/backend/run_in_docker.sh b/backend/run_in_docker.sh
index 514027c696dd5bcfd8a97496f479a28e721de3af..e4e181d8c8b3e7b0b6855abe2b629f7198ccd466 100755
--- a/backend/run_in_docker.sh
+++ b/backend/run_in_docker.sh
@@ -9,7 +9,7 @@ sudo docker run \
 	-w /app \
 	-p 8080:8080 \
 	-u $(id -u):$(id -g) \
-	--name szofttech_webapp_backend \
+	--name szofttech-webapp-backend \
 	--network szofttech_webapp_network \
 	eclipse-temurin:21-jdk \
 	./mvnw spring-boot:run
diff --git a/frontend/run_in_docker.sh b/frontend/run_in_docker.sh
index fa89c97f2e3e4a5802567aff1afbb97ff63b4c5a..ed2858504faa332903a600634298a44c856701e3 100755
--- a/frontend/run_in_docker.sh
+++ b/frontend/run_in_docker.sh
@@ -9,7 +9,7 @@ sudo docker run \
 	-u $(id -u):$(id -g) \
 	-p 3000:3000 \
 	-w /app \
-	--name szofttech_webapp_frontend \
+	--name szofttech-webapp-frontend \
 	--network szofttech_webapp_network \
 	node:latest \
 	./start.sh
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 28bd238e95c5200dcfe6e3c5a8830b52bdfc2eaa..382b53fb84ca9edfc6a28cad3a9f539b9c723122 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -18,14 +18,14 @@ http {
         # backend
 		location /api {
 			# rewrite /api/(.*) /$1  break;
-			proxy_pass http://szofttech_webapp_backend:8080;
+			proxy_pass http://szofttech-webapp-backend:8080;
 		}
 
 		# otherwise fallback to frontend
 		location / {
 			client_max_body_size 100M;
             # rewrite ^/static/(.*)$ /$1 break;
-			proxy_pass http://szofttech_webapp_frontend:3000;
+			proxy_pass http://szofttech-webapp-frontend:3000;
 			proxy_set_header Host			$host;
 			proxy_set_header X-Real-IP $remote_addr;
 			proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/nginx/run_in_docker.sh b/nginx/run_in_docker.sh
index 16d3bfb9187a050460d84c172cdca24214ec79cb..473479d20a48f4dea396a76d97772dcc37294cff 100755
--- a/nginx/run_in_docker.sh
+++ b/nginx/run_in_docker.sh
@@ -4,6 +4,6 @@ sudo docker run \
 	--rm \
 	-v "$(pwd)/nginx/nginx.conf":/etc/nginx/nginx.conf \
 	-p 80:80 \
-	--name szofttech_webapp_nginx \
+	--name szofttech-webapp-nginx \
 	--network szofttech_webapp_network \
 	nginx:latest