diff --git a/aap_chatbot/package-lock.json b/aap_chatbot/package-lock.json
index c14d63ea9..038853951 100644
--- a/aap_chatbot/package-lock.json
+++ b/aap_chatbot/package-lock.json
@@ -294,6 +294,7 @@
       "version": "7.27.6",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
       "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -878,12 +879,12 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz",
-      "integrity": "sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
       "dev": true,
       "dependencies": {
-        "@eslint/core": "^0.15.1",
+        "@eslint/core": "^0.15.2",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -891,9 +892,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -1277,9 +1278,9 @@
       }
     },
     "node_modules/@patternfly/chatbot": {
-      "version": "6.3.0-prerelease.25",
-      "resolved": "https://registry.npmjs.org/@patternfly/chatbot/-/chatbot-6.3.0-prerelease.25.tgz",
-      "integrity": "sha512-uo6TzQ+3OeWWdHDmiwSJEqBXkYNJoOnn7woMy1qUZU1/qlh2EBeGPKRJmumI21Zpu2dFn4jWLWFaDLgiBN+hwQ==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/@patternfly/chatbot/-/chatbot-6.3.2.tgz",
+      "integrity": "sha512-3GYlWxgNUrW/U0xfsvRzn77DZVr5snAGe8lPj7zAuAiL7gSvjqrpvKiNot8whV3t1PepksYK2az1AVc5z02QmQ==",
       "dependencies": {
         "@patternfly/react-code-editor": "^6.1.0",
         "@patternfly/react-core": "^6.1.0",
@@ -1291,7 +1292,6 @@
         "path-browserify": "^1.0.1",
         "posthog-js": "^1.194.4",
         "react-markdown": "^9.0.1",
-        "react-syntax-highlighter": "^15.5.0",
         "rehype-external-links": "^3.0.0",
         "rehype-sanitize": "^6.0.0",
         "rehype-unwrap-images": "^1.0.0",
@@ -5391,18 +5391,6 @@
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/fault": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
-      "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
-      "dependencies": {
-        "format": "^0.2.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/fflate": {
       "version": "0.4.8",
       "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz",
@@ -5537,9 +5525,9 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
-      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -5551,14 +5539,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/format": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-      "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/framer-motion": {
       "version": "11.18.2",
       "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.18.2.tgz",
@@ -5965,15 +5945,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-util-parse-selector": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz",
-      "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/hast-util-sanitize": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-5.0.2.tgz",
@@ -6026,65 +5997,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hastscript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
-      "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
-      "dependencies": {
-        "@types/hast": "^2.0.0",
-        "comma-separated-tokens": "^1.0.0",
-        "hast-util-parse-selector": "^2.0.0",
-        "property-information": "^5.0.0",
-        "space-separated-tokens": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hastscript/node_modules/@types/hast": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
-      "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
-      "dependencies": {
-        "@types/unist": "^2"
-      }
-    },
-    "node_modules/hastscript/node_modules/@types/unist": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
-      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="
-    },
-    "node_modules/hastscript/node_modules/comma-separated-tokens": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/hastscript/node_modules/property-information": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
-      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/hastscript/node_modules/space-separated-tokens": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -6094,19 +6006,6 @@
         "he": "bin/he"
       }
     },
-    "node_modules/highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/highlightjs-vue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/highlightjs-vue/-/highlightjs-vue-1.0.0.tgz",
-      "integrity": "sha512-PDEfEF102G23vHmPhLyPboFCD+BkMGu+GuJe2d9/eH4FsCwvgBpnc9n0pGE+ffKdph38s6foEZiEjdgHdzp+IA=="
-    },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
@@ -7023,19 +6922,6 @@
       "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
       "dev": true
     },
-    "node_modules/lowlight": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
-      "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
-      "dependencies": {
-        "fault": "^1.0.0",
-        "highlight.js": "~10.7.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -8624,14 +8510,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/prismjs": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -8831,22 +8709,6 @@
         "react-dom": ">=18"
       }
     },
-    "node_modules/react-syntax-highlighter": {
-      "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.6.1.tgz",
-      "integrity": "sha512-OqJ2/vL7lEeV5zTJyG7kmARppUjiB9h9udl4qHQjjgEos66z00Ia0OckwYfRxCSFrW8RJIBnsBwQsHZbVPspqg==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "highlight.js": "^10.4.1",
-        "highlightjs-vue": "^1.0.0",
-        "lowlight": "^1.17.0",
-        "prismjs": "^1.27.0",
-        "refractor": "^3.6.0"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14.0"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -8881,112 +8743,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/refractor": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz",
-      "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==",
-      "dependencies": {
-        "hastscript": "^6.0.0",
-        "parse-entities": "^2.0.0",
-        "prismjs": "~1.27.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dependencies": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/prismjs": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz",
-      "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
@@ -11303,14 +11059,6 @@
         }
       }
     },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
diff --git a/aap_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx b/aap_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx
index db6e9ccaf..5773070c3 100644
--- a/aap_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx
+++ b/aap_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx
@@ -108,6 +108,8 @@ export const AnsibleChatbot: React.FunctionComponent<ChatbotContext> = (
     hasStopButton,
     handleStopButton,
     isStreamingSupported,
+    bypassTools,
+    setBypassTools,
   } = useChatbot();
   const [chatbotVisible, setChatbotVisible] = useState<boolean>(true);
   const [displayMode] = useState<ChatbotDisplayMode>(
@@ -226,6 +228,8 @@ export const AnsibleChatbot: React.FunctionComponent<ChatbotContext> = (
                       <SystemPromptModal
                         systemPrompt={systemPrompt}
                         setSystemPrompt={setSystemPrompt}
+                        bypassTools={bypassTools}
+                        setBypassTools={setBypassTools}
                       />
                     )}
                   </ChatbotHeaderActions>
