diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 01b0237..8a2e6d0 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -176,6 +176,7 @@ jobs:
       - name: Test "${{ needs.init.outputs.docker-image-name }}:${{ needs.init.outputs.github-ci-sha-short }}-${{ matrix.image-variant }}" Docker Image
         env:
           DOCKER_IMAGE_NAME: ${{ needs.init.outputs.docker-image-name }}:${{ needs.init.outputs.github-ci-sha-short }}-${{ matrix.image-variant }}
+          EMS_VERSION: ${GITHUB_REF_NAME}
         run: |
           docker network create docker_default
           docker pull appropriate/curl:latest
diff --git a/Makefile b/Makefile
index cd30512..9d7f8b9 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,8 @@ test-all: # Test [elasticms-website-skeleton] [prd,dev] variant Docker images
 
 _tester-%: 
 	@$(MAKE) -s _tester \
-		-e DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME}:${ELASTICMS_WEB_VERSION}-$*"
+		-e DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME}:${ELASTICMS_WEB_VERSION}-$*" \
+		-e EMS_VERSION="${ELASTICMS_WEB_VERSION}"
 
 _tester:
 	@bats test/tests.bats
\ No newline at end of file
diff --git a/test/tests.bats b/test/tests.bats
index b0a18e6..b395bd5 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -40,6 +40,7 @@ export BATS_ELASTICMS_SKELETON_ENVIRONMENT="demo-preview-dev"
 
 export BATS_STORAGE_SERVICE_NAME="postgresql"
 
+export BATS_EMS_VERSION="${EMS_VERSION:-5.x}"
 export BATS_DOCKER_IMAGE_NAME="${DOCKER_IMAGE_NAME:-docker.io/elasticms/website-skeleton:rc}"
 
 export AWS_ACCESS_KEY_ID="${BATS_S3_ACCESS_KEY_ID}"
@@ -55,10 +56,9 @@ export BATS_REDIS_PORT="${BATS_REDIS_PORT:-6379}"
 export BATS_VARNISH_ENABLED=${BATS_VARNISH_ENABLED:-"true"}
 export BATS_METRICS_ENABLED=${BATS_METRICS_ENABLED:-"true"}
 
-@test "[$TEST_FILE] Prepare Skeleton." {
+@test "[$TEST_FILE] Prepare Skeleton [$BATS_EMS_VERSION]." {
 
-  # TODO : tag demo git repo to retrieve always the same code
-  run git clone --branch 5.x git@github.com:ems-project/elasticms-demo.git ${BATS_TEST_DIRNAME%/}/demo
+  run git clone -b ${BATS_EMS_VERSION} git@github.com:ems-project/elasticms-demo.git ${BATS_TEST_DIRNAME%/}/demo
   run mkdir -p ${BATS_TEST_DIRNAME%/}/demo/dist
   run npm install --save-dev webpack --prefix ${BATS_TEST_DIRNAME%/}/demo ${BATS_TEST_DIRNAME%/}/demo
   run npm run --prefix ${BATS_TEST_DIRNAME%/}/demo prod