diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml
index 14a13b1..1c90cbe 100644
--- a/.forgejo/workflows/check.yml
+++ b/.forgejo/workflows/check.yml
@@ -24,18 +24,17 @@ jobs:
         uses: ./
         with:
           # Create a comment on the associated PR
-          comment-on-pr: ${{ github.ref_name != 'main' }}
+          comment-on-pr: 'false'
           # Generate artifacts on main (to speed up comparisons)
           # generate-artifact: ${{ github.ref_name == 'main' }}
           # Always generate artifacts for testing purposes
           generate-artifact: 'true'
-          # Generate comparisons to main
-          do-comparison: 'true'
-          # This job's name (so we can find the artifacts)
+          # This job's name (so we can find the previous artifacts)
           job-name: report-size
   report-download-check:
     runs-on: nixos
-    needs: report-size
+    needs: report-size-push
+    if: github.event_name == 'push'
     steps:
       - name: Download previous report
         uses: https://git.salame.cl/actions/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4
diff --git a/.forgejo/workflows/test-pr.yml b/.forgejo/workflows/test-pr.yml
new file mode 100644
index 0000000..43fb880
--- /dev/null
+++ b/.forgejo/workflows/test-pr.yml
@@ -0,0 +1,33 @@
+on:
+  pull_request:
+jobs:
+  report-size-pr:
+    runs-on: nixos
+    steps:
+      - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
+      - run: nix --version
+      - name: Create Size Report
+        uses: ./
+        with:
+          # Create a comment on the associated PR
+          comment-on-pr: 'true'
+          # Generate artifacts on main (to speed up comparisons)
+          # generate-artifact: ${{ github.ref_name == 'main' }}
+          # Always generate artifacts for testing purposes
+          generate-artifact: 'true'
+          # Generate comparisons to main
+          do-comparison: 'true'
+          # Get the previous artifacts from report-size-push (since those run on main)
+          job-name: report-size
+          artifact-name: report.json
+  report-download-check-pr:
+    runs-on: nixos
+    needs: report-size-pr
+    steps:
+      - name: Download previous report
+        uses: https://git.salame.cl/actions/download-artifact@d8d0a99033603453ad2255e58720b460a0555e1e # v4
+        with:
+          name: report.json
+      - name: Verify report exists
+        run: |
+          cat report.json
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fcfc4a1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+result*
diff --git a/README.md b/README.md
index d3bceb9..6e9e21c 100644
--- a/README.md
+++ b/README.md
@@ -56,9 +56,9 @@ For more details see the [action.yaml](./action.yml) file.
 
 | Name | Size | Size Change | NAR Size | NAR Size Change |
 |------|-----:|------------:|---------:|----------------:|
-| `gemini` |        11Gi |   -2.4Mi |  28Ki | 0 |
-| `leo` |      1.6Gi | 0 |  25Ki | 0 |
-| `libra` |       9.4Gi |   -2.4Mi |  28Ki | 0 |
-| `taurus` |      7.6Gi | 0 |  34Ki | 0 |
+| `gemini` | 11Gi | -2.4Mi | 28Ki | 0 |
+| `leo` | 1.6Gi | 0 | 25Ki | 0 |
+| `libra` | 9.4Gi | -2.4Mi | 28Ki | 0 |
+| `taurus` | 7.6Gi | 0 | 34Ki | 0 |
 
 </details>
diff --git a/action.yml b/action.yml
index 46431b7..d5f3b1d 100644
--- a/action.yml
+++ b/action.yml
@@ -71,7 +71,19 @@ runs:
       id: pr-number
       if: inputs.comment-on-pr == 'true'
       run: |
