diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 115a506..ddfa5f4 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -2,4 +2,9 @@ ARG BASE_IMAGE=php:8.1-cli-alpine
 FROM ${BASE_IMAGE}
 
 RUN php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer
-RUN apk add --no-cache python3
+RUN apk add --no-cache python3 git
+
+RUN addgroup -g 1000 appuser && \
+    adduser -D -u 1000 -G appuser -h /home/appuser appuser
+
+USER 1000:1000
diff --git a/Makefile b/Makefile
index 50e3a74..13fd0e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 .PHONY: run-php-8.1
 run-php-8.1:
-	docker compose run php-8.1 sh
+	docker compose run --remove-orphans php-8.1 sh
 
 .PHONY: run-php-8.2
 run-php-8.2:
-	docker compose run php-8.2 sh
+	docker compose run --remove-orphans php-8.2 sh
 
 .PHONY: run-php-8.3
 run-php-8.3:
-	docker compose run php-8.3 sh
+	docker compose run --remove-orphans php-8.3 sh
 
 .PHONY: run-php-8.4
 run-php-8.4:
-	docker compose run php-8.4 sh
+	docker compose run --remove-orphans php-8.4 sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 1975ad6..29202fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 # Start the dev container
 # $ docker-compose run php sh