diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index 939f27732..bfe062f8c 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -45,6 +45,7 @@ const rules = {
   "chart-remove-allowZoom": require('./lib/rules/v4/chartVoronoiContainer-remove-allowTooltip'),
   "react-icons-remove-icon": require('./lib/rules/v4/react-icons-remove-icon'),
   "toolbar-remove-visiblity": require('./lib/rules/v5/toolbar-remove-visiblity'),
+  "tooltip-remove-props": require('./lib/rules/v5/tooltip-remove-props'),
   "divider-remove-isVertical": require('./lib/rules/v5/divider-remove-isVertical'),
 };
 
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/tooltip-remove-props.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/tooltip-remove-props.js
new file mode 100644
index 000000000..45c439916
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/tooltip-remove-props.js
@@ -0,0 +1,15 @@
+const { renameProps } = require('../../helpers');
+
+const renames = {
+  Tooltip: {
+    'boundary': '',
+    'isAppLauncher': '',
+    'tippyProps': ''
+  }
+};
+
+// https://github.com/patternfly/patternfly-react/pull/8231
+module.exports = {
+  meta: { fixable: 'code' },
+  create: renameProps(renames)
+};
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/tooltip-remove-props.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/tooltip-remove-props.js
new file mode 100644
index 000000000..66211a8e1
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/tooltip-remove-props.js
@@ -0,0 +1,32 @@
+const ruleTester = require('../../ruletester');
+const rule = require('../../../lib/rules/v5/tooltip-remove-props');
+
+ruleTester.run("tooltip-remove-props", rule, {
+  valid: [
+    {
+      code: `import { Tooltip } from '@patternfly/react-core'; <Tooltip />`,
+    },
+    {
+      // No @patternfly/react-core import
+      code: `<Tooltip boundary={} tippyProps={} isAppLauncher />`,
+    }
+  ],
+  invalid: [
+    {
+      code:   `import { Tooltip } from '@patternfly/react-core'; <Tooltip boundary={} tippyProps={} isAppLauncher />`,
+      output: `import { Tooltip } from '@patternfly/react-core'; <Tooltip    />`,
+      errors: [{
+        message: `boundary prop for Tooltip has been removed`,
+        type: "JSXOpeningElement",
+      },
+      {
+        message: `tippyProps prop for Tooltip has been removed`,
+        type: "JSXOpeningElement",
+      },
+      {
+        message: `isAppLauncher prop for Tooltip has been removed`,
+        type: "JSXOpeningElement",
+      }]
+    }
+  ]
+});
diff --git a/packages/pf-codemods/README.md b/packages/pf-codemods/README.md
index 68c285f72..69a598944 100644
--- a/packages/pf-codemods/README.md
+++ b/packages/pf-codemods/README.md
@@ -73,3 +73,21 @@ Out:
 ```jsx
 <ToolbarContent visibility={{ default: "hidden" }} />
 ```
+
+### tooltip-remove-props [(#8231)](https://github.com/patternfly/patternfly-react/pull/8231)
+
+We've removed the `boundary`, `tippyProps`, and `isAppLauncher` properties from Tooltip.
+
+#### Examples
+
+In:
+
+```jsx
+<Tooltip boundary={} tippyProps={} isAppLauncher />
+```
+
+Out:
+
+```jsx
+<Tooltip     />
+```