diff --git a/Dockerfile b/Dockerfile
index 2fa48c2..a138425 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM azul/zulu-openjdk:11-jre-headless
 
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS
+ARG TARGETARCH
 
 ARG AEMC_VERSION=2.0.3
 ARG RUNMODE=author
@@ -9,7 +9,7 @@ ARG PORT=4502
 
 ENV RUNMODE=${RUNMODE}
 ENV PORT=${PORT}
-ENV AEM_VENDOR_JAVA_HOME_DIR=$JAVA_HOME
+ENV AEM_VENDOR_JAVA_HOME_DIR=${JAVA_HOME}
 
 EXPOSE ${PORT}
 
diff --git a/README.md b/README.md
index a9de016..549e6bb 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ mv ~/Downloads/aem-sdk-*.zip aem-sdk-artifacts/
 Afterward you can build the image, by default and author is built.
 
 ```shell
-docker build . -t aem-sdk:author
+docker buildx . -t aem-sdk:author
 ```
 
 And run the image
@@ -49,7 +49,7 @@ docker run -p 4502:4502 -p 5005:14502 aem-sdk:author
 To build the publish image, you need to specify the correct build arguments.
 
 ```shell
-docker build \
+docker buildx \
   --build-arg RUNMODE=publish \
   --build-arg PORT=4503 \
   . -t aem-sdk:publish