diff --git a/.github/workflows/build_appstore.yml b/.github/workflows/build_appstore.yml
index 0a428223d1..93e4be9110 100644
--- a/.github/workflows/build_appstore.yml
+++ b/.github/workflows/build_appstore.yml
@@ -61,14 +61,14 @@ jobs:
 
     steps:
 
-    # - name: Assert release branch
-    #   if: env.destination == 'appstore'
-    #   run: |
-    #     case "${{ github.ref }}" in
-    #       refs/heads/release/*) ;;
-    #       refs/heads/hotfix/*) ;;
-    #       *) echo "👎 Not a release or hotfix branch"; exit 1 ;;
-    #     esac
+    - name: Assert release branch
+      if: env.destination == 'appstore'
+      run: |
+        case "${{ github.ref }}" in
+          refs/heads/release/*) ;;
+          refs/heads/hotfix/*) ;;
+          *) echo "👎 Not a release or hotfix branch"; exit 1 ;;
+        esac
 
     - name: Register SSH keys for submodules access
       uses: webfactory/ssh-agent@v0.7.0
diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
index 676de8e938..7883f9200c 100644
--- a/.github/workflows/code_freeze.yml
+++ b/.github/workflows/code_freeze.yml
@@ -2,11 +2,6 @@ name: Code Freeze
 
 on:
   workflow_dispatch:
-    inputs:
-      asana-task-url:
-        description: "Asana release task URL"
-        required: true
-        type: string
 
 jobs:
 
@@ -19,24 +14,22 @@ jobs:
 
     outputs:
       release_branch_name: ${{ steps.make_release_branch.outputs.release_branch_name }}
+      asana_task_url: ${{ steps.create_release_task.outputs.asana_task_url }}
 
     steps:
 
-      # - name: Assert main branch
-      #   run: |
-      #     if [ "${{ github.ref_name }}" != "main" ]; then
-      #       echo "👎 Not the main branch"
-      #       exit 1
-      #     fi
+      - name: Assert main branch
+        run: |
+          if [ "${{ github.ref_name }}" != "main" ]; then
+            echo "👎 Not the main branch"
+            exit 1
+          fi
 
       - name: Check out the code
         uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Select Xcode
-        run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer
-
       - name: Prepare fastlane
         run: bundle install
 
@@ -51,6 +44,29 @@ jobs:
           git config --global user.email "dax@duckduckgo.com"
           bundle exec fastlane make_release_branch
 
+      - name: Create release task
+        id: create_release_task
+        env:
+          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+        run: |
+          version="$(echo ${{ steps.make_release_branch.outputs.release_branch_name }} | cut -d '/' -f 2)"
+          task_name="macOS App Release $version"
+          asana_task_id="$(curl -fLSs -X POST "https://app.asana.com/api/1.0/task_templates/${{ vars.MACOS_RELEASE_TASK_TEMPLATE_ID }}/instantiateTask" \
+            -H "Authorization: Bearer ${{ env.ASANA_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "{ \"data\": { \"name\": \"$task_name\" }}" \
+            | jq -r .data.new_task.gid)"
+          echo "asana_task_url=https://app.asana.com/0/0/${asana_task_id}/f" >> $GITHUB_OUTPUT
+
+          assignee_id="$(curl -fLSs https://raw.githubusercontent.com/duckduckgo/BrowserServicesKit/main/.github/actions/asana-failed-pr-checks/user_ids.json \
+            | jq -r .${{ github.actor }})"
+
+          curl -fLSs -X PUT "https://app.asana.com/api/1.0/tasks/${asana_task_id}" \
+            -H "Authorization: Bearer ${{ env.ASANA_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            --output /dev/null \
+            -d "{ \"data\": { \"assignee\": \"$assignee_id\" }}"
+
   run_tests:
 
     name: Run Tests
@@ -78,9 +94,6 @@ jobs:
           submodules: recursive
           ref: ${{ needs.create_release_branch.outputs.release_branch_name }}
 
-      - name: Select Xcode
-        run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer
-
       - name: Prepare fastlane
         run: bundle install
 
@@ -99,7 +112,7 @@ jobs:
     needs: [ create_release_branch, increment_build_number ]
     uses: ./.github/workflows/release.yml
     with:
-      asana-task-url: ${{ github.event.inputs.asana-task-url }}
+      asana-task-url: ${{ needs.create_release_branch.outputs.asana_task_url }}
       branch: ${{ needs.create_release_branch.outputs.release_branch_name }}
     secrets:
       BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}