-        . "$GITHUB_ACTION_PATH/utils.sh"
+        . "$GITHUB_ACTION_PATH/scripts/utils.sh"
+
+        # If we were triggered by a PR then this is easy
+        if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
+                # shellcheck disable=SC2016
+                # expanded by the runner
+                pr_number='${{ github.event.number }}'
+                log "Triggered by a pull request with index: $pr_number"
+                log "Expected PR URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/pulls/$pr_number"
+                log "Writing output to: $GITHUB_OUTPUT"
+                echo "pr-number=$pr_number" >> "$GIHUB_OUTPUT"
+                exit 0
+        fi
 
         log 'Determine head_ref'
         # For push & tag events it'll bet GITHUB_REF_NAME, for pull_request events it'll be GITHUB_HEAD_REF
@@ -83,6 +95,8 @@ runs:
                 -H "Authorization: token $GITHUB_TOKEN" \
                 -H 'Accept: application/json')
 
+        log "Open PRs: $(echo "$prs" | jq --compact output 'map(.number)')"
+
         pr_number=$(echo "$prs" |
                 jq --arg head_ref "$head_ref" '.[] | select(.head.ref == $head_ref) | .number')
 
@@ -121,7 +135,7 @@ runs:
         BASE_BRANCH: ${{ inputs.base-branch }}
         JOB_NAME: ${{ inputs.job-name }}
       run: |
-        . "$GITHUB_ACTION_PATH/utils.sh"
+        . "$GITHUB_ACTION_PATH/scripts/utils.sh"
 
         # Input validation
         if [ "$DO_COMPARISON" = 'true' ] && [ -z "$JOB_NAME" ]; then
@@ -130,17 +144,17 @@ runs:
         fi
 
         # Create Size Report
-        "$GITHUB_ACTION_PATH/create-report.sh" > report.json
+        "$GITHUB_ACTION_PATH/scripts/create-report.sh" report.json
 
         # Nothing else to do
         if [ "$COMMENT" != 'true' ]; then exit 0; fi
 
         # Try to do a comparison report
         if [ "$DO_COMPARISON" = 'true' ]; then
-          if "$GITHUB_ACTION_PATH/retrieve-old-report.sh" && [ -f old-report.json ]; then
+          if "$GITHUB_ACTION_PATH/scripts/retrieve-old-report.sh" && [ -f old-report.json ]; then
             log "Reporting on sizes and comparing to sizes in $HEAD_BRANCH"
 
-            "$GITHUB_ACTION_PATH/comment_on_pr.sh" report.json old-report.json
+            "$GITHUB_ACTION_PATH/scripts/comment_on_pr.sh" report.json old-report.json
             exit 0
           else
             error 'Failed to do comparison, fallback to posting the report without them'
@@ -149,7 +163,7 @@ runs:
 
         # Just report values
         log 'Reporting on sizes'
-        "$GITHUB_ACTION_PATH/comment_on_pr.sh" report.json
+        "$GITHUB_ACTION_PATH/scripts/comment_on_pr.sh" report.json
     - name: Upload Artifact
       uses: https://git.salame.cl/actions/upload-artifact@v4
       if: inputs.generate-artifact == 'true'
