diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47203fd9..044c8c7f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -277,28 +277,28 @@ job_configuration:
   # MRI
   - &config-2_7
     <<: *filters_all_branches_and_tags
-    ruby_version: 'ruby-2.7.6'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.6-dd
+    ruby_version: 'ruby-2.7'
+    image:  ghcr.io/datadog/images-rb/engines/ruby:2.7
     resource_class_to_use: medium+
   - &config-3_0
     <<: *filters_all_branches_and_tags
-    ruby_version: 'ruby-3.0.4'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.4-dd
+    ruby_version: 'ruby-3.0'
+    image:  ghcr.io/datadog/images-rb/engines/ruby:3.0
     resource_class_to_use: medium+
   - &config-3_1
     <<: *filters_all_branches_and_tags
-    ruby_version: 'ruby-3.1.2'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd
+    ruby_version: 'ruby-3.1'
+    image:  ghcr.io/datadog/images-rb/engines/ruby:3.1
     resource_class_to_use: medium+
   - &config-3_2
     <<: *filters_all_branches_and_tags
-    ruby_version: 'ruby-3.2.0'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
+    ruby_version: 'ruby-3.2'
+    image:  ghcr.io/datadog/images-rb/engines/ruby:3.2
     resource_class_to_use: medium+
   - &config-3_3
     <<: *filters_all_branches_and_tags
-    ruby_version: 'ruby-3.3.0'
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
+    ruby_version: 'ruby-3.3'
+    image:  ghcr.io/datadog/images-rb/engines/ruby:3.3
     resource_class_to_use: medium+
   - &config-3_2-small
     <<: *config-3_2
@@ -306,8 +306,8 @@ job_configuration:
     # ADD NEW RUBIES HERE
   - &config-jruby-9_4
     <<: *filters_all_branches_and_tags
-    ruby_version: 'jruby-9.4.7.0'
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd
+    ruby_version: 'jruby-9.4'
+    image:  ghcr.io/datadog/images-rb/engines/jruby:9.4
     resource_class_to_use: medium+
 
 workflows:
diff --git a/docker-compose.yml b/docker-compose.yml
index d152fafd..04f419e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,8 @@
 services:
   # MRI
   datadog-ci-2.7:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:2.7.6-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:2.7
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment: &common-environment
@@ -13,7 +14,8 @@ services:
       - .:/app
       - bundle-2.7:/usr/local/bundle
   datadog-ci-3.0:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.0.4-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.0
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment: &common-environment-3x
@@ -24,7 +26,8 @@ services:
       - .:/app
       - bundle-3.0:/usr/local/bundle
   datadog-ci-3.1:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.1.2-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.1
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment:
@@ -36,7 +39,8 @@ services:
       - .:/app
       - bundle-3.1:/usr/local/bundle
   datadog-ci-3.2:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.2
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment:
@@ -48,7 +52,8 @@ services:
       - .:/app
       - bundle-3.2:/usr/local/bundle
   datadog-ci-3.3:
-    image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
+    image: ghcr.io/datadog/images-rb/engines/ruby:3.3
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment:
@@ -61,7 +66,8 @@ services:
       - bundle-3.3:/usr/local/bundle
   # ADD NEW RUBIES HERE
   datadog-ci-jruby-9.4:
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd
+    image: ghcr.io/datadog/images-rb/engines/jruby:9.4
+    working_dir: /app
     command: /bin/bash
     env_file: ./.env
     environment: