diff --git a/Makefile b/Makefile
index c735c4e32..9a6af1327 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
+SHELL=/bin/bash
 .PHONY: *
 
 list:
 	@LC_ALL=C $(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
 
+install: # Developer mode installation
+	bash ./docker.sh install-dev
+
 install-cloud-ide:
 	cp docker-compose.sample.yml docker-compose.yml
 	cp docker-compose.cloudide.yml docker-compose.override.yml
@@ -41,20 +45,20 @@ bash:
 	docker-compose exec --user=azuracast web bash
 
 frontend-bash:
-	docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
-	docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend
 
 frontend-build:
-	docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
-	docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend npm run build
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend npm run build
 
 generate-locales:
-	docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
-	docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend npm run generate-locales
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend npm run generate-locales
 	docker-compose exec --user=azuracast web azuracast_cli locale:generate
 
 import-locales:
-	docker-compose -p azuracast_frontend -f frontend/docker-compose.yml build
-	docker-compose -p azuracast_frontend --env-file=.env -f frontend/docker-compose.yml run -e NODE_ENV=development --rm frontend npm run import-locales
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
+	docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run -e NODE_ENV=development --rm frontend npm run import-locales
 	docker-compose exec --user=azuracast web azuracast_cli locale:import
 
diff --git a/docker-compose.frontend.yml b/docker-compose.frontend.yml
new file mode 100644
index 000000000..2d8c5c529
--- /dev/null
+++ b/docker-compose.frontend.yml
@@ -0,0 +1,14 @@
+services:
+  frontend:
+    container_name: azuracast_frontend
+    build:
+      context: ./frontend
+    user: "${AZURACAST_PUID:-1000}:${AZURACAST_PGID:-1000}"
+    volumes:
+      - ./frontend:/data/frontend
+      - ./resources/locale:/data/resources/locale
+      - ./web/static:/data/web/static
+      - frontend_node_modules:/data/frontend/node_modules
+
+volumes:
+  frontend_node_modules: { }
diff --git a/docker.sh b/docker.sh
index 208dd0bac..75f0da49b 100755
--- a/docker.sh
+++ b/docker.sh
@@ -490,13 +490,13 @@ install-dev() {
 
   chmod 777 ./frontend/ ./web/ ./vendor/ \
     ./web/static/ ./web/static/api/ \
-     ./web/static/dist/ ./web/static/img/
+    ./web/static/dist/ ./web/static/img/
 
   docker-compose build
   docker-compose run --rm web -- azuracast_install "$@"
 
-  docker-compose -f frontend/docker-compose.yml build
-  docker-compose -f frontend/docker-compose.yml run --rm frontend npm run dev-build
+  docker-compose -p azuracast_frontend -f docker-compose.frontend.yml build
+  docker-compose -p azuracast_frontend -f docker-compose.frontend.yml run --rm frontend npm run dev-build
 
   docker-compose up -d
   exit
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index fcc31b7b8..ef65b8fe9 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM library/node:16-alpine
+FROM library/node:18-alpine
 
 RUN apk update \
     && apk add bash python3 make curl g++ shadow git
diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml
deleted file mode 100644
index 8d4f5eca7..000000000
--- a/frontend/docker-compose.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-services :
-  frontend :
-    container_name : azuracast_frontend
-    build :
-      context : .
-    user : "${AZURACAST_PUID:-1000}:${AZURACAST_PGID:-1000}"
-    volumes:
-      - ${LOCAL_WORKSPACE_FOLDER:-.}/frontend:/data/frontend
-      - ${LOCAL_WORKSPACE_FOLDER:-.}/resources/locale:/data/resources/locale
-      - ${LOCAL_WORKSPACE_FOLDER:-.}/web/static:/data/web/static
-      - frontend_node_modules:/data/frontend/node_modules
-
-volumes :
-  frontend_node_modules : { }