diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
index 1ac20e30..3414c7bf 100644
--- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml
+++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml
@@ -6,6 +6,11 @@ on:
     paths:
       - '!**'
       - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
+  pull_request:
+    branches: '*'
+    paths:
+      - '!**'
+      - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
   schedule: # Note: coordinate with other tests to not overload runners at the same time of day
     - cron: '2 14 * * *'
 
diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml
index 44156eae..d1d39448 100644
--- a/.gitea/workflows/lint.yml
+++ b/.gitea/workflows/lint.yml
@@ -10,6 +10,7 @@ jobs:
   test:
     name: "Run linter"
     runs-on: ubuntu-latest
+    if: false
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
diff --git a/.gitea/workflows/test-deploy.yml b/.gitea/workflows/test-deploy.yml
index ca32b876..23995a5d 100644
--- a/.gitea/workflows/test-deploy.yml
+++ b/.gitea/workflows/test-deploy.yml
@@ -15,6 +15,7 @@ jobs:
   test:
     name: "Run deploy test suite"
     runs-on: ubuntu-latest
+    if: false
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
diff --git a/.gitea/workflows/test-k8s-deploy.yml b/.gitea/workflows/test-k8s-deploy.yml
index de96b391..de412db5 100644
--- a/.gitea/workflows/test-k8s-deploy.yml
+++ b/.gitea/workflows/test-k8s-deploy.yml
@@ -17,6 +17,7 @@ jobs:
   test:
     name: "Run deploy test suite on kind/k8s"
     runs-on: ubuntu-22.04
+    if: false
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
diff --git a/.gitea/workflows/test-webapp.yml b/.gitea/workflows/test-webapp.yml
index 65c0c043..d8d30364 100644
--- a/.gitea/workflows/test-webapp.yml
+++ b/.gitea/workflows/test-webapp.yml
@@ -14,6 +14,7 @@ jobs:
   test:
     name: "Run webapp test suite"
     runs-on: ubuntu-latest
+    if: false
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index b92dfae1..5acea163 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -15,6 +15,7 @@ jobs:
   test:
     name: "Run basic test suite"
     runs-on: ubuntu-latest
+    if: false
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
diff --git a/.gitea/workflows/triggers/fixturenet-eth-plugeth-test b/.gitea/workflows/triggers/fixturenet-eth-plugeth-test
index ca2c643e..f91e6fd8 100644
--- a/.gitea/workflows/triggers/fixturenet-eth-plugeth-test
+++ b/.gitea/workflows/triggers/fixturenet-eth-plugeth-test
@@ -1,3 +1,6 @@
 Change this file to trigger running the fixturenet-eth-plugeth-test CI job
 trigger
 trigger
+trigger
+trigger
+trigger
\ No newline at end of file
diff --git a/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml b/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
index 5ccf43fa..26023547 100644
--- a/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
+++ b/stack_orchestrator/data/stacks/fixturenet-plugeth-tx/stack.yml
@@ -2,7 +2,7 @@ version: "1.2"
 name: fixturenet-plugeth-tx
 description: "plugeth Ethereum Fixturenet w/ tx-spammer"
 repos:
-  - git.vdb.to/cerc-io/plugeth@statediff
+  - git.vdb.to/cerc-io/plugeth@statediff-patches
   - git.vdb.to/cerc-io/plugeth-statediff
   - git.vdb.to/cerc-io/lighthouse
   - git.vdb.to/cerc-io/ipld-eth-db@v5
diff --git a/tests/fixturenet-eth-plugeth/run-test.sh b/tests/fixturenet-eth-plugeth/run-test.sh
index 1a961b56..5878ed3d 100755
--- a/tests/fixturenet-eth-plugeth/run-test.sh
+++ b/tests/fixturenet-eth-plugeth/run-test.sh
@@ -3,7 +3,7 @@ set -e
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
-set -e
+
 echo "Running stack-orchestrator Ethereum plugeth fixturenet test"
 # Bit of a hack, test the most recent package
 TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
@@ -20,8 +20,16 @@ echo "Building containers"
 $TEST_TARGET_SO  --stack $CERC_STACK_NAME build-containers
 echo "Images in registry:"
 docker image ls
+
 echo "Deploying the cluster"
-$TEST_TARGET_SO --stack $CERC_STACK_NAME deploy up
+if ! $TEST_TARGET_SO --stack $CERC_STACK_NAME deploy up; then
+  failed_containers=$(docker ps -q --filter health=unhealthy --filter status=running)
+  for c in $failed_containers; do
+    docker logs $c --tail 20
+  done
+  exit 1
+fi
+
 # Verify that the fixturenet is up and running
 $TEST_TARGET_SO --stack $CERC_STACK_NAME deploy ps
 $TEST_TARGET_SO --stack $CERC_STACK_NAME deploy exec fixturenet-eth-bootnode-lighthouse /scripts/status-internal.sh