diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f2b6cae..264bf9ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,16 +1,13 @@
 name: Build and push latest image
 
 on:
+  pull_request:
+    branches:
+      - main
   push:
     branches:
       - main
       - stable
-  schedule:
-    # We run it every 4 hours, starting at 02:15.
-    # Note that this will only update the 'latest' tag (not the 'stable' tag).
-    # Ideally, we would update the image every time the base image
-    # (p4lang/third-party) is updated, but we deem this good enough.
-    - cron: '15 2-23/4 * * *' # "At minute 15 past every 4th hour from 2 through 23."
 
 jobs:
   build:
@@ -24,15 +21,7 @@ jobs:
       id: get-tag
       shell: bash
       run: |
-        TAG=""
-        if [[ "$GITHUB_REF" =~ "main" ]]; then
-            TAG="latest"
-        elif [[ "$GITHUB_REF" =~ "stable" ]]; then
-            TAG="stable"
-        else
-            echo "Invalid Github ref $GITHUB_REF"
-            exit 1
-        fi
+        TAG="latest-24"
         echo "Tag is $TAG"
         echo "::set-output name=tag::$TAG"
     - name: Set up Docker Buildx
diff --git a/Dockerfile b/Dockerfile
index 8caef82f..f91ed242 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
 
 # Antonin Bas (antonin@barefootnetworks.com)
 
-FROM p4lang/third-party:latest
+FROM p4lang/third-party:latest-24
 LABEL maintainer="P4 Developers <p4-dev@lists.p4.org>"
 LABEL description="This Docker image includes only the most widely-used PI \
 artifacts: PI core and P4Runtime. It does not include the Thrift-based PI \
@@ -40,8 +40,8 @@ ENV PI_DEPS automake \
             libboost-thread-dev \
             libtool \
             pkg-config
-ENV PI_RUNTIME_DEPS libboost-system1.71.0 \
-                    libboost-thread1.71.0 \
+ENV PI_RUNTIME_DEPS libboost-system1.74.0 \
+                    libboost-thread1.74.0 \
                     python3 \
                     python-is-python3