diff --git a/.bin/commands.sh b/.bin/commands.sh
index b823230..971e211 100644
--- a/.bin/commands.sh
+++ b/.bin/commands.sh
@@ -79,10 +79,10 @@ function seed:apply() {
 }
 
 function deploy:log:encrypt() {
-  "${SCRIPT_DIR}/deploy-log-encrypt.sh" "$@"
+  (cd "$ROOT_DIR" && "${SCRIPT_DIR}/deploy-log-encrypt.sh" "$@")
 }
 
 function deploy:log:decrypt() {
-  "${SCRIPT_DIR}/deploy-log-decrypt.sh" "$@"
+  (cd "$ROOT_DIR" && "${SCRIPT_DIR}/deploy-log-decrypt.sh" "$@")
 }
 
diff --git a/.bin/scripts/deploy-log-decrypt.sh b/.bin/scripts/deploy-log-decrypt.sh
index 57605ad..01e60cd 100755
--- a/.bin/scripts/deploy-log-decrypt.sh
+++ b/.bin/scripts/deploy-log-decrypt.sh
@@ -9,6 +9,13 @@ else
     shift
 fi
 
+if [ -z "${1:-}" ]; then
+  read -p "Veuillez renseigner l'ID du job: " JOB_ID
+else
+    readonly JOB_ID="$1"
+    shift
+fi
+
 if [[ -z "${ANSIBLE_VAULT_PASSWORD_FILE:-}" ]]; then
   ansible_extra_opts+=("--vault-password-file" "${SCRIPT_DIR}/get-vault-password-client.sh")
 else
@@ -24,10 +31,10 @@ delete_cleartext() {
 trap delete_cleartext EXIT
 
 
-rm -f /tmp/deploy_error.log.gpg
+rm -f /tmp/deploy.log.gpg
 
-gh run download "$RUN_ID" -n error-logs -D /tmp
+gh run download "$RUN_ID" -n "logs-$JOB_ID" -D /tmp
 
 ansible-vault view "${ansible_extra_opts[@]}" "$VAULT_FILE" | yq '.vault.SEED_GPG_PASSPHRASE' > "$PASSPHRASE"
 
-gpg -d --batch --passphrase-file "$PASSPHRASE" /tmp/deploy_error.log.gpg
+gpg -d --batch --passphrase-file "$PASSPHRASE" /tmp/deploy.log.gpg
diff --git a/.bin/scripts/deploy-log-encrypt.sh b/.bin/scripts/deploy-log-encrypt.sh
index cb04ab6..33bd6d8 100755
--- a/.bin/scripts/deploy-log-encrypt.sh
+++ b/.bin/scripts/deploy-log-encrypt.sh
@@ -19,5 +19,5 @@ trap delete_cleartext EXIT
 ansible-vault view "${ansible_extra_opts[@]}" "$VAULT_FILE" | yq '.vault.SEED_GPG_PASSPHRASE' > "$PASSPHRASE"
 
 # Make sur the file exists
-touch /tmp/deploy_error.log
-gpg  -c --cipher-algo twofish --batch --passphrase-file "$PASSPHRASE" -o /tmp/deploy_error.log.gpg /tmp/deploy_error.log
+touch /tmp/deploy.log
+gpg  -c --cipher-algo twofish --batch --passphrase-file "$PASSPHRASE" -o /tmp/deploy.log.gpg /tmp/deploy.log
diff --git a/.bin/scripts/run-playbook.sh b/.bin/scripts/run-playbook.sh
index a684174..3a71cf0 100755
--- a/.bin/scripts/run-playbook.sh
+++ b/.bin/scripts/run-playbook.sh
@@ -61,5 +61,5 @@ function runPlaybook() {
 if [[ -z "${CI:-}" ]]; then
   runPlaybook "$@"
 else
-  runPlaybook "$@" 2> /tmp/deploy_error.log
+  runPlaybook "$@" &> /tmp/deploy.log
 fi;
diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml
index 68f9210..05148df 100644
--- a/.github/workflows/_deploy.yml
+++ b/.github/workflows/_deploy.yml
@@ -77,18 +77,22 @@ jobs:
           ANSIBLE_REMOTE_USER: deploy
           ANSIBLE_BECOME_PASS: ${{ secrets.DEPLOY_PASS }}
 
-      - name: Encrypt Error log on failure
+      - name: Encrypt logs
         run: .bin/mna deploy:log:encrypt
-        if: failure()
+        if: always()
         env:
           ANSIBLE_VAULT_PASSWORD_FILE: .infra/.vault_pwd.txt
 
-      - name: Upload failure artifacts on failure
-        if: failure()
+      - name: Upload logs artifacts
+        if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: error-logs
-          path: /tmp/deploy_error.log.gpg
+          name: logs-${{ inputs.environment }}
+          path: /tmp/deploy.log.gpg
+
+      - name: Add Job summary
+        if: always()
+        run: echo 'You can get logs using `.bin/mna deploy:log:decrypt ${{ github.run_id }} ${{ inputs.environment }}`' >> $GITHUB_STEP_SUMMARY
 
       - name: Notify failure on Slack
         uses: ravsamhq/notify-slack-action@v2
@@ -96,7 +100,7 @@ jobs:
         with:
           status: ${{ job.status }}
           notification_title: "Le déploiement ${{ inputs.app_version }} en ${{ inputs.environment }} a échoué"
-          message_format: "{emoji} *[${{ inputs.environment }}]* *{workflow}* {status_message} in <{repo_url}|{branch}> on <{commit_url}|{commit_sha}>. You can get error logs using `.bin/mna deploy:log:decrypt ${{ github.run_id }}`"
+          message_format: "{emoji} *[${{ inputs.environment }}]* *{workflow}* {status_message} in <{repo_url}|{branch}> on <{commit_url}|{commit_sha}>. You can get error logs using `.bin/mna deploy:log:decrypt ${{ github.run_id }} ${{ inputs.environment }}`"
           notify_when: "failure"
           mention_groups: "!channel"
         env:
diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/deploy_preview.yml
index de1cd4b..42b9800 100644
--- a/.github/workflows/deploy_preview.yml
+++ b/.github/workflows/deploy_preview.yml
@@ -89,18 +89,22 @@ jobs:
           ANSIBLE_REMOTE_USER: deploy
           ANSIBLE_BECOME_PASS: ${{ secrets.DEPLOY_PASS }}
 
-      - name: Encrypt Error log on failure
+      - name: Encrypt logs
         run: .bin/mna deploy:log:encrypt
-        if: failure()
+        if: always()
         env:
           ANSIBLE_VAULT_PASSWORD_FILE: .infra/.vault_pwd.txt
 
-      - name: Upload failure artifacts on failure
-        if: failure()
+      - name: Upload logs artifacts
+        if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: error-logs
-          path: /tmp/deploy_error.log.gpg
+          name: logs-${{ github.event.issue.number }}
+          path: /tmp/deploy.log.gpg
+
+      - name: Add Job summary
+        if: always()
+        run: echo 'You can get logs using `.bin/mna deploy:log:decrypt ${{ github.run_id }} ${{ github.event.issue.number }}`' >> $GITHUB_STEP_SUMMARY
 
       - name: Preview Summary when failed
         if: failure()