diff --git a/AlpineTest.Dockerfile b/AlpineTest.Dockerfile
index a326a6cb4..683a5ce30 100644
--- a/AlpineTest.Dockerfile
+++ b/AlpineTest.Dockerfile
@@ -28,7 +28,7 @@ RUN apk add --update --no-cache curl ca-certificates git libc6-compat && \
     apk del curl git && \
     rm -f /var/cache/apk/* ;
 
-RUN addgroup -g 1000 -S helmgroup && \
+RUN addgroup -S helmgroup && \
     adduser -u 1000 -S helmuser -G helmgroup
 
 USER helmuser
diff --git a/Dockerfile b/Dockerfile
index 35e353e5b..22b650a0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ ENV PLUGIN_URL="https://github.com/helm-unittest/helm-unittest/"
 ENV HELM_DATA_HOME=/usr/local/share/helm
 
 RUN apk add --update --no-cache curl ca-certificates git bash && \
-    curl -L ${HELM_BASE_URL}/${HELM_TAR_FILE} |tar xvz && \
+    curl -L ${HELM_BASE_URL}/${HELM_TAR_FILE} | tar xvz && \
     mv ${TARGETOS}-${TARGETARCH}/helm /usr/bin/helm && \
     chmod +x /usr/bin/helm && \
     helm plugin install ${PLUGIN_URL} --version ${PLUGIN_VERSION} && \
@@ -23,7 +23,7 @@ RUN apk add --update --no-cache curl ca-certificates git bash && \
     apk del curl git bash && \
     rm -f /var/cache/apk/*
 
-RUN addgroup -g 1000 -S helmgroup && \
+RUN addgroup -S helmgroup && \
     adduser -u 1000 -S helmuser -G helmgroup
 
 USER helmuser
diff --git a/Fedora.Dockerfile b/Fedora.Dockerfile
index b24da2b04..ed4eaec7c 100644
--- a/Fedora.Dockerfile
+++ b/Fedora.Dockerfile
@@ -28,7 +28,7 @@ RUN yum install -y git && \
     yum remove -y git && \
     rm -rf /var/cache/yum/* ;
 
-RUN groupadd -g 1000 -r helmgroup \
+RUN groupadd -r helmgroup \
     && useradd -u 1000 -r helmuser -g helmgroup
 
 USER helmuser
diff --git a/Makefile b/Makefile
index 3b758c574..41b0d588c 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ dependency: ## Dependency maintanance
 
 .PHONY: dockerimage
 dockerimage: ## Build docker image
-	docker buildx build --load --no-cache --platform linux/amd64 --build-arg HELM_VERSION=$(HELM_VERSION) -t $(DOCKER):$(VERSION) -f Fedora.Dockerfile .
+	docker build --no-cache --build-arg HELM_VERSION=$(HELM_VERSION) -t $(DOCKER):$(VERSION) -f AlpineTest.Dockerfile .
 
 .PHONY: test-docker
 test-docker: dockerimage ## Execute 'helm unittests' in container
diff --git a/docker-build.sh b/docker-build.sh
index 2a2b89d2e..c3a889c5a 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -11,7 +11,8 @@ set -ex
 build() {
 
   echo "Found new version, building the image ${image}:${tag}"
-  docker buildx build --load --no-cache --platform linux/amd64,linux/arm64 --build-arg HELM_VERSION=${helmVersion} --build-arg PLUGIN_VERSION=${pluginVersion} -t ${image}:${tag} .
+  docker build --no-cache --build-arg HELM_VERSION=${helmVersion} --build-arg PLUGIN_VERSION=${pluginVersion} -t ${image}:${tag} .
+#  docker buildx build --load --no-cache --platform linux/amd64,linux/arm64 --build-arg HELM_VERSION=${helmVersion} --build-arg PLUGIN_VERSION=${pluginVersion} -t ${image}:${tag} .
 
   # run test
   version=$(docker run -ti --entrypoint "helm" --rm ${image}:${tag} version --client)