diff --git a/package.json b/package.json
index 4a07398a80d56..77368f5caa7ee 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "@elastic/ems-client": "7.11.0",
     "@elastic/eui": "30.2.0",
     "@elastic/filesaver": "1.1.2",
-    "@elastic/good": "watson/good#fix-pipeline",
+    "@elastic/good": "^9.0.1-kibana3",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",
diff --git a/yarn.lock b/yarn.lock
index e6b3b36f94f46..af1a1493bc36a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1489,9 +1489,10 @@
     async-retry "^1.2.3"
     strip-ansi "^5.2.0"
 
-"@elastic/good@watson/good#fix-pipeline":
-  version "9.0.1-kibana1"
-  resolved "https://codeload.github.com/watson/good/tar.gz/cd16af871cd4c30d374e6e262610694176bf3220"
+"@elastic/good@^9.0.1-kibana3":
+  version "9.0.1-kibana3"
+  resolved "https://registry.yarnpkg.com/@elastic/good/-/good-9.0.1-kibana3.tgz#a70c2b30cbb4f44d1cf4a464562e0680322eac9b"
+  integrity sha512-UtPKr0TmlkL1abJfO7eEVUTqXWzLKjMkz+65FvxU/Ub9kMAr4No8wHLRfDHFzBkWoDIbDWygwld011WzUnea1Q==
   dependencies:
     "@hapi/hoek" "9.x.x"
     "@hapi/oppsy" "3.x.x"