diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml
index 85d4871..a6692f1 100644
--- a/.gitea/workflows/ci-cd.yml
+++ b/.gitea/workflows/ci-cd.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Run quality gate
         run: |
           set -euo pipefail
-          ci_image="mostovik-backend-ci:${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          ci_image="mostovik-backend-ci:${GITHUB_RUN_ID:-local}-${GITHUB_RUN_ATTEMPT:-1}"
           docker build \
             --file docker/Dockerfile \
             --target ci-deps-base \
@@ -97,7 +97,7 @@ jobs:
           printf '%s' "${REGISTRY_PASSWORD}" \
             | docker login "${REGISTRY_HOST}" --username "${REGISTRY_USERNAME}" --password-stdin
 
-          builder="mostovik-backend-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          builder="mostovik-backend-${GITHUB_RUN_ID:-local}-${GITHUB_RUN_ATTEMPT:-1}"
           docker buildx create --name "${builder}" --driver docker-container --use
           cleanup() {
             docker buildx rm "${builder}" >/dev/null 2>&1 || true
@@ -196,7 +196,7 @@ jobs:
             "${DEPLOY_USER}@${DEPLOY_HOST}" \
             /opt/ecos-dev/release-service \
             mostovik-backend \
-            "${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" \
+            "${GITHUB_RUN_ID:-${GITHUB_SHA}}-${GITHUB_RUN_ATTEMPT:-1}" \
             "${WEB_REF}" \
             "${CELERY_REF}"
 
@@ -248,7 +248,7 @@ jobs:
             "${DEPLOY_USER}@${MAIN_DEPLOY_HOST}" \
             /opt/ecos-main/release-service \
             mostovik-backend \
-            "${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" \
+            "${GITHUB_RUN_ID:-${GITHUB_SHA}}-${GITHUB_RUN_ATTEMPT:-1}" \
             "${WEB_REF}" \
             "${CELERY_REF}" \
             --refresh-data
@@ -319,6 +319,6 @@ jobs:
             "${CUSTOMER_DEPLOY_USER}@${CUSTOMER_DEPLOY_HOST}" \
             /ecos/release-service \
             mostovik-backend \
-            "${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" \
+            "${GITHUB_RUN_ID:-${GITHUB_SHA}}-${GITHUB_RUN_ATTEMPT:-1}" \
             "${WEB_REF}" \
             "${CELERY_REF}"