diff --git a/Makefile b/Makefile
index cfab67ea0..414763e18 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,7 @@ release-manager-release: ## - Builds a snapshot release. The Go version defined
 ## get-version : Get the Fleet server version
 .PHONY: get-version
 get-version:
-	@echo $(DEFAULT_VERSION)
+	@echo $(VERSION)
 
 ##################################################
 # Integration testing targets
diff --git a/dev-tools/cloud/docker/build.sh b/dev-tools/cloud/docker/build.sh
index 8d0b2fbbe..ecb96dabe 100755
--- a/dev-tools/cloud/docker/build.sh
+++ b/dev-tools/cloud/docker/build.sh
@@ -26,11 +26,13 @@ VCS_REF=$(docker inspect -f '{{index .Config.Labels "org.label-schema.vcs-ref"}}
 CUSTOM_IMAGE_TAG=${CUSTOM_IMAGE_TAG:-"${STACK_VERSION}-${USER_NAME}-$(date +%s)"}
 
 SNAPSHOT=true make -C $REPO_ROOT release-linux/${GOARCH}
+FLEET_VERSION=$(SNAPSHOT=true make -s --no-print-directory -C $REPO_ROOT get-version)
+echo "Fleet version: ${FLEET_VERSION}"
 
 docker build \
 	-f $REPO_ROOT/dev-tools/cloud/docker/Dockerfile \
 	--build-arg ELASTIC_AGENT_IMAGE=$BASE_IMAGE \
-	--build-arg STACK_VERSION=$STACK_VERSION \
+	--build-arg STACK_VERSION=${FLEET_VERSION} \
 	--build-arg VCS_REF_SHORT=${VCS_REF:0:6} \
 	--platform linux/$GOARCH \
 	-t ${CI_ELASTIC_AGENT_DOCKER_IMAGE}:${CUSTOM_IMAGE_TAG} \