diff --git a/Makefile b/Makefile
index 5268e98..3bb63a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,45 @@
+# Detect available container engine (docker or podman)
+CONTAINER_ENGINE := $(shell (command -v docker > /dev/null && echo docker) || (command -v podman > /dev/null && echo podman))
+COMPOSE_CMD := $(shell (command -v docker-compose > /dev/null && echo docker-compose) || (command -v podman-compose > /dev/null && echo podman-compose))
+
+# Error if no container engine is available
+ifeq ($(CONTAINER_ENGINE),)
+$(error No container engine found. Please install Docker or Podman)
+endif
+
 .PHONY: build up down restart logs
 
 build:
-	docker-compose build
+	$(COMPOSE_CMD) build
 
 watch:
-	docker-compose up
+	$(COMPOSE_CMD) up
 
 up:
-	docker-compose up
+	$(COMPOSE_CMD) up
 
 upd:
-	docker-compose up -d
+	$(COMPOSE_CMD) up -d
 
 dev-up:
-	docker-compose -f docker-compose.dev.yml up --build --force-recreate
+	$(COMPOSE_CMD) -f docker-compose.dev.yml up --build --force-recreate
 
 dev-upd:
-	docker-compose -f docker-compose.dev.yml up --build --force-recreate -d
+	$(COMPOSE_CMD) -f docker-compose.dev.yml up --build --force-recreate -d
 
 down:
-	docker-compose down
+	$(COMPOSE_CMD) down
 
 re: build watch
 
 logs:
-	docker-compose logs -f
+	$(COMPOSE_CMD) logs -f
 
 logs-playwright:
-	docker-compose logs -f playwright
+	$(COMPOSE_CMD) logs -f playwright
 
 logs-backend:
-	docker-compose logs -f backend
+	$(COMPOSE_CMD) logs -f backend
 
 logs-frontend:
-	docker-compose logs -f frontend
\ No newline at end of file
+	$(COMPOSE_CMD) logs -f frontend
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 0ccf7ea..1d153ad 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -36,7 +36,7 @@ services:
       context: ./frontend
       dockerfile: Dockerfile.dev
     ports:
-      - "80:3000"
+      - "8080:3000"
     hostname: frontend
     volumes:
       - ./frontend:/app
diff --git a/docker-compose.yml b/docker-compose.yml
index 3285fc4..4dc751a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,5 +30,5 @@ services:
       context: ./frontend
       dockerfile: Dockerfile
     ports:
-      - "80:3000"
+      - "8080:3000"
     hostname: frontend