diff --git a/build/build.sh b/build/build.sh
index d70afadf..f0777532 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -6,4 +6,4 @@ ksversion=$1
 
 docker buildx create --name mybuilder --use
 docker buildx inspect --bootstrap
-docker buildx build --platform linux/amd64,linux/arm64 -t katalon-katalon -f src/Dockerfile --build-arg KATALON_STUDIO_VERSION=$ksversion .
\ No newline at end of file
+docker buildx build  --output type=docker --platform linux/amd64,linux/arm64 -t katalon-katalon -f src/Dockerfile --build-arg KATALON_STUDIO_VERSION=$ksversion .
\ No newline at end of file
diff --git a/src/Dockerfile b/src/Dockerfile
index 951cb914..b62b71fa 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -1,6 +1,8 @@
 FROM katalonstudio/ubuntu-20.04:490e137
 
 # common environment variables
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
 ARG KATALON_ROOT_DIR=/katalon
 ARG KATALON_BASE_ROOT_DIR=$KATALON_ROOT_DIR/base
 ENV KATALON_VERSION_FILE=$KATALON_ROOT_DIR/version
@@ -34,7 +36,7 @@ COPY ./src/scripts/setup.sh setup.sh
 RUN chmod a+x setup.sh
 
 # Main setup
-RUN $KATALON_KATALON_SCRIPT_DIR/setup.sh
+RUN $KATALON_KATALON_SCRIPT_DIR/setup.sh $BUILDPLATFORM $TARGETPLATFORM
 
 # Set locale
 ENV LANG C.UTF-8
diff --git a/src/scripts/setup.sh b/src/scripts/setup.sh
index 54e98407..8cb7e32a 100755
--- a/src/scripts/setup.sh
+++ b/src/scripts/setup.sh
@@ -2,6 +2,11 @@
 
 set -xe
 
+BUILDPLATFORM=$1
+TARGETPLATFORM=$2
+
+echo BUILDPLATFORM
+
 # symlink Google Chrome
 symlink="/usr/bin/google-chrome"
 if [ -L $symlink ]; then