diff --git a/.github/workflows/build_layer.yml b/.github/workflows/build_layer.yml
index 7368a517..e146ee0f 100644
--- a/.github/workflows/build_layer.yml
+++ b/.github/workflows/build_layer.yml
@@ -2,6 +2,7 @@ name: Build Layers for system-Tests
 
 on:
   workflow_dispatch:
+  pull_request:
   push:
     branches:
       - "main"
diff --git a/Dockerfile b/Dockerfile
index d3ba70da..ce59438d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ RUN set -eux; \
       rm gcc && ln -s gcc10-gcc gcc; \
       rm g++ && ln -s gcc10-g++ g++; \
       rm cc && ln -s gcc10-cc cc; \
+      rm c++ && ln -s gcc10-c++ c++; \
     fi
 
 # Add Rust compiler which is needed to build dd-trace-py from source