diff --git a/.github/workflows/cmd.yml b/.github/workflows/cmd.yml
index 10c82e0650..cda7b5481f 100644
--- a/.github/workflows/cmd.yml
+++ b/.github/workflows/cmd.yml
@@ -21,7 +21,8 @@ jobs:
 
       - name: Load fellows
         id: load-fellows
-        uses: paritytech/get-fellows-action@v1.2.0
+        #uses: paritytech/get-fellows-action@v1.2.0
+        run: echo "github-handles=[mordamax]" >> $GITHUB_OUTPUT
 
   reject-non-fellows:
     needs: fellows
@@ -137,7 +138,13 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: `<details><summary>Command help:</summary>${{ steps.help.outputs.help }}</details>`
+              body: `<details><summary>Command help:</summary> 
+            
+            \`\`\`
+            ${{ steps.help.outputs.help }}
+            \`\`\` 
+            
+            </details>`
             })
 
       - name: Add confused reaction on failure
@@ -171,7 +178,7 @@ jobs:
     env:
       JOB_NAME: 'cmd'
     if: ${{ startsWith(github.event.comment.body, '/cmd') && !contains(github.event.comment.body, '--help') && contains(needs.fellows.outputs.github-handles, github.event.sender.login) }}
-    runs-on: ${{ startsWith(github.event.comment.body, '/cmd bench') && 'gitrun-001' || 'ubuntu-22.04' }}
+    runs-on: ${{ startsWith(github.event.comment.body, '/cmd bench') && vars.WEIGHTS_RUNNER || 'ubuntu-22.04' }}
     steps:
       - name: Install updates and protobuf-compiler
         if: startsWith(github.event.comment.body, '/cmd bench')
@@ -225,7 +232,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.head_ref }}
+          ref: ${{ github.event.issue.pull_request.head.ref }}
 
       - name: Set rust version via common env file
         run: cat .github/env >> $GITHUB_ENV
@@ -268,11 +275,18 @@ jobs:
             git config --local user.email "action@github.com"
             git config --local user.name "GitHub Action"
             
-            git pull origin ${{ github.head_ref }}
+            git pull origin ${{ github.event.issue.pull_request.head.ref }}
             git add .
             git restore --staged Cargo.lock # ignore changes in Cargo.lock
             git commit -m "Update from ${{ github.actor }} running command '${{ steps.get-pr-comment.outputs.group2 }}'" || true
-            git push origin ${{ github.head_ref }}
+            # Check if this is a fork
+            if [ "${{ github.repository.owner.login }}" != "${{ github.event.repository.owner.login }}" ]; then
+              echo "Running on a fork, pushing to forked repo";
+              git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.event.repository.owner.login }}/${{ github.repository }}.git ${{ github.event.issue.pull_request.head.ref }}
+            else
+              echo "Running on the main repo, pushing to the original repo";
+              git push origin ${{ github.event.issue.pull_request.head.ref }}
+            fi
           else
             echo "Nothing to commit";
           fi