diff --git a/.github/workflows/create-pr.yml b/.github/workflows/create-pr.yml
index 39b392fefa..cd4415c0a6 100644
--- a/.github/workflows/create-pr.yml
+++ b/.github/workflows/create-pr.yml
@@ -17,23 +17,26 @@ jobs:
     steps:
       - name: Verify Event and set env
         env:
-          BUILD_URL: ${{ github.event.client_payload.build_url }}
           PR_BRANCH: ${{ github.event.client_payload.branch }}
           PACKAGE: ${{ github.event.client_payload.dependency_package }}
+          PACKAGE_NAME: echo "${{ github.event.client_payload.dependency_package }}" | sed 's/[^\/]*\///'
+
         run: |
           echo "PR_BRANCH=$PR_BRANCH" >> $GITHUB_ENV
-          echo "BUILD_URL=$BUILD_URL" >> $GITHUB_ENV
           echo "PACKAGE=$PACKAGE" >> $GITHUB_ENV
+          echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_ENV
+
+          PACKAGE_NAME_IS_VALID=$(echo '${{ vars.ACCEPTED_PACKAGES }}' | jq --arg project "${{ env.PACKAGE }}" 'any(.[]; . as $name | $project | match($name))')
+          echo "PACKAGE_NAME_IS_VALID=$PACKAGE_NAME_IS_VALID" >> $GITHUB_ENV
 
-          BUILD_URL_IS_ACCEPTED=$(echo '${{ vars.ACCEPTED_BUILD_URL_PREFIXES }}' | jq --arg url "${{ env.BUILD_URL }}" 'any(.[]; . as $prefix | $url | contains($prefix))')
-          echo "BUILD_URL_IS_ACCEPTED=$BUILD_URL_IS_ACCEPTED" >> $GITHUB_ENV
-        if: ${{ github.event.action == 'create_pr' && github.event.client_payload.branch && github.event.client_payload.build_url && github.event.client_payload.dependency_package }}
+          echo $GITHUB_ENV
+        # if: ${{ github.event.action == 'create_pr' && github.event.client_payload.branch && github.event.client_payload.dependency_package }}
 
       - name: Stop workflow if any variables are missing
         run: |
           echo "::error::Some variable is missing. Have to stop..."
           exit 1
-        if: ${{ !env.PR_BRANCH || !env.BUILD_URL && !env.PACKAGE || !vars.ACCEPTED_BUILD_URL_PREFIXES }}
+        if: ${{ !env.PR_BRANCH || !env.PACKAGE || !env.PACKAGE_NAME || !vars.PACKAGE_NAME_IS_VALID }}
 
       - name: Stop workflow if build url is not valid
         run: |