diff --git a/scripts/docker-push.sh b/scripts/docker-push.sh
index 4953f07..dbf3a6a 100755
--- a/scripts/docker-push.sh
+++ b/scripts/docker-push.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
 
-VERSION=0.1.2
+VERSION=$(git branch | grep "*" | awk '{ print $2 }')
 LOCAL_IMAGE="athome"
+REGISTRY="mos4"
 REMOTE_IMAGE="athome"
+DOCKERFILE="./Dockerfile"
 
-docker build -t $LOCAL_IMAGE .
-docker tag $LOCAL_IMAGE:latest mos4/$REMOTE_IMAGE:$VERSION
-docker push mos4/$REMOTE_IMAGE:$VERSION
+echo "DOCKERFILE: $DOCKERFILE"
+echo "VERSION: $VERSION"
+echo "LOCAL_IMAGE: $LOCAL_IMAGE"
+echo "REGISTRY: $REGISTRY"
+echo "REMOTE_IMAGE: $REMOTE_IMAGE"
+
+docker buildx build --platform linux/amd64,linux/arm64 -f $DOCKERFILE -t \
+  $REGISTRY/$REMOTE_IMAGE:$TAG . --push