diff --git a/template/python-armhf/Dockerfile b/template/python-armhf/Dockerfile
index eb1381f4..c54e9a5f 100644
--- a/template/python-armhf/Dockerfile
+++ b/template/python-armhf/Dockerfile
@@ -9,7 +9,7 @@ RUN apk --no-cache add curl ${ADDITIONAL_PACKAGE} \
     && apk del curl --no-cache
 
 # Add non root user
-RUN addgroup -S app && adduser -S -g app app
+RUN addgroup -S app && adduser app -S -G app
 RUN chown app /home/app
 
 USER app
diff --git a/template/python/Dockerfile b/template/python/Dockerfile
index 2f1503dd..52f5857b 100644
--- a/template/python/Dockerfile
+++ b/template/python/Dockerfile
@@ -9,7 +9,7 @@ RUN apk --no-cache add curl ${ADDITIONAL_PACKAGE} \
     && apk del curl --no-cache
 
 # Add non root user
-RUN addgroup -S app && adduser -S -g app app
+RUN addgroup -S app && adduser app -S -G app
 RUN chown app /home/app
 
 USER app
diff --git a/template/python3-armhf/Dockerfile b/template/python3-armhf/Dockerfile
index 968a1fce..4f9622cf 100644
--- a/template/python3-armhf/Dockerfile
+++ b/template/python3-armhf/Dockerfile
@@ -9,7 +9,7 @@ RUN apk --no-cache add curl ${ADDITIONAL_PACKAGE} \
     && apk del curl --no-cache
 
 # Add non root user
-RUN addgroup -S app && adduser -S -g app app
+RUN addgroup -S app && adduser app -S -G app
 RUN chown app /home/app
 
 USER app
diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile
index e69a3350..6dd0668a 100644
--- a/template/python3/Dockerfile
+++ b/template/python3/Dockerfile
@@ -11,7 +11,7 @@ RUN apk --no-cache add curl ${ADDITIONAL_PACKAGE} \
     && apk del curl --no-cache
 
 # Add non root user
-RUN addgroup -S app && adduser -S -g app app
+RUN addgroup -S app && adduser app -S -G app
 
 WORKDIR /home/app/