diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60f58638..53feb836 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -169,6 +169,6 @@ jobs:
           tags: ghcr.io/${{github.repository}}:${{format('v{0}', inputs.tag)}}, ${{env.LATEST_TAG}}
           labels: org.opencontainers.image.title=Docker
           build-args: |
-            --provenance=false
+            --provenance=false client_tag=${{inputs.tag}}
         env:
           LATEST_TAG: ${{ inputs.is_latest == 'true' && format('ghcr.io/{0}:latest', github.repository) || '' }}
diff --git a/Dockerfile b/Dockerfile
index 9637c0ce..770c92a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,20 @@
 FROM node:latest AS CLIENT
 
-RUN git clone --depth 1 https://github.com/swing-opensource/swingmusic-client.git client
+ARG client_tag
+
+RUN git clone --branch $client_tag --depth 1 https://github.com/swing-opensource/swingmusic-client.git client
 
 WORKDIR /client
 
 # RUN git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
+# checkout the latest tag
+# RUN git checkout $client_tag
 
 RUN yarn install
 
 RUN yarn build
 
-FROM python:latest
+FROM python:3.10
 
 WORKDIR /app/swingmusic