diff --git a/Dockerfile b/Dockerfile
index ab53b40e..474edd65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ########################################
 # prod image
 #######################################
-FROM alpine:3.20.2 as prod
+FROM alpine:3.20.2 AS prod
 
 ARG GH_CLI_VER=2.44.1
 
@@ -36,7 +36,7 @@ ENTRYPOINT ["/bin/bash", "/bin/entrypoint.sh"]
 #######################################
 # image for dev build environment
 ######################################
-FROM prod as dev
+FROM prod AS dev
 
 # install packages
 RUN apk add --update --no-cache make zsh tmux vim tig
@@ -54,7 +54,7 @@ ENTRYPOINT ["/bin/zsh"]
 #######################################
 # image for creating the documentation
 ######################################
-FROM node:22.6.0-alpine as docs
+FROM node:22.6.0-alpine AS docs
 
 # install packages
 RUN apk add --update --no-cache bash make git zsh curl tmux
diff --git a/Makefile b/Makefile
index c2c6c052..6a91414c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,20 +19,20 @@ help:  ## help target to show available commands with information
 
 .PHONY: markdownlint
 markdownlint: ## Validate markdown files
-	docker-compose run docs markdownlint .
+	docker compose run docs markdownlint .
 
 .PHONY: zsh
 zsh: ## open dev container with build environment
-	docker-compose run --service-ports dev
+	docker compose run --service-ports dev
 
 .PHONY: prod
 prod: ## run the prod docker image with bash
-	docker-compose run prod
+	docker compose run prod
 
 .PHONY: prune
 prune: ## delete the whole environment
-	docker-compose down -v --rmi all --remove-orphans
+	docker compose down -v --rmi all --remove-orphans
 
 .Phony: shellcheck
 shellcheck:  ## run shellcheck
-	docker-compose run shellcheck -x src/*.sh
+	docker compose run shellcheck -x src/*.sh