diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml
index 1959a50..8d51822 100644
--- a/.gitea/workflows/build-push.yaml
+++ b/.gitea/workflows/build-push.yaml
@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE_NAME: public/calibre-web
-  IMAGE_TAGS: latest pmo-${{ env.VERSION }}
+  IMAGE_TAGS: latest
   IMAGE_REGISTRY: niepce.petite-maison-orange.fr
   REGISTRY_USER: eric@coissac.eu
   REGISTRY_PASSWORD: ${{ secrets.NIEPCETOKEN }}
@@ -25,7 +25,7 @@ jobs:
                ${{ env.CHECK }}/start
         shell: bash
 
-      - name: install Buildah
+      - name: install podman
         run: |
           apt-get update
           apt-get install -y podman
@@ -44,9 +44,12 @@ jobs:
         id: version
         run: |
           # Lire le contenu du fichier et supprimer les espaces/retours chariots
-          VERSION=$(cat ${{ env.RELEASE_FILE }} | tr -d ' \n')
+          SOFTVERSION=$(cat ${{ env.RELEASE_FILE }} | tr -d ' \n')
           # Stocker la valeur dans une variable d'environnement
-          echo "VERSION=$VERSION" >> $GITEA_ENV
+          echo "SOFTVERSION=$SOFTVERSION" >> $GITEA_ENV
+
+      - name: Add PMO version tag
+          echo "IMAGE_TAGS=${{ env.IMAGE_TAGS }} pmo-${{ env.SOFTVERSION }}" >> $GITEA_ENV
 
       - name: Podman login
         run: |
@@ -61,9 +64,12 @@ jobs:
           if [[ -n "${tags[1]}" ]] ; then
              sep=":"
           fi
-          docker build -t ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}${sep}${tags[1]} .
+          image=${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}${sep}${tags[1]}
+          docker build -t ${image} .
+          docker save ${image} -o image.tar
+          podman load -i image.tar
           for tag in "${tags[@]:1}" ; do
-            podman tag ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${tags[1]} \
+            podman tag ${image} \
                        ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${tag}
           done
 
@@ -88,10 +94,6 @@ jobs:
       - name: Push image to registry
         run: |
           tags=(${{ env.IMAGE_TAGS }})
-          sep=""
-          if [[ -n "${tags[1]}" ]] ; then
-             sep=":"
-          fi
           for tag in "${tags[@]}" ; do
             podman push ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:$tag
           done