diff --git a/.github/workflows/add_issues_prs_to_dedalo_project.yml b/.github/workflows/add_issues_prs_to_dedalo_project.yml
index baa954f..52a0940 100644
--- a/.github/workflows/add_issues_prs_to_dedalo_project.yml
+++ b/.github/workflows/add_issues_prs_to_dedalo_project.yml
@@ -11,7 +11,14 @@ jobs:
     name: Add to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - name: Get Token
+        id: get_workflow_token
+        uses: peter-murray/workflow-application-token-action@v3
+        with:
+          application_id: ${{ vars.APOLLO_APP_ID }}
+          application_private_key: ${{ secrets.APOLLO_APP_SECRET }}
+      - name: Add to Dedalo Project
+        uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/eduNEXT/projects/1
-          github-token: ${{ secrets.DEDALO_PAT }}
+          github-token: ${{ steps.get_workflow_token.outputs.token }}
diff --git a/.github/workflows/pr_issue_assignment.yml b/.github/workflows/pr_issue_assignment.yml
index 57502bc..f7243d4 100644
--- a/.github/workflows/pr_issue_assignment.yml
+++ b/.github/workflows/pr_issue_assignment.yml
@@ -1,18 +1,24 @@
 name: PR-Issue assignment
 
 on:
-    issues:
-        types: [opened]
-    pull_request:
-        types: [opened]
+  issues:
+    types: [opened]
+  pull_request:
+    types: [opened]
 
 jobs:
-    auto-assign:
-        runs-on: ubuntu-latest
-        steps:
-            - name: 'Auto-assign PR-Issue'
-              uses: pozil/auto-assign-issue@v1.5.0
-              with:
-                repo-token: ${{ secrets.DEDALO_PAT }}
-                teams: developers-tools
-                numOfAssignee: 2
+  auto-assign:
+    name: Auto Assign
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get Token
+        id: get_workflow_token
+        uses: peter-murray/workflow-application-token-action@v3
+        with:
+          application_id: ${{ vars.APOLLO_APP_ID }}
+          application_private_key: ${{ secrets.APOLLO_APP_SECRET }}
+      - name: Auto-assign PR-Issue
+        uses: pozil/auto-assign-issue@v2
+        with:
+          repo-token: ${{ steps.get_workflow_token.outputs.token }}
+          teams: dedalo