diff --git a/.github/workflows/_unit_test.yml b/.github/workflows/_unit_test.yml
index 632aeaeaaa0..41215cbc6af 100644
--- a/.github/workflows/_unit_test.yml
+++ b/.github/workflows/_unit_test.yml
@@ -56,7 +56,7 @@ jobs:
       cache-key: "${{ steps.bundle-cache.outputs.cache-key }}"
       lockfile: "${{ steps.bundle-cache.outputs.lockfile }}"
     container:
-      image: ghcr.io/datadog/images-rb/engines/${{ inputs.engine }}:${{ inputs.version }}
+      image: ghcr.io/datadog/images-rb/engines/${{ inputs.engine }}:${{ inputs.version }}-gnu-gcc
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
@@ -122,7 +122,7 @@ jobs:
       matrix:
         include: "${{ fromJson(needs.batch.outputs.batches).include }}"
     container:
-      image: ghcr.io/datadog/images-rb/engines/${{ inputs.engine }}:${{ inputs.version }}
+      image: ghcr.io/datadog/images-rb/engines/${{ inputs.engine }}:${{ inputs.version }}-gnu-gcc
       env:
         DD_INSTRUMENTATION_TELEMETRY_ENABLED: 'false'
         DD_REMOTE_CONFIGURATION_ENABLED: 'false'
@@ -187,7 +187,7 @@ jobs:
       matrix:
         include: "${{ fromJson(needs.batch.outputs.misc).include }}"
     container:
-      image: ghcr.io/datadog/images-rb/engines/${{ inputs.engine }}:${{ inputs.version }}
+      image: ghcr.io/datadog/images-rb/engines/${{ inputs.engine }}:${{ inputs.version }}-gnu-gcc
       env:
         DD_INSTRUMENTATION_TELEMETRY_ENABLED: 'false'
         DD_REMOTE_CONFIGURATION_ENABLED: 'false'
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 6446247594e..c178741470d 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,7 +19,7 @@ jobs:
   build:
     name: build
     runs-on: ubuntu-24.04
-    container: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    container: ghcr.io/datadog/images-rb/engines/ruby:3.3-gnu-gcc
     outputs:
       lockfile: ${{ steps.bundle-cache.outputs.lockfile }}
       cache-key: ${{ steps.bundle-cache.outputs.cache-key }}
@@ -35,7 +35,7 @@ jobs:
     name: rubocop/lint
     runs-on: ubuntu-24.04
     needs: ['build']
-    container: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    container: ghcr.io/datadog/images-rb/engines/ruby:3.3-gnu-gcc
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -51,7 +51,7 @@ jobs:
     name: standard/lint
     runs-on: ubuntu-24.04
     needs: ['build']
-    container: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    container: ghcr.io/datadog/images-rb/engines/ruby:3.3-gnu-gcc
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -67,7 +67,7 @@ jobs:
     name: lint/frozen_string_literal
     runs-on: ubuntu-24.04
     needs: ['build']
-    container: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    container: ghcr.io/datadog/images-rb/engines/ruby:3.3-gnu-gcc
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -83,7 +83,7 @@ jobs:
     name: steep/typecheck
     runs-on: ubuntu-24.04
     needs: ['build']
-    container: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    container: ghcr.io/datadog/images-rb/engines/ruby:3.3-gnu-gcc
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
diff --git a/.github/workflows/lock-dependency.yml b/.github/workflows/lock-dependency.yml
index aa621892fa1..0bbfb209005 100644
--- a/.github/workflows/lock-dependency.yml
+++ b/.github/workflows/lock-dependency.yml
@@ -59,7 +59,7 @@ jobs:
           - name: jruby
             version: '9.2'
     container:
-      image: ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}
+      image: ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}-gnu-gcc
       env:
         BUNDLE_WITHOUT: check
     steps:
diff --git a/.github/workflows/update-latest-dependency.yml b/.github/workflows/update-latest-dependency.yml
index f4c92309a51..f0968af4564 100644
--- a/.github/workflows/update-latest-dependency.yml
+++ b/.github/workflows/update-latest-dependency.yml
@@ -45,7 +45,7 @@ jobs:
           - name: jruby
             version: '9.2'
     container:
-      image: "ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}"
+      image: ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}-gnu-gcc
     steps:
       - name: Checkout code
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
diff --git a/.github/workflows/yard.yml b/.github/workflows/yard.yml
index 9730b54768c..263984a36ed 100644
--- a/.github/workflows/yard.yml
+++ b/.github/workflows/yard.yml
@@ -26,7 +26,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/datadog/images-rb/engines/ruby:3.2
+      image: ghcr.io/datadog/images-rb/engines/ruby:3.2-gnu-gcc
       env:
         BUNDLE_GEMFILE: tools/yard.gemfile
     steps:
diff --git a/docker-compose.yml b/docker-compose.yml
index eff0709ed58..f7220af21c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   tracer-2.5:
-    image: ghcr.io/datadog/images-rb/engines/ruby:2.5
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.5-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: &common-depends-on
@@ -41,7 +41,7 @@ services:
       - bundle-2.5:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-2.6:
-    image: ghcr.io/datadog/images-rb/engines/ruby:2.6
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.6-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -58,7 +58,7 @@ services:
       - bundle-2.6:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-2.7:
-    image: ghcr.io/datadog/images-rb/engines/ruby:2.7
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.7-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -75,7 +75,7 @@ services:
       - bundle-2.7:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-3.0:
-    image: ghcr.io/datadog/images-rb/engines/ruby:3.0
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.0-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -92,7 +92,7 @@ services:
       - bundle-3.0:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-3.1:
-    image: ghcr.io/datadog/images-rb/engines/ruby:3.1
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.1-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -109,7 +109,7 @@ services:
       - bundle-3.1:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-3.2:
-    image: ghcr.io/datadog/images-rb/engines/ruby:3.2
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.2-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -126,7 +126,7 @@ services:
       - bundle-3.2:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-3.3:
-    image: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.3-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -143,7 +143,7 @@ services:
       - bundle-3.3:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-3.4:
-    image: ghcr.io/datadog/images-rb/engines/ruby:3.4
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.4-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -161,7 +161,7 @@ services:
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   # ADD NEW RUBIES HERE
   tracer-jruby-9.2:
-    image: ghcr.io/datadog/images-rb/engines/jruby:9.2
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.2-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -177,7 +177,7 @@ services:
       - bundle-jruby-9.2:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-jruby-9.3:
-    image: ghcr.io/datadog/images-rb/engines/jruby:9.3
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.3-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on
@@ -193,7 +193,7 @@ services:
       - bundle-jruby-9.3:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
   tracer-jruby-9.4:
-    image: ghcr.io/datadog/images-rb/engines/jruby:9.4
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.4-gnu-gcc
     working_dir: /app
     command: /bin/bash
     depends_on: *common-depends-on