diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cb2d21341342..8fe881db1331 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -43,25 +43,26 @@ jobs:
           git rebase origin/${{ github.base_ref }}
 
       - name: Check changelog
+        env:
+          PR_DESCRIPTION: "${{ github.event.pull_request.body || '' }}"
+          EVENT_NAME: "${{ github.event_name }}"
+          BASE_REF: "${{ github.base_ref || 'master' }}"
         run: |
-          EVENT_NAME="${{ github.event_name }}"
-          BASE_REF="${{ github.base_ref }}"
-          if [ -z "$BASE_REF" ]; then
-            BASE_REF="master"
-          fi
           echo "Event Name: $EVENT_NAME"
           echo "Base Ref: $BASE_REF"
-
+          echo "PR DESCRIPTION: $PR_DESCRIPTION"
           if [ "$EVENT_NAME" = "pull_request" ]; then
-            PR_DESCRIPTION="$(echo '${{ github.event.pull_request.body }}')"
-            echo "PR Description: $PR_DESCRIPTION"
-            if [[ -z "$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')" && \
-              "$(git rev-parse --abbrev-ref HEAD)" != "$BASE_REF" && \
-              "$PR_DESCRIPTION" != *"Changelog-None"* ]]; then
+            if [[ "$PR_DESCRIPTION" != *"Changelog-None"* && \
+                  -z "$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')" && \
+                  "$(git rev-parse --abbrev-ref HEAD)" != "$BASE_REF" ]]; then
               echo "::error::'Changelog' entry is missing in all commits, and 'Changelog-None' not specified in the PR description"
               exit 1
             else
-              echo "Changelog found."
+              if [[ "$PR_DESCRIPTION" == *"Changelog-None"* ]]; then
+                echo "Changelog found in PR description"
+              else
+                echo "Changelog found in Commit \"$(git log origin/$BASE_REF..HEAD --oneline --grep='Changelog-')\""
+              fi
             fi
           else
             echo "Not a PR event."
diff --git a/contrib/giantnode.py b/contrib/giantnode.py
index 0c14eecb3175..24e2ae624b26 100755
--- a/contrib/giantnode.py
+++ b/contrib/giantnode.py
@@ -41,13 +41,9 @@
 
 args = parser.parse_args()
 
-nodes = (LightningRpc('/tmp/l1-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l2-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l3-regtest/regtest/lightning-rpc'))
-
-nodes = (LightningRpc('/tmp/l1-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l2-regtest/regtest/lightning-rpc'),
-         LightningRpc('/tmp/l3-regtest/regtest/lightning-rpc'))
+nodes = (LightningRpc('/tmp/l1/regtest/lightning-rpc'),
+         LightningRpc('/tmp/l2/regtest/lightning-rpc'),
+         LightningRpc('/tmp/l3/regtest/lightning-rpc'))
 
 # Convenient aliases
 l1 = nodes[0]
@@ -59,9 +55,9 @@
         print("""
 Bookkeeper is running on l1, will slow things down!  Run this:
 
-echo 'disable-plugin=bookkeeper' >> /tmp/l1-regtest/regtest/config
-echo 'disable-plugin=bookkeeper' >> /tmp/l2-regtest/regtest/config
-echo 'disable-plugin=bookkeeper' >> /tmp/l3-regtest/regtest/config
+echo 'disable-plugin=bookkeeper' >> /tmp/l1/regtest/config
+echo 'disable-plugin=bookkeeper' >> /tmp/l2/regtest/config
+echo 'disable-plugin=bookkeeper' >> /tmp/l3/regtest/config
 stop_ln
 start_ln 3
 """)