diff --git a/.gitea/workflows/build-images.yml b/.gitea/workflows/build-images.yml
index faa0b6f..9a8effb 100644
--- a/.gitea/workflows/build-images.yml
+++ b/.gitea/workflows/build-images.yml
@@ -52,10 +52,8 @@ jobs:
           python3 -m devx.ci.detect_release_commit
       - name: Docker registry login
         if: >-
-          steps.check.outputs.is-release == 'false' && (
-            github.event_name == 'workflow_dispatch' ||
-            (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
-          )
+          github.event_name == 'workflow_dispatch' ||
+          (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && steps.check.outputs.is-release == 'false')
         env:
           CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }}
           CI_GITEA_USERNAME: ${{ vars.CI_GITEA_USERNAME }}
@@ -68,10 +66,8 @@ jobs:
           echo "$_TOKEN" | docker login git.oblachno.oblachno.fyi -u "$CI_GITEA_USERNAME" --password-stdin
       - name: Build and push tier images
         if: >-
-          steps.check.outputs.is-release == 'false' && (
-            github.event_name == 'workflow_dispatch' ||
-            (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
-          )
+          github.event_name == 'workflow_dispatch' ||
+          (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && steps.check.outputs.is-release == 'false')
         env:
           CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }}
           CI_GITEA_USERNAME: ${{ vars.CI_GITEA_USERNAME }}
@@ -117,7 +113,7 @@ jobs:
 
   cleanup:
     needs: [build-and-push]
-    if: always() && needs.build-and-push.result == 'success' && needs.build-and-push.outputs.is-release == 'false'
+    if: always() && needs.build-and-push.result == 'success'
     runs-on: docker
     timeout-minutes: 10
     steps: