diff --git a/.woodpecker/build-latest-image.yaml b/.woodpecker/build-latest-image.yaml
index 21d8234..cb5e735 100644
--- a/.woodpecker/build-latest-image.yaml
+++ b/.woodpecker/build-latest-image.yaml
@@ -7,9 +7,9 @@ when:
     evaluate: 'CI_COMMIT_TARGET_BRANCH != "main"'
 
 variables:
-  - &registry_url "https://registry.cloud.josa.ngo"
-  - &docker_repo "registry.cloud.josa.ngo/library/community-web"
-  - &slack_channel "builds"
+  - &registry_url 'https://registry.cloud.josa.ngo'
+  - &docker_repo 'registry.cloud.josa.ngo/library/community-web'
+  - &slack_channel 'builds'
   # Success message template
   - &success_message >
     ✅ *SUCCESS* - Latest Build #{{ build.number }}
@@ -38,8 +38,8 @@ steps:
   - name: run-pre-commit-hooks
     image: registry.cloud.josa.ngo/library/pre-commit-runner
     settings:
-      args: "--all-files"
-      skip: "end-of-file-fixer, yamllint, no-commit-to-branch"
+      args: '--all-files'
+      skip: 'end-of-file-fixer, yamllint, no-commit-to-branch'
 
   # Build latest image (development and other branches)
   - name: build-latest-image
@@ -49,22 +49,22 @@ steps:
       registry: *registry_url
       dockerfile: ./Dockerfile
       tags:
-        - ${CI_COMMIT_SHA:-latest}
+        - latest-${CI_COMMIT_SHA}
         - latest
       username:
         from_secret: REGISTRY_USERNAME
       password:
         from_secret: REGISTRY_SECRET
       build_args:
-        CI_REPO: "${CI_REPO}"
-        CI_REPO_NAME: "${CI_REPO_NAME}"
-        CI_REPO_URL: "${CI_REPO_URL}"
-        CI_COMMIT_SHA: "${CI_COMMIT_SHA}"
-        CI_COMMIT_REF: "${CI_COMMIT_REF}"
-        CI_PIPELINE_URL: "${CI_PIPELINE_URL}"
-        CI_PIPELINE_CREATED: "${CI_PIPELINE_CREATED}"
-        CI_PREV_PIPELINE_URL: "${CI_PREV_PIPELINE_URL}"
-        CI_PIPELINE_NUMBER: "${CI_PIPELINE_NUMBER}"
+        CI_REPO: '${CI_REPO}'
+        CI_REPO_NAME: '${CI_REPO_NAME}'
+        CI_REPO_URL: '${CI_REPO_URL}'
+        CI_COMMIT_SHA: '${CI_COMMIT_SHA}'
+        CI_COMMIT_REF: '${CI_COMMIT_REF}'
+        CI_PIPELINE_URL: '${CI_PIPELINE_URL}'
+        CI_PIPELINE_CREATED: '${CI_PIPELINE_CREATED}'
+        CI_PREV_PIPELINE_URL: '${CI_PREV_PIPELINE_URL}'
+        CI_PIPELINE_NUMBER: '${CI_PIPELINE_NUMBER}'
 
     depends_on:
       - run-pre-commit-hooks
diff --git a/.woodpecker/build-stable-image.yaml b/.woodpecker/build-stable-image.yaml
index bc738ee..6ee09ab 100644
--- a/.woodpecker/build-stable-image.yaml
+++ b/.woodpecker/build-stable-image.yaml
@@ -9,9 +9,9 @@ when:
       exclude: [main]
 
 variables:
-  - &registry_url "https://registry.cloud.josa.ngo"
-  - &docker_repo "registry.cloud.josa.ngo/library/community-web"
-  - &slack_channel "builds"
+  - &registry_url 'https://registry.cloud.josa.ngo'
+  - &docker_repo 'registry.cloud.josa.ngo/library/community-web'
+  - &slack_channel 'builds'
   # Success message template
   - &success_message >
     ✅ *SUCCESS* - Stable Build #{{ build.number }}
@@ -39,8 +39,8 @@ steps:
   - name: run-pre-commit-hooks
     image: registry.cloud.josa.ngo/library/pre-commit-runner
     settings:
-      args: "--all-files"
-      skip: "end-of-file-fixer, yamllint, no-commit-to-branch"
+      args: '--all-files'
+      skip: 'end-of-file-fixer, yamllint, no-commit-to-branch'
 
   # Build stable image (main branch only)
   - name: build-stable-image
@@ -50,22 +50,22 @@ steps:
       registry: *registry_url
       dockerfile: ./Dockerfile
       tags:
-        - ${CI_COMMIT_SHA:-latest}
+        - stable-${CI_COMMIT_SHA}
         - stable
       username:
         from_secret: REGISTRY_USERNAME
       password:
         from_secret: REGISTRY_SECRET
       build_args:
-        CI_REPO: "${CI_REPO}"
-        CI_REPO_NAME: "${CI_REPO_NAME}"
-        CI_REPO_URL: "${CI_REPO_URL}"
-        CI_COMMIT_SHA: "${CI_COMMIT_SHA}"
-        CI_COMMIT_REF: "${CI_COMMIT_REF}"
-        CI_PIPELINE_URL: "${CI_PIPELINE_URL}"
-        CI_PIPELINE_CREATED: "${CI_PIPELINE_CREATED}"
-        CI_PREV_PIPELINE_URL: "${CI_PREV_PIPELINE_URL}"
-        CI_PIPELINE_NUMBER: "${CI_PIPELINE_NUMBER}"
+        CI_REPO: '${CI_REPO}'
+        CI_REPO_NAME: '${CI_REPO_NAME}'
+        CI_REPO_URL: '${CI_REPO_URL}'
+        CI_COMMIT_SHA: '${CI_COMMIT_SHA}'
+        CI_COMMIT_REF: '${CI_COMMIT_REF}'
+        CI_PIPELINE_URL: '${CI_PIPELINE_URL}'
+        CI_PIPELINE_CREATED: '${CI_PIPELINE_CREATED}'
+        CI_PREV_PIPELINE_URL: '${CI_PREV_PIPELINE_URL}'
+        CI_PIPELINE_NUMBER: '${CI_PIPELINE_NUMBER}'
 
     depends_on:
       - run-pre-commit-hooks