diff --git a/aap_chatbot/src/App.test.tsx b/aap_chatbot/src/App.test.tsx
index 085d7d87b..d0c8ba1d9 100644
--- a/aap_chatbot/src/App.test.tsx
+++ b/aap_chatbot/src/App.test.tsx
@@ -8,7 +8,6 @@ import React from "react";
 // vitest-browser-react documentation
 /* eslint-disable testing-library/prefer-screen-queries */
 /* eslint-disable no-nested-ternary */
-
 import { assert, beforeEach, expect, test, vi } from "vitest";
 import { render } from "vitest-browser-react";
 import { MemoryRouter } from "react-router-dom";
@@ -709,6 +708,40 @@ test("Test system prompt override", async () => {
   );
 });
 
+test("Test system prompt override with no_tools option", async () => {
+  const spy = mockAxios(200);
+  await renderApp(true);
+
+  await expect.element(page.getByLabelText("SystemPrompt")).toBeVisible();
+  const systemPromptIcon = page.getByLabelText("SystemPrompt");
+  await systemPromptIcon.click();
+
+  const systemPromptTextArea = page.getByLabelText(
+    "system-prompt-form-text-area",
+  );
+  await systemPromptTextArea.fill("MY SYSTEM PROMPT WITH NO_TOOLS OPTION");
+
+  const bypassToolsCheckbox = page.getByRole("checkbox");
+  expect(bypassToolsCheckbox).not.toBeChecked();
+  await bypassToolsCheckbox.click();
+  expect(bypassToolsCheckbox).toBeChecked();
+
+  const systemPromptButton = page.getByLabelText("system-prompt-form-button");
+  await systemPromptButton.click();
+
+  await sendMessage("Hello with system prompt override with no_tools option");
+  expect(spy).toHaveBeenCalledWith(
+    expect.anything(),
+    expect.objectContaining({
+      conversation_id: undefined,
+      no_tools: true,
+      query: "Hello with system prompt override with no_tools option",
+      system_prompt: "MY SYSTEM PROMPT WITH NO_TOOLS OPTION",
+    }),
+    expect.anything(),
+  );
+});
+
 test("Chat streaming test", async () => {
   let ghIssueLinkSpy = 0;
   let ghIssueUrl = "";
diff --git a/aap_chatbot/src/SystemPromptModal/SystemPromptModal.tsx b/aap_chatbot/src/SystemPromptModal/SystemPromptModal.tsx
index 9aea47440..b43837b06 100644
--- a/aap_chatbot/src/SystemPromptModal/SystemPromptModal.tsx
+++ b/aap_chatbot/src/SystemPromptModal/SystemPromptModal.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import {
   Button,
+  Checkbox,
   Form,
   FormGroup,
   Modal,
@@ -15,13 +16,15 @@ import WrenchIcon from "@patternfly/react-icons/dist/esm/icons/wrench-icon";
 interface SystemPromptModalProps {
   systemPrompt: string;
   setSystemPrompt: (s: string) => void;
+  bypassTools: boolean;
+  setBypassTools: (b: boolean) => void;
 }
 
 export const SystemPromptModal: React.FunctionComponent<
   SystemPromptModalProps
 > = (props) => {
   const [isModalOpen, setModalOpen] = React.useState(false);
-  const { systemPrompt, setSystemPrompt } = props;
+  const { systemPrompt, setSystemPrompt, bypassTools, setBypassTools } = props;
 
   const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setModalOpen(!isModalOpen);
@@ -31,6 +34,10 @@ export const SystemPromptModal: React.FunctionComponent<
     setSystemPrompt(value);
   };
 
+  const handleBypassToolsChange = (_event: any, value: boolean) => {
+    setBypassTools(value);
+  };
+
   return (
     <React.Fragment>
       <Button
@@ -64,6 +71,13 @@ export const SystemPromptModal: React.FunctionComponent<
                 aria-label="system-prompt-form-text-area"
                 rows={15}
               />
+              <Checkbox
+                id="bypass-tools"
+                label="Bypass Tools"
+                isChecked={bypassTools}
+                aria-label="bypass-tools-checkbox"
+                onChange={handleBypassToolsChange}
+              ></Checkbox>
             </FormGroup>
           </Form>
         </ModalBody>
diff --git a/aap_chatbot/src/types/Message.ts b/aap_chatbot/src/types/Message.ts
index cf8837317..7777f15d2 100644
--- a/aap_chatbot/src/types/Message.ts
+++ b/aap_chatbot/src/types/Message.ts
@@ -10,6 +10,7 @@ type LLMRequest = {
   attachments?: object[] | null;
   system_prompt?: string | null;
   media_type?: "text/plain" | "application/json";
+  no_tools?: boolean | null;
 };
 
 type LLMResponse = {
diff --git a/aap_chatbot/src/useChatbot/useChatbot.ts b/aap_chatbot/src/useChatbot/useChatbot.ts
index 80cf5c071..b2f0400af 100644
--- a/aap_chatbot/src/useChatbot/useChatbot.ts
+++ b/aap_chatbot/src/useChatbot/useChatbot.ts
@@ -182,6 +182,7 @@ export const useChatbot = () => {
   const [systemPrompt, setSystemPrompt] = useState(QUERY_SYSTEM_INSTRUCTION);
   const [hasStopButton, setHasStopButton] = useState<boolean>(false);
   const [abortController, setAbortController] = useState(new AbortController());
+  const [bypassTools, setBypassTools] = useState<boolean>(false);
 
   const [stream, setStream] = useState(false);
   useEffect(() => {
@@ -465,6 +466,9 @@ export const useChatbot = () => {
     if (systemPrompt !== QUERY_SYSTEM_INSTRUCTION) {
       chatRequest.system_prompt = systemPrompt;
     }
+    if (bypassTools) {
+      chatRequest.no_tools = true;
+    }
 
     if (inDebugMode()) {
       for (const m of modelsSupported) {
@@ -656,5 +660,7 @@ export const useChatbot = () => {
     hasStopButton,
     handleStopButton,
     isStreamingSupported,
+    bypassTools,
+    setBypassTools,
   };
 };
diff --git a/ansible_ai_connect/ai/api/model_pipelines/http/pipelines.py b/ansible_ai_connect/ai/api/model_pipelines/http/pipelines.py
index d03418f47..898af8801 100644
--- a/ansible_ai_connect/ai/api/model_pipelines/http/pipelines.py
+++ b/ansible_ai_connect/ai/api/model_pipelines/http/pipelines.py
@@ -15,7 +15,7 @@
 import json
 import logging
 from json import JSONDecodeError
-from typing import AsyncGenerator
+from typing import Any, AsyncGenerator
 
 import aiohttp
 import requests
@@ -179,8 +179,9 @@ def invoke(self, params: ChatBotParameters) -> ChatBotResponse:
         provider = params.provider
         model_id = params.model_id
         system_prompt = params.system_prompt or settings.CHATBOT_DEFAULT_SYSTEM_PROMPT
+        no_tools = params.no_tools
 
-        data = {
+        data: dict[str, Any] = {
             "query": query,
             "model": model_id,
             "provider": provider,
@@ -189,6 +190,8 @@ def invoke(self, params: ChatBotParameters) -> ChatBotResponse:
             data["conversation_id"] = str(conversation_id)
         if system_prompt:
             data["system_prompt"] = str(system_prompt)
+        if no_tools:
+            data["no_tools"] = bool(no_tools)
 
         headers = self.headers or {}
         if params.mcp_headers:
@@ -281,8 +284,9 @@ async def async_invoke(self, params: StreamingChatBotParameters) -> AsyncGenerat
             model_id = params.model_id
             system_prompt = params.system_prompt or settings.CHATBOT_DEFAULT_SYSTEM_PROMPT
             media_type = params.media_type
+            no_tools = params.no_tools
 
-            data = {
+            data: dict[str, Any] = {
                 "query": query,
                 "model": model_id,
                 "provider": provider,
@@ -293,6 +297,8 @@ async def async_invoke(self, params: StreamingChatBotParameters) -> AsyncGenerat
                 data["system_prompt"] = str(system_prompt)
             if media_type:
                 data["media_type"] = str(media_type)
+            if no_tools:
+                data["no_tools"] = bool(no_tools)
 
             async with session.post(
                 self.config.inference_url + "/v1/streaming_query",
@@ -315,6 +321,7 @@ async def async_invoke(self, params: StreamingChatBotParameters) -> AsyncGenerat
                     ev.provider_id = params.provider
                     ev.conversation_id = params.conversation_id
                     ev.modelName = params.model_id
+                    ev.no_tools = params.no_tools
 
                     async for chunk in response.content:
                         try:
@@ -332,9 +339,9 @@ async def async_invoke(self, params: StreamingChatBotParameters) -> AsyncGenerat
                                         logger.error(
                                             "An error received in chat streaming content:"
                                             + " response="
-                                            + data.get("response")
+                                            + str(data.get("response"))
                                             + ", cause="
-                                            + data.get("cause")
+                                            + str(data.get("cause"))
                                         )
                                     elif event == "start":
                                         ev.phase = event
diff --git a/ansible_ai_connect/ai/api/model_pipelines/http/tests/test_pipelines.py b/ansible_ai_connect/ai/api/model_pipelines/http/tests/test_pipelines.py
index afcb9597e..ff3f9ad28 100644
--- a/ansible_ai_connect/ai/api/model_pipelines/http/tests/test_pipelines.py
+++ b/ansible_ai_connect/ai/api/model_pipelines/http/tests/test_pipelines.py
@@ -147,6 +147,7 @@ def get_params(self) -> StreamingChatBotParameters:
             conversation_id=None,
             system_prompt="You are a helpful assistant",
             media_type="application/json",
+            no_tools=False,  # Do not bypass tool callings
         )
 
     def send_event(self, ev):
diff --git a/ansible_ai_connect/ai/api/model_pipelines/llamastack/tests/test_pipelines.py b/ansible_ai_connect/ai/api/model_pipelines/llamastack/tests/test_pipelines.py
index 7fa73fa96..f1093d6d8 100644
--- a/ansible_ai_connect/ai/api/model_pipelines/llamastack/tests/test_pipelines.py
+++ b/ansible_ai_connect/ai/api/model_pipelines/llamastack/tests/test_pipelines.py
@@ -344,6 +344,7 @@ def get_params(self) -> StreamingChatBotParameters:
             conversation_id=None,
             system_prompt="",
             media_type="application/json",
+            no_tools=False,
         )
 
     @patch("llama_stack_client.lib.agents.agent.AsyncAgent.create_session")
diff --git a/ansible_ai_connect/ai/api/model_pipelines/pipelines.py b/ansible_ai_connect/ai/api/model_pipelines/pipelines.py
index 745210337..9cfba2b7d 100644
--- a/ansible_ai_connect/ai/api/model_pipelines/pipelines.py
+++ b/ansible_ai_connect/ai/api/model_pipelines/pipelines.py
@@ -232,6 +232,7 @@ class ChatBotParameters:
     conversation_id: Optional[str]
     system_prompt: str
     mcp_headers: Optional[dict[str, dict[str, str]]] = field(kw_only=True, default=None)
+    no_tools: bool
 
     @classmethod
     def init(
@@ -242,6 +243,7 @@ def init(
         conversation_id: Optional[str] = None,
         system_prompt: Optional[str] = None,
         mcp_headers: Optional[dict[str, dict[str, str]]] = None,
+        no_tools: Optional[bool] = False,
     ):
         return cls(
             query=query,
@@ -250,6 +252,7 @@ def init(
             conversation_id=conversation_id,
             system_prompt=system_prompt,
             mcp_headers=mcp_headers,
+            no_tools=no_tools,
         )
 
 
@@ -270,6 +273,7 @@ def init(
         system_prompt: Optional[str] = None,
         media_type: Optional[str] = None,
         mcp_headers: Optional[dict[str, dict[str, str]]] = None,
+        no_tools: Optional[bool] = False,
     ):
         return cls(
             query=query,
@@ -279,6 +283,7 @@ def init(
             system_prompt=system_prompt,
             media_type=media_type,
             mcp_headers=mcp_headers,
+            no_tools=no_tools,
         )
 
 
diff --git a/ansible_ai_connect/ai/api/serializers.py b/ansible_ai_connect/ai/api/serializers.py
index a9e048e9b..160f1caef 100644
--- a/ansible_ai_connect/ai/api/serializers.py
+++ b/ansible_ai_connect/ai/api/serializers.py
@@ -345,6 +345,11 @@ class ChatRequestSerializer(serializers.Serializer):
         label="System prompt",
         help_text=("An optional non-default system prompt to be used on LLM (debug mode only)."),
     )
+    no_tools = serializers.BooleanField(
+        required=False,
+        label="Bypass tools",
+        help_text=("Whether to bypass all tools and MCP servers"),
+    )
 
 
 class StreamingChatRequestSerializer(ChatRequestSerializer):
diff --git a/ansible_ai_connect/ai/api/telemetry/schema1.py b/ansible_ai_connect/ai/api/telemetry/schema1.py
index c205e8ad6..4b4543944 100644
--- a/ansible_ai_connect/ai/api/telemetry/schema1.py
+++ b/ansible_ai_connect/ai/api/telemetry/schema1.py
@@ -212,6 +212,7 @@ class ChatBotBaseEvent(Schema1Event):
         converter=str,
         default=settings.CHATBOT_DEFAULT_PROVIDER,
     )
+    no_tools: bool = field(validator=validators.instance_of(bool), converter=bool, default=False)
 
     def __attrs_post_init__(self):
         self.chat_prompt = anonymize_struct(self.chat_prompt)
diff --git a/ansible_ai_connect/ai/api/tests/test_chat_view.py b/ansible_ai_connect/ai/api/tests/test_chat_view.py
index 127fb740d..e7a3368a5 100644
--- a/ansible_ai_connect/ai/api/tests/test_chat_view.py
+++ b/ansible_ai_connect/ai/api/tests/test_chat_view.py
@@ -99,6 +99,11 @@ class TestChatView(APIVersionTestCaseBase, WisdomServiceAPITestCaseBase):
         "system_prompt": "System prompt override",
     }
 
+    PAYLOAD_WITH_NO_TOOLS_OPTION = {
+        "query": "Payload with no tools option",
+        "no_tools": True,
+    }
+
     JSON_RESPONSE = {
         "response": "AAP 2.5 introduces an updated, unified UI.",
         "conversation_id": "123e4567-e89b-12d3-a456-426614174000",
@@ -169,6 +174,7 @@ def json(self):
         elif (
             kwargs["json"]["query"] == TestChatView.PAYLOAD_WITH_MODEL_AND_PROVIDER["query"]
             or kwargs["json"]["query"] == TestChatView.PAYLOAD_WITH_SYSTEM_PROMPT_OVERRIDE["query"]
+            or kwargs["json"]["query"] == TestChatView.PAYLOAD_WITH_NO_TOOLS_OPTION["query"]
         ):
             status_code = 200
             json_response["response"] = input
@@ -438,6 +444,40 @@ def test_operational_telemetry_with_system_prompt_override(self):
                 segment_events[0]["properties"]["chat_system_prompt"],
                 TestChatView.PAYLOAD_WITH_SYSTEM_PROMPT_OVERRIDE["system_prompt"],
             )
+            self.assertFalse(segment_events[0]["properties"]["no_tools"])
+
+    @override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
+    def test_operational_telemetry_with_no_tools_option(self):
+        self.user.rh_user_has_seat = True
+        self.user.organization = Organization.objects.get_or_create(id=1)[0]
+        self.client.force_authenticate(user=self.user)
+        with (
+            patch.object(
+                apps.get_app_config("ai"),
+                "get_model_pipeline",
+                Mock(
+                    return_value=HttpChatBotPipeline(
+                        mock_pipeline_config("http", model_id="granite-8b")
+                    )
+                ),
+            ),
+            self.assertLogs(logger="root", level="DEBUG") as log,
+        ):
+            r = self.query_with_no_error(TestChatView.PAYLOAD_WITH_NO_TOOLS_OPTION)
+            self.assertEqual(r.status_code, HTTPStatus.OK)
+            segment_events = self.extractSegmentEventsFromLog(log)
+            # Verify that chat_prompt is excluded (not in allow list)
+            self.assertNotIn("chat_prompt", segment_events[0]["properties"])
+            self.assertEqual(segment_events[0]["properties"]["modelName"], "granite-8b")
+            self.assertIn(
+                TestChatView.PAYLOAD_WITH_NO_TOOLS_OPTION["query"],
+                segment_events[0]["properties"]["chat_response"],
+            )
+            self.assertEqual(
+                segment_events[0]["properties"]["chat_truncated"],
+                TestChatView.JSON_RESPONSE["truncated"],
+            )
+            self.assertTrue(segment_events[0]["properties"]["no_tools"])
 
     def test_chat_rate_limit(self):
         # Call chat API five times using self.user
@@ -737,6 +777,37 @@ def test_operational_telemetry_with_system_prompt_override(self):
                 segment_events[0]["properties"]["chat_system_prompt"],
                 TestChatView.PAYLOAD_WITH_SYSTEM_PROMPT_OVERRIDE["system_prompt"],
             )
+            self.assertFalse(segment_events[0]["properties"]["no_tools"])
+
+    @override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
+    def test_operational_telemetry_with_no_tools_option(self):
+        self.user.rh_user_has_seat = True
+        self.user.organization = Organization.objects.get_or_create(id=1)[0]
+        self.client.force_authenticate(user=self.user)
+        with (
+            patch.object(
+                apps.get_app_config("ai"),
+                "get_model_pipeline",
+                Mock(
+                    return_value=HttpStreamingChatBotPipeline(
+                        mock_pipeline_config("http", model_id="granite-8b")
+                    )
+                ),
+            ),
+            self.assertLogs(logger="root", level="DEBUG") as log,
+        ):
+            r = self.query_with_no_error(TestChatView.PAYLOAD_WITH_NO_TOOLS_OPTION)
+            self.assertEqual(r.status_code, HTTPStatus.OK)
+            segment_events = self.extractSegmentEventsFromLog(log)
+            # Verify that chat_prompt is excluded (not in allow list)
+            self.assertNotIn("chat_prompt", segment_events[0]["properties"])
+            self.assertEqual(segment_events[0]["properties"]["modelName"], "granite-8b")
+            self.assertEqual(
+                segment_events[0]["properties"]["chat_truncated"],
+                TestChatView.JSON_RESPONSE["truncated"],
+            )
+            self.assertEqual(len(segment_events[0]["properties"]["chat_referenced_documents"]), 0)
+            self.assertTrue(segment_events[0]["properties"]["no_tools"])
 
     def test_chat_rate_limit(self):
         # Call chat API five times using self.user
diff --git a/ansible_ai_connect/ai/api/utils/seated_users_allow_list.py b/ansible_ai_connect/ai/api/utils/seated_users_allow_list.py
index 60bc76fa4..b0048fca1 100644
--- a/ansible_ai_connect/ai/api/utils/seated_users_allow_list.py
+++ b/ansible_ai_connect/ai/api/utils/seated_users_allow_list.py
@@ -410,6 +410,7 @@
         "chat_referenced_documents": None,
         "conversation_id": None,
         "provider_id": None,
+        "no_tools": None,
     },
     "streamingChatOperationalEvent": {
         # Declaring following Schema1Event as ChatBotBaseEvent inherits from Schema1Event
@@ -434,6 +435,7 @@
         "chat_referenced_documents": None,
         "conversation_id": None,
         "provider_id": None,
+        "no_tools": None,
     },
     "explainRole": {
         "duration": None,
diff --git a/ansible_ai_connect/ai/api/views.py b/ansible_ai_connect/ai/api/views.py
index b9e55f0c3..0e61f9208 100644
--- a/ansible_ai_connect/ai/api/views.py
+++ b/ansible_ai_connect/ai/api/views.py
@@ -1121,6 +1121,7 @@ def post(self, request) -> Response:
         req_system_prompt = self.validated_data.get("system_prompt")
         req_provider = self.validated_data.get("provider", settings.CHATBOT_DEFAULT_PROVIDER)
         conversation_id = self.validated_data.get("conversation_id")
+        no_tools = self.validated_data.get("no_tools", False)
 
         # Initialise Segment Event early, in case of exceptions
         self.event.chat_prompt = anonymize_struct(req_query)
@@ -1128,6 +1129,7 @@ def post(self, request) -> Response:
         self.event.provider_id = req_provider
         self.event.conversation_id = conversation_id
         self.event.modelName = self.req_model_id or self.llm.config.model_id
+        self.event.no_tools = no_tools
 
         mcp_headers = self.get_mcp_headers(request, self.llm.config)
 
@@ -1139,6 +1141,7 @@ def post(self, request) -> Response:
                 provider=req_provider,
                 conversation_id=conversation_id,
                 mcp_headers=mcp_headers,
+                no_tools=no_tools,
             )
         )
 
@@ -1221,6 +1224,7 @@ def post(self, request) -> StreamingHttpResponse:
         req_provider = self.validated_data.get("provider", settings.CHATBOT_DEFAULT_PROVIDER)
         conversation_id = self.validated_data.get("conversation_id")
         media_type = self.validated_data.get("media_type")
+        no_tools = self.validated_data.get("no_tools", False)
 
         # Initialise Segment Event early, in case of exceptions
         self.event.chat_prompt = anonymize_struct(req_query)
@@ -1228,6 +1232,7 @@ def post(self, request) -> StreamingHttpResponse:
         self.event.provider_id = req_provider
         self.event.conversation_id = conversation_id
         self.event.modelName = self.req_model_id or self.llm.config.model_id
+        self.event.no_tools = no_tools
 
         mcp_headers = self.get_mcp_headers(request, self.llm.config)
 
@@ -1240,5 +1245,6 @@ def post(self, request) -> StreamingHttpResponse:
                 conversation_id=conversation_id,
                 media_type=media_type,
                 mcp_headers=mcp_headers,
+                no_tools=no_tools,
             )
         )
diff --git a/ansible_ai_connect_chatbot/package-lock.json b/ansible_ai_connect_chatbot/package-lock.json
index a7b57cad2..63a639e27 100644
--- a/ansible_ai_connect_chatbot/package-lock.json
+++ b/ansible_ai_connect_chatbot/package-lock.json
@@ -289,6 +289,7 @@
       "version": "7.27.6",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
       "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -873,12 +874,12 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.3.tgz",
-      "integrity": "sha512-1+WqvgNMhmlAambTvT3KPtCl/Ibr68VldY2XY40SL1CE0ZXiakFR/cbTspaF5HsnpDMvcYYoJHfl4980NBjGag==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
       "dev": true,
       "dependencies": {
-        "@eslint/core": "^0.15.1",
+        "@eslint/core": "^0.15.2",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -886,9 +887,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.1.tgz",
-      "integrity": "sha512-bkOp+iumZCCbt1K1CmWf0R9pM5yKpDv+ZXtvSyQpudrI9kuFLp+bM2WOPXImuD/ceQuaa8f5pj93Y7zyECIGNA==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -1139,9 +1140,9 @@
       }
     },
     "node_modules/@patternfly/chatbot": {
-      "version": "6.3.0-prerelease.25",
-      "resolved": "https://registry.npmjs.org/@patternfly/chatbot/-/chatbot-6.3.0-prerelease.25.tgz",
-      "integrity": "sha512-uo6TzQ+3OeWWdHDmiwSJEqBXkYNJoOnn7woMy1qUZU1/qlh2EBeGPKRJmumI21Zpu2dFn4jWLWFaDLgiBN+hwQ==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/@patternfly/chatbot/-/chatbot-6.3.2.tgz",
+      "integrity": "sha512-3GYlWxgNUrW/U0xfsvRzn77DZVr5snAGe8lPj7zAuAiL7gSvjqrpvKiNot8whV3t1PepksYK2az1AVc5z02QmQ==",
       "dependencies": {
         "@patternfly/react-code-editor": "^6.1.0",
         "@patternfly/react-core": "^6.1.0",
@@ -1153,7 +1154,6 @@
         "path-browserify": "^1.0.1",
         "posthog-js": "^1.194.4",
         "react-markdown": "^9.0.1",
-        "react-syntax-highlighter": "^15.5.0",
         "rehype-external-links": "^3.0.0",
         "rehype-sanitize": "^6.0.0",
         "rehype-unwrap-images": "^1.0.0",
@@ -4772,18 +4772,6 @@
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/fault": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
-      "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
-      "dependencies": {
-        "format": "^0.2.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/fflate": {
       "version": "0.4.8",
       "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz",
@@ -4918,9 +4906,9 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
-      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -4932,14 +4920,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/format": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-      "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/framer-motion": {
       "version": "11.18.2",
       "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.18.2.tgz",
@@ -5326,15 +5306,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hast-util-parse-selector": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz",
-      "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/hast-util-sanitize": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-5.0.2.tgz",
@@ -5387,78 +5358,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hastscript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
-      "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
-      "dependencies": {
-        "@types/hast": "^2.0.0",
-        "comma-separated-tokens": "^1.0.0",
-        "hast-util-parse-selector": "^2.0.0",
-        "property-information": "^5.0.0",
-        "space-separated-tokens": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/hastscript/node_modules/@types/hast": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
-      "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
-      "dependencies": {
-        "@types/unist": "^2"
-      }
-    },
-    "node_modules/hastscript/node_modules/@types/unist": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
-      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="
-    },
-    "node_modules/hastscript/node_modules/comma-separated-tokens": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/hastscript/node_modules/property-information": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
-      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/hastscript/node_modules/space-separated-tokens": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/highlightjs-vue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/highlightjs-vue/-/highlightjs-vue-1.0.0.tgz",
-      "integrity": "sha512-PDEfEF102G23vHmPhLyPboFCD+BkMGu+GuJe2d9/eH4FsCwvgBpnc9n0pGE+ffKdph38s6foEZiEjdgHdzp+IA=="
-    },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
@@ -6313,19 +6212,6 @@
       "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
       "dev": true
     },
-    "node_modules/lowlight": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
-      "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
-      "dependencies": {
-        "fault": "^1.0.0",
-        "highlight.js": "~10.7.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -7847,14 +7733,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/prismjs": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -8038,22 +7916,6 @@
         "react-dom": ">=18"
       }
     },
-    "node_modules/react-syntax-highlighter": {
-      "version": "15.6.1",
-      "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.6.1.tgz",
-      "integrity": "sha512-OqJ2/vL7lEeV5zTJyG7kmARppUjiB9h9udl4qHQjjgEos66z00Ia0OckwYfRxCSFrW8RJIBnsBwQsHZbVPspqg==",
-      "dependencies": {
-        "@babel/runtime": "^7.3.1",
-        "highlight.js": "^10.4.1",
-        "highlightjs-vue": "^1.0.0",
-        "lowlight": "^1.17.0",
-        "prismjs": "^1.27.0",
-        "refractor": "^3.6.0"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14.0"
-      }
-    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -8076,112 +7938,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/refractor": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz",
-      "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==",
-      "dependencies": {
-        "hastscript": "^6.0.0",
-        "parse-entities": "^2.0.0",
-        "prismjs": "~1.27.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dependencies": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/refractor/node_modules/prismjs": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz",
-      "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
@@ -10388,14 +10144,6 @@
         }
       }
     },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
diff --git a/ansible_ai_connect_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx b/ansible_ai_connect_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx
index 5794c2523..b7bed6818 100644
--- a/ansible_ai_connect_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx
+++ b/ansible_ai_connect_chatbot/src/AnsibleChatbot/AnsibleChatbot.tsx
@@ -128,6 +128,8 @@ export const AnsibleChatbot: React.FunctionComponent = () => {
     hasStopButton,
     handleStopButton,
     isStreamingSupported,
+    bypassTools,
+    setBypassTools,
   } = useChatbot();
 
   const welcomePrompts = [
@@ -280,6 +282,8 @@ export const AnsibleChatbot: React.FunctionComponent = () => {
                       <SystemPromptModal
                         systemPrompt={systemPrompt}
                         setSystemPrompt={setSystemPrompt}
+                        bypassTools={bypassTools}
+                        setBypassTools={setBypassTools}
                       />
                     )}
                   </ChatbotHeaderActions>
diff --git a/ansible_ai_connect_chatbot/src/App.test.tsx b/ansible_ai_connect_chatbot/src/App.test.tsx
index 87b3cd988..1d619ae6e 100644
--- a/ansible_ai_connect_chatbot/src/App.test.tsx
+++ b/ansible_ai_connect_chatbot/src/App.test.tsx
@@ -707,6 +707,40 @@ test("Test system prompt override", async () => {
   );
 });
 
+test("Test system prompt override with no_tools option", async () => {
+  const spy = mockAxios(200);
+  await renderApp(true);
+
+  await expect.element(page.getByLabelText("SystemPrompt")).toBeVisible();
+  const systemPromptIcon = page.getByLabelText("SystemPrompt");
+  await systemPromptIcon.click();
+
+  const systemPromptTextArea = page.getByLabelText(
+    "system-prompt-form-text-area",
+  );
+  await systemPromptTextArea.fill("MY SYSTEM PROMPT WITH NO_TOOLS OPTION");
+
+  const bypassToolsCheckbox = page.getByRole("checkbox");
+  expect(bypassToolsCheckbox).not.toBeChecked();
+  await bypassToolsCheckbox.click();
+  expect(bypassToolsCheckbox).toBeChecked();
+
+  const systemPromptButton = page.getByLabelText("system-prompt-form-button");
+  await systemPromptButton.click();
+
+  await sendMessage("Hello with system prompt override with no_tools option");
+  expect(spy).toHaveBeenCalledWith(
+    expect.anything(),
+    expect.objectContaining({
+      conversation_id: undefined,
+      no_tools: true,
+      query: "Hello with system prompt override with no_tools option",
+      system_prompt: "MY SYSTEM PROMPT WITH NO_TOOLS OPTION",
+    }),
+    expect.anything(),
+  );
+});
+
 test("Chat streaming test", async () => {
   let ghIssueLinkSpy = 0;
   let ghIssueUrl = "";
diff --git a/ansible_ai_connect_chatbot/src/SystemPromptModal/SystemPromptModal.tsx b/ansible_ai_connect_chatbot/src/SystemPromptModal/SystemPromptModal.tsx
index 9aea47440..b43837b06 100644
--- a/ansible_ai_connect_chatbot/src/SystemPromptModal/SystemPromptModal.tsx
+++ b/ansible_ai_connect_chatbot/src/SystemPromptModal/SystemPromptModal.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import {
   Button,
+  Checkbox,
   Form,
   FormGroup,
   Modal,
@@ -15,13 +16,15 @@ import WrenchIcon from "@patternfly/react-icons/dist/esm/icons/wrench-icon";
 interface SystemPromptModalProps {
   systemPrompt: string;
   setSystemPrompt: (s: string) => void;
+  bypassTools: boolean;
+  setBypassTools: (b: boolean) => void;
 }
 
 export const SystemPromptModal: React.FunctionComponent<
   SystemPromptModalProps
 > = (props) => {
   const [isModalOpen, setModalOpen] = React.useState(false);
-  const { systemPrompt, setSystemPrompt } = props;
+  const { systemPrompt, setSystemPrompt, bypassTools, setBypassTools } = props;
 
   const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setModalOpen(!isModalOpen);
@@ -31,6 +34,10 @@ export const SystemPromptModal: React.FunctionComponent<
     setSystemPrompt(value);
   };
 
+  const handleBypassToolsChange = (_event: any, value: boolean) => {
+    setBypassTools(value);
+  };
+
   return (
     <React.Fragment>
       <Button
@@ -64,6 +71,13 @@ export const SystemPromptModal: React.FunctionComponent<
                 aria-label="system-prompt-form-text-area"
                 rows={15}
               />
+              <Checkbox
+                id="bypass-tools"
+                label="Bypass Tools"
+                isChecked={bypassTools}
+                aria-label="bypass-tools-checkbox"
+                onChange={handleBypassToolsChange}
+              ></Checkbox>
             </FormGroup>
           </Form>
         </ModalBody>
diff --git a/ansible_ai_connect_chatbot/src/types/Message.ts b/ansible_ai_connect_chatbot/src/types/Message.ts
index cf8837317..7777f15d2 100644
--- a/ansible_ai_connect_chatbot/src/types/Message.ts
+++ b/ansible_ai_connect_chatbot/src/types/Message.ts
@@ -10,6 +10,7 @@ type LLMRequest = {
   attachments?: object[] | null;
   system_prompt?: string | null;
   media_type?: "text/plain" | "application/json";
+  no_tools?: boolean | null;
 };
 
 type LLMResponse = {
diff --git a/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts b/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts
index d64964767..b533394e9 100644
--- a/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts
+++ b/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts
@@ -34,6 +34,7 @@ const botName =
 
 export const modelsSupported: LLMModel[] = [
   { model: "granite-3.3-8b-instruct", provider: "my_rhoai_dev" },
+  { model: "gemini/gemini-2.5-flash", provider: "gemini" },
 ];
 
 export const readCookie = (name: string): string | null => {
@@ -182,6 +183,7 @@ export const useChatbot = () => {
   const [systemPrompt, setSystemPrompt] = useState(QUERY_SYSTEM_INSTRUCTION);
   const [hasStopButton, setHasStopButton] = useState<boolean>(false);
   const [abortController, setAbortController] = useState(new AbortController());
+  const [bypassTools, setBypassTools] = useState<boolean>(false);
 
   const [stream, setStream] = useState(false);
   useEffect(() => {
@@ -462,6 +464,9 @@ export const useChatbot = () => {
     if (systemPrompt !== QUERY_SYSTEM_INSTRUCTION) {
       chatRequest.system_prompt = systemPrompt;
     }
+    if (bypassTools) {
+      chatRequest.no_tools = true;
+    }
 
     if (inDebugMode()) {
       for (const m of modelsSupported) {
@@ -653,5 +658,7 @@ export const useChatbot = () => {
     hasStopButton,
     handleStopButton,
     isStreamingSupported,
+    bypassTools,
+    setBypassTools,
   };
 };
diff --git a/tools/openapi-schema/ansible-ai-connect-service.json b/tools/openapi-schema/ansible-ai-connect-service.json
index b27504772..a98d4dcf8 100644
--- a/tools/openapi-schema/ansible-ai-connect-service.json
+++ b/tools/openapi-schema/ansible-ai-connect-service.json
@@ -1386,6 +1386,11 @@
                     "system_prompt": {
                         "type": "string",
                         "description": "An optional non-default system prompt to be used on LLM (debug mode only)."
+                    },
+                    "no_tools": {
+                        "type": "boolean",
+                        "title": "Bypass tools",
+                        "description": "Whether to bypass all tools and MCP servers"
                     }
                 },
                 "required": [
@@ -2243,6 +2248,11 @@
                         "type": "string",
                         "description": "An optional non-default system prompt to be used on LLM (debug mode only)."
                     },
+                    "no_tools": {
+                        "type": "boolean",
+                        "title": "Bypass tools",
+                        "description": "Whether to bypass all tools and MCP servers"
+                    },
                     "media_type": {
                         "type": "string",
                         "description": "A media type to be used in the output from LLM."
diff --git a/tools/openapi-schema/ansible-ai-connect-service.yaml b/tools/openapi-schema/ansible-ai-connect-service.yaml
index f490427aa..f76968d75 100644
--- a/tools/openapi-schema/ansible-ai-connect-service.yaml
+++ b/tools/openapi-schema/ansible-ai-connect-service.yaml
@@ -880,6 +880,10 @@ components:
           type: string
           description: An optional non-default system prompt to be used on LLM (debug
             mode only).
+        no_tools:
+          type: boolean
+          title: Bypass tools
+          description: Whether to bypass all tools and MCP servers
       required:
       - query
     ChatResponse:
@@ -1526,6 +1530,10 @@ components:
           type: string
           description: An optional non-default system prompt to be used on LLM (debug
             mode only).
+        no_tools:
+          type: boolean
+          title: Bypass tools
+          description: Whether to bypass all tools and MCP servers
         media_type:
           type: string
           description: A media type to be used in the output from LLM.