diff --git a/create-report.sh b/create-report.sh
deleted file mode 100755
index a463eb7..0000000
--- a/create-report.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-util_path="${GITHUB_ACTION_PATH:-.}/utils.sh"
-
-# shellcheck source=utils.sh
-. "${util_path}"
-
-group 'Retrieving Flake information'
-flake_info=$(nix flake show --json)
-endgroup
-
-group 'Show Packages'
-packages=$(
-  jq --raw-output '.packages."x86_64-linux" | select(. != null) | keys[]' <<-EOF
-		$flake_info
-	EOF
-)
-log "$packages"
-endgroup
-
-group 'Show Home Manager Configurations'
-hmConfigs=$(
-  jq --raw-output '.homeConfigurations | select(. != null) | keys[]' <<-EOF
-		$flake_info
-	EOF
-)
-log "$hmConfigs"
-endgroup
-
-group 'Show NixOS Configurations'
-nixosConfigs=$(
-  jq --raw-output '.nixosConfigurations | select(. != null) | keys[]' <<-EOF
-		$flake_info
-	EOF
-)
-log "$nixosConfigs"
-endgroup
-
-pkgs_json() {
-  group 'Building packages'
-  trap endgroup RETURN
-  for package in $packages; do
-    log "Building $package"
-    path=$(nix build --print-out-paths ".#$package")
-    log "Calculating size of $package"
-    nix path-info --closure-size --json "$path" |
-      jq --compact-output --arg pkg "$package" '.[] | {"name": $pkg, "size": .closureSize, "narSize": .narSize}'
-  done
-  endgroup
-}
-
-hm_configs_json() {
-  group 'Building Home Manager configurations'
-  trap endgroup RETURN
-  for config in $hmConfigs; do
-    log "Building $config"
-    path=$(nix build --print-out-paths ".#homeConfigurations.$config.activationPackages")
-    log "Calculating size of $config"
-    nix path-info --closure-size --json "$path" |
-      jq --compact-output --arg pkg "$config" '.[] | {"name": $pkg, "size": .closureSize, "narSize": .narSize}'
-  done
-}
-
-nixos_configs_json() {
-  group 'Building NixOS configurations'
-  trap endgroup RETURN
-  for config in $nixosConfigs; do
-    log "Building $config"
-    path=$(nix build --print-out-paths ".#nixosConfigurations.$config.config.system.build.toplevel")
-    log "Calculating size of $config"
-    nix path-info --closure-size --json "$path" |
-      jq --compact-output --arg pkg "$config" '.[] | {"name": $pkg, "size": .closureSize, "narSize": .narSize}'
-  done
-}
-
-pkgs=$(pkgs_json | jq --slurp '.')
-hmConfigs=$(hm_configs_json | jq --slurp '.')
-nixosConfigs=$(nixos_configs_json | jq --slurp '.')
-
-echo "{}" | jq \
-  --argjson pkgs "$pkgs" \
-  --argjson nixosConfigs "$nixosConfigs" \
-  --argjson hmConfigs "$hmConfigs" \
-  '{"packages": $pkgs, "nixosConfigurations": $nixosConfigs, "homeConfigurations": $hmConfigs}'
diff --git a/flake.lock b/flake.lock
index 7e05325..a6376f4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,18 +20,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741513245,
-        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
-        "type": "github"
+        "lastModified": 1752076035,
+        "narHash": "sha256-ROMKbpfgrbogAWXNXJxUu+BoPyZdOq/MQ3UNYVP863o=",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre826938.9807714d6944/nixexprs.tar.xz?rev=9807714d6944a957c2e036f84b0ff8caf9930bc0"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
       }
     },
     "nixpkgs-lib": {
diff --git a/flake.nix b/flake.nix
index 46e3e7b..35db44f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     flake-parts.url = "github:hercules-ci/flake-parts";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/comment_on_pr.sh b/scripts/comment_on_pr.sh
similarity index 98%
rename from comment_on_pr.sh
rename to scripts/comment_on_pr.sh
index 9122a22..b927400 100755
--- a/comment_on_pr.sh
+++ b/scripts/comment_on_pr.sh
@@ -2,9 +2,9 @@
 
 set -eu
 
-util_path="${GITHUB_ACTION_PATH:-.}/utils.sh"
+util_path="${GITHUB_ACTION_PATH:-.}/scripts/utils.sh"
 
-# shellcheck source=utils.sh
+# shellcheck source=scripts/utils.sh
 . "${util_path}"
 
 # USAGE: json_to_md_rows <FIELD> [JSON_FILE]
diff --git a/scripts/create-report.sh b/scripts/create-report.sh
new file mode 100755
index 0000000..cfe4209
--- /dev/null
+++ b/scripts/create-report.sh
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+set -eu
+
+util_path="${GITHUB_ACTION_PATH:-.}/scripts/utils.sh"
+
+# shellcheck source=scripts/utils.sh
+. "${util_path}"
+
+group 'Retrieving Flake information'
+flake_info=$(nix flake show --json --quiet --quiet)
+endgroup
+
+system=$(nix eval --impure --json --expr 'builtins.currentSystem')
+
+group 'Show Packages'
+packages=$(echo "$flake_info" | jq --raw-output --argjson system "$system" 'getpath(["packages", $system]) | select(. != null) | keys[]')
+[ -z "$packages" ] || log "$packages"
+endgroup
+
+group 'Show Home Manager Configurations'
+hmConfigs=$(echo "$flake_info" | jq --raw-output '.homeConfigurations | select(. != null) | keys[]')
+[ -z "$hmConfigs" ] || log "$hmConfigs"
+endgroup
+
+group 'Show NixOS Configurations'
+nixosConfigs=$(echo "$flake_info" | jq --raw-output '.nixosConfigurations | select(. != null) | keys[]')
+[ -z "$nixosConfigs" ] || log "$nixosConfigs"
+endgroup
+
+closure_size() {
+  name=$1
+  path=$2
+  log "Calculating size of $name at $path"
+  path_info=$(nix path-info --closure-size --json "$path")
+  echo "$path_info" |
+    jq --compact-output \
+      --arg pkg "$name" \
+      --arg path "$path" \
+      '.[] | {"name": $pkg, "path": $path, "size": .closureSize, "narSize": .narSize, "raw": .}'
+}
+
+pkgs_json() {
+  for package in $packages; do
+    log "Building $package"
+    path=$(nix build --print-out-paths ".#$package")
+    closure_size "$package" "$path"
+  done
+}
+
+hm_configs_json() {
+  for config in $hmConfigs; do
+    log "Building $config"
+    path=$(nix build --print-out-paths ".#homeConfigurations.$config.activationPackages")
+    closure_size "$config" "$path"
+  done
+}
+
+nixos_configs_json() {
+  for config in $nixosConfigs; do
+    log "Building $config"
+    path=$(nix build --print-out-paths ".#nixosConfigurations.$config.config.system.build.toplevel")
+    closure_size "$config" "$path"
+  done
+}
+
+group 'Building packages'
+pkgs=$(pkgs_json | jq --slurp .)
+endgroup
+group 'Building Home Manager configurations'
+hmConfigs=$(hm_configs_json | jq --slurp .)
+endgroup
+group 'Building NixOS configurations'
+nixosConfigs=$(nixos_configs_json | jq --slurp .)
+endgroup
+
+echo "{}" | jq \
+  --argjson pkgs "$pkgs" \
+  --argjson hmConfigs "$hmConfigs" \
+  --argjson nixosConfigs "$nixosConfigs" \
+  '{"packages": $pkgs, "nixosConfigurations": $nixosConfigs, "homeConfigurations": $hmConfigs}' >"${1:-/dev/stdout}"
diff --git a/retrieve-old-report.sh b/scripts/retrieve-old-report.sh
similarity index 93%
rename from retrieve-old-report.sh
rename to scripts/retrieve-old-report.sh
index 14a48db..ee83f08 100755
--- a/retrieve-old-report.sh
+++ b/scripts/retrieve-old-report.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${GITHUB_ACTION_PATH}/utils.sh"
+. "${GITHUB_ACTION_PATH}/scripts/utils.sh"
 
 repo_info() {
   curl -X GET \
@@ -74,6 +74,7 @@ curl -X 'GET' \
   tar -zvx --strip-components=1 -C "$old"
 endgroup
 
-(cd "$old" && "$GITHUB_ACTION_PATH/create-report.sh") >old-report.json
+repo_dir=$PWD
+(cd "$old" && "$GITHUB_ACTION_PATH/scripts/create-report.sh" "$repo_dir"/old-report.json)
 
 exit 0
diff --git a/utils.sh b/scripts/utils.sh
similarity index 79%
rename from utils.sh
rename to scripts/utils.sh
index e61c2a3..74c31a3 100755
--- a/utils.sh
+++ b/scripts/utils.sh
@@ -13,9 +13,9 @@ error() {
 }
 
 group() {
-  log "::group::$1"
+  echo "::group::$1"
 }
 
 endgroup() {
-  log '::endgroup::'
+  echo '::endgroup::'
 }