diff --git a/.github/actions/nix-cachix-setup/action.yml b/.github/actions/nix-cachix-setup/action.yml
index fcf19333bb5..6c24c24a284 100644
--- a/.github/actions/nix-cachix-setup/action.yml
+++ b/.github/actions/nix-cachix-setup/action.yml
@@ -9,6 +9,21 @@ runs:
   using: composite
 
   steps:
+  - name: 🧹 Free disk space
+    if: runner.os == 'Linux'
+    shell: bash
+    run: |
+      echo "Disk space before cleanup:"
+      df -h /
+      # Remove unnecessary tools to free up disk space
+      sudo rm -rf /usr/share/dotnet
+      sudo rm -rf /usr/local/lib/android
+      sudo rm -rf /opt/ghc
+      sudo rm -rf /opt/hostedtoolcache/CodeQL
+      sudo docker image prune --all --force || true
+      echo "Disk space after cleanup:"
+      df -h /
+
   - name: ❄ Prepare nix
     uses: cachix/install-nix-action@v30
     with:
diff --git a/.github/workflows/ci-nix.yaml b/.github/workflows/ci-nix.yaml
index 8477afbd02d..d3843fa4815 100644
--- a/.github/workflows/ci-nix.yaml
+++ b/.github/workflows/ci-nix.yaml
@@ -11,7 +11,11 @@ on:
     branches:
     - master
     - release
+    - v1.2.0-base
   pull_request:
+    branches:
+    - master
+    - v1.2.0-base
   schedule:
     # Everyday at 4:00 AM
     - cron: "0 4 * * *"
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index e0021638606..f9262c0609f 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -11,8 +11,10 @@ concurrency:
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "v1.2.0-base" ]
     tags: [ "*.*.*" ]
+  pull_request:
+    branches: [ "master", "v1.2.0-base" ]
   workflow_dispatch:
     inputs:
       ref_name:
@@ -73,6 +75,12 @@ jobs:
         # And the version as the git commit.
         VERSION=${{github.sha}}
 
+        # For PRs, tag as pr-<number>
+        if [[ "${{github.event_name}}" == "pull_request" ]]; then
+          IMAGE_LABEL=pr-${{github.event.pull_request.number}}
+          VERSION=${{github.event.pull_request.head.sha}}
+        fi
+
         # Determine whether we are building a tag and if yes, set the label
         # name to be the tag name, and the version to be the tag.
         BUILDING_TAG=${{github.ref_type == 'tag'}}
diff --git a/hydra-node/hydra-node.cabal b/hydra-node/hydra-node.cabal
index 90205b097b8..2ff54fa1451 100644
--- a/hydra-node/hydra-node.cabal
+++ b/hydra-node/hydra-node.cabal
@@ -36,6 +36,7 @@ common project-config
     OverloadedStrings
     PartialTypeSignatures
     PatternSynonyms
+    StrictData
     TypeFamilies
     ViewPatterns
 
diff --git a/hydra-node/src/Hydra/Chain.hs b/hydra-node/src/Hydra/Chain.hs
index 21f63c9e792..7b79cffc7f5 100644
--- a/hydra-node/src/Hydra/Chain.hs
+++ b/hydra-node/src/Hydra/Chain.hs
@@ -47,7 +47,7 @@ import Test.QuickCheck.Instances.Time ()
 
 -- | Hardcoded limit for commit tx on mainnet
 maxMainnetLovelace :: Coin
-maxMainnetLovelace = Coin 100_000_000
+maxMainnetLovelace = Coin 1_000_000_000
 
 -- | Hardcoded limit for maximum number of parties in a head protocol The value
 -- is obtained from calculating the costs of running the scripts and on-chan