diff --git a/.github/actions/build-and-push/action.yaml b/.github/actions/build-and-push/action.yaml
index f5fffe8..2466074 100644
--- a/.github/actions/build-and-push/action.yaml
+++ b/.github/actions/build-and-push/action.yaml
@@ -103,8 +103,8 @@ runs:
         push: ${{ inputs.push }}
         tags: ${{ steps.vars.outputs.tags }}
         build-args: |
-          VITE_KEYCLOAK_URL=${{ vars.VITE_KEYCLOAK_URL }}
-          VITE_KEYCLOAK_REALM=${{ vars.VITE_KEYCLOAK_REALM }}
-          VITE_KEYCLOAK_CLIENT_ID=${{ vars.VITE_KEYCLOAK_CLIENT_ID }}
-          VITE_BASE_PATH=${{ vars.VITE_BASE_PATH }}
-          VITE_ADMIN_API_BASE=${{ vars.VITE_ADMIN_API_BASE }}
+          VITE_KEYCLOAK_URL=${{ env.VITE_KEYCLOAK_URL != '' && env.VITE_KEYCLOAK_URL || vars.VITE_KEYCLOAK_URL }}
+          VITE_KEYCLOAK_REALM=${{ env.VITE_KEYCLOAK_REALM != '' && env.VITE_KEYCLOAK_REALM || vars.VITE_KEYCLOAK_REALM }}
+          VITE_KEYCLOAK_CLIENT_ID=${{ env.VITE_KEYCLOAK_CLIENT_ID != '' && env.VITE_KEYCLOAK_CLIENT_ID || vars.VITE_KEYCLOAK_CLIENT_ID }}
+          VITE_BASE_PATH=${{ env.VITE_BASE_PATH != '' && env.VITE_BASE_PATH || vars.VITE_BASE_PATH }}
+          VITE_ADMIN_API_BASE=${{ env.VITE_ADMIN_API_BASE != '' && env.VITE_ADMIN_API_BASE || vars.VITE_ADMIN_API_BASE }}