diff --git a/.github/actions/node/21/action.yml b/.github/actions/node/21/action.yml
new file mode 100644
index 00000000000..0792701558f
--- /dev/null
+++ b/.github/actions/node/21/action.yml
@@ -0,0 +1,7 @@
+name: Node 21
+runs:
+  using: composite
+  steps:
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '21'
diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
index bcf08ddb137..bd8be033a73 100644
--- a/.github/workflows/appsec.yml
+++ b/.github/workflows/appsec.yml
@@ -31,7 +31,7 @@ jobs:
       - run: yarn test:appsec:ci
       - uses: ./.github/actions/node/20
       - run: yarn test:appsec:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:ci
       - uses: codecov/codecov-action@v3
 
@@ -65,7 +65,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:plugins:ci
       - uses: codecov/codecov-action@v3
 
@@ -127,7 +127,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:plugins:ci
       - uses: codecov/codecov-action@v3
 
@@ -141,7 +141,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:plugins:ci
       - uses: codecov/codecov-action@v3
 
@@ -161,7 +161,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:plugins:ci
       - uses: codecov/codecov-action@v3
 
@@ -181,7 +181,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:plugins:ci
       - uses: codecov/codecov-action@v3
 
@@ -197,7 +197,7 @@ jobs:
       - run: yarn test:appsec:plugins:ci
       - uses: ./.github/actions/node/20
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:plugins:ci
       - uses: codecov/codecov-action@v3
 
@@ -212,7 +212,7 @@ jobs:
       - run: yarn install
       - uses: ./.github/actions/node/oldest
       - run: yarn test:appsec:plugins:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:appsec:plugins:ci
       - if: always()
         uses: ./.github/actions/testagent/logs
diff --git a/.github/workflows/profiling.yml b/.github/workflows/profiling.yml
index 1f54c5a4c51..52e900dc27d 100644
--- a/.github/workflows/profiling.yml
+++ b/.github/workflows/profiling.yml
@@ -34,7 +34,7 @@ jobs:
       - uses: ./.github/actions/node/20
       - run: yarn test:profiler:ci
       - run: yarn test:integration:profiler
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:profiler:ci
       - run: yarn test:integration:profiler
       - uses: codecov/codecov-action@v3
diff --git a/.github/workflows/tracing.yml b/.github/workflows/tracing.yml
index cd54e25eb7e..5bdf8e4a2cc 100644
--- a/.github/workflows/tracing.yml
+++ b/.github/workflows/tracing.yml
@@ -31,7 +31,7 @@ jobs:
       - run: yarn test:trace:core:ci
       - uses: ./.github/actions/node/20
       - run: yarn test:trace:core:ci
-      - uses: ./.github/actions/node/latest
+      - uses: ./.github/actions/node/21
       - run: yarn test:trace:core:ci
       - uses: codecov/codecov-action@v3
 
diff --git a/packages/datadog-plugin-pino/test/index.spec.js b/packages/datadog-plugin-pino/test/index.spec.js
index 14708c6bf94..913885c8fca 100644
--- a/packages/datadog-plugin-pino/test/index.spec.js
+++ b/packages/datadog-plugin-pino/test/index.spec.js
@@ -133,7 +133,7 @@ describe('Plugin', () => {
               } else { // pino <7
                 expect(record).to.have.property('msg', error.message)
                 // ** TODO ** add this back once we fix it
-                if (NODE_MAJOR !== 21) {
+                if (NODE_MAJOR < 21) {
                   expect(record).to.have.property('type', 'Error')
                   expect(record).to.have.property('stack', error.stack)
                 }