diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index fb67388d..29adb8a6 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -24,6 +24,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build the Docker image
         run: |
-          cd intel-sgx/ppid-retrieval-tool
-          docker build -t ppid-retrieval-tool:$(date +%s) .
-          
\ No newline at end of file
+          cd intel-sgx/ppid-retrieval-tool/Docker
+          ./build.sh
+
diff --git a/intel-sgx/ppid-retrieval-tool/Dockerfile b/intel-sgx/ppid-retrieval-tool/Docker/Dockerfile
similarity index 100%
rename from intel-sgx/ppid-retrieval-tool/Dockerfile
rename to intel-sgx/ppid-retrieval-tool/Docker/Dockerfile
diff --git a/intel-sgx/ppid-retrieval-tool/Docker/build.sh b/intel-sgx/ppid-retrieval-tool/Docker/build.sh
new file mode 100755
index 00000000..9caabf8e
--- /dev/null
+++ b/intel-sgx/ppid-retrieval-tool/Docker/build.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+this_dir=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
+cd ${this_dir}
+
+docker build -t ppid_retrieval:$(cat version) -f ./Dockerfile ../
+
+set +x
+echo "Build ready, you can run the tool"
+echo ""
+echo "  docker run --device /dev/sgx ppid_retrieval:$(cat version)"
+echo ""
+echo "Note: the SGX device on your host may differ"
diff --git a/intel-sgx/ppid-retrieval-tool/Docker/version b/intel-sgx/ppid-retrieval-tool/Docker/version
new file mode 100644
index 00000000..3eefcb9d
--- /dev/null
+++ b/intel-sgx/ppid-retrieval-tool/Docker/version
@@ -0,0 +1 @@
+1.0.0