diff --git a/.github/workflows/nightly_e2e_workflow.yml b/.github/workflows/nightly_e2e_workflow.yml
index fd4f4d88..496202b0 100644
--- a/.github/workflows/nightly_e2e_workflow.yml
+++ b/.github/workflows/nightly_e2e_workflow.yml
@@ -38,6 +38,9 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     name: Build job
+    permissions:
+      contents: 'read'
+      id-token: 'write'
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/release_sample_app_workflow.yml b/.github/workflows/release_sample_app_workflow.yml
index b56ca5da..55d1f093 100644
--- a/.github/workflows/release_sample_app_workflow.yml
+++ b/.github/workflows/release_sample_app_workflow.yml
@@ -33,7 +33,7 @@ env:
 
 jobs:
   ReleaseSampleApp:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
     name: Release Sample App
     runs-on: ubuntu-latest
     steps:
@@ -69,7 +69,7 @@ jobs:
           serviceAccountJson: ./sample/google-play-store-service-account.json
           packageName: com.emarsys.sample
           releaseFiles: sample/build/outputs/bundle/release/sample-release.aab
-          track: ${{ github.event.workflow_run.inputs.track }}
+          track: ${{ github.event.workflow_run.inputs.track != null && github.event.workflow_run.inputs.track || alpha }}
 
   Report:
     if: ${{ always() && github.event.workflow_run.conclusion == 'success' }}