diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml
index 4bee1d63d..ba4e9e514 100644
--- a/.github/workflows/container-build.yml
+++ b/.github/workflows/container-build.yml
@@ -48,7 +48,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Login to private repository
-        if: inputs.RELEASE == 'staging'
+        if: inputs.PUSH == true
         uses: docker/login-action@v2
         with:
           registry: ${{ secrets.PRIVATE_REGISTRY }}
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 97aa8c56f..db729c6e4 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -219,7 +219,7 @@ jobs:
       RUNS_ON: "['self-hosted', 'bw-linux']"
     secrets: inherit
   tests-ui:
-    needs: [code-security, build-ui, build-bw, build-sc]
+    needs: [code-security, build-bw, build-sc, build-ui]
     uses: ./.github/workflows/tests-ui.yml
     with:
       RELEASE: staging