diff --git a/.circleci/parse-tag.sh b/.circleci/parse-tag.sh
index 671296d..66a3781 100755
--- a/.circleci/parse-tag.sh
+++ b/.circleci/parse-tag.sh
@@ -12,24 +12,27 @@
 # DOCKERHUB_DOCKEFILE_ARM32:Bitcoin/0.17.0/linuxarm32v7.Dockerfile
 # DOCKERHUB_DOCKEFILE_AMD64:Bitcoin/0.17.0/linuxamd64.Dockerfile
 
-
 SEPARATOR=$(expr index "$CIRCLE_TAG" "/")
 NODE_NAME=${CIRCLE_TAG:0:$SEPARATOR-1}
+REVISION=""
 NODE_VERSION="${CIRCLE_TAG:$SEPARATOR}"
-
+if expr index "$NODE_VERSION" "-" > /dev/null; then
+SEPARATOR_REVISION=$(expr index "$NODE_VERSION" "-")
+REVISION="${NODE_VERSION:$SEPARATOR_REVISION}"
+NODE_VERSION="${NODE_VERSION:$SEPARATOR:$SEPARATOR_REVISION-$SEPARATOR-1}"
+fi
 LATEST_TAG="${CIRCLE_TAG:$SEPARATOR}"
 DOCKERHUB_REPO="btcpayserver/$NODE_NAME"
 DOCKERHUB_REPO="${DOCKERHUB_REPO,,}"
 DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG"
-DOCKERHUB_DOCKEFILE_ARM64="$NODE_NAME/$LATEST_TAG/linuxarm64v8.Dockerfile"
-DOCKERHUB_DOCKEFILE_ARM32="$NODE_NAME/$LATEST_TAG/linuxarm32v7.Dockerfile"
-DOCKERHUB_DOCKEFILE_AMD64="$NODE_NAME/$LATEST_TAG/linuxamd64.Dockerfile"
+DOCKERHUB_DOCKEFILE_ARM64="$NODE_NAME/$NODE_VERSION/linuxarm64v8.Dockerfile"
+DOCKERHUB_DOCKEFILE_ARM32="$NODE_NAME/$NODE_VERSION/linuxarm32v7.Dockerfile"
+DOCKERHUB_DOCKEFILE_AMD64="$NODE_NAME/$NODE_VERSION/linuxamd64.Dockerfile"
 
 echo "LATEST_TAG=$LATEST_TAG"
-
-echo "DOCKERHUB_REPO=$DOCKERHUB_REPO"
-echo "NODE_NAME=$NODE_NAME"
 echo "NODE_VERSION=$NODE_VERSION"
+echo "REVISION=$REVISION"
+echo "DOCKERHUB_REPO=$DOCKERHUB_REPO"
 echo "DOCKERHUB_DESTINATION=$DOCKERHUB_DESTINATION"
 echo "DOCKERHUB_DOCKEFILE_AMD64=$DOCKERHUB_DOCKEFILE_AMD64"
 echo "DOCKERHUB_DOCKEFILE_ARM32=$DOCKERHUB_DOCKEFILE_ARM32"