diff --git a/packages/manager/.changeset/pr-13326-upcoming-features-1769460666677.md b/packages/manager/.changeset/pr-13326-upcoming-features-1769460666677.md
new file mode 100644
index 00000000000..b0a8edfc7af
--- /dev/null
+++ b/packages/manager/.changeset/pr-13326-upcoming-features-1769460666677.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+DBaaS PgBouncer updating Add/Edit Pool drawer fields to use autocomplete ([#13326](https://github.com/linode/manager/pull/13326))
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseAddConnectionPoolDrawer.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseAddConnectionPoolDrawer.tsx
index d8d769276ca..917ed35ad19 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseAddConnectionPoolDrawer.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseAddConnectionPoolDrawer.tsx
@@ -2,9 +2,9 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useCreateDatabaseConnectionPoolMutation } from '@linode/queries';
 import {
   ActionsPanel,
+  Autocomplete,
   Drawer,
   Notice,
-  Select,
   Stack,
   TextField,
   Typography,
@@ -129,10 +129,11 @@ export const DatabaseAddConnectionPoolDrawer = (props: Props) => {
             control={control}
             name="database"
             render={({ field, fieldState }) => (
-              <Select
+              <Autocomplete
                 label="Database Name"
                 {...field}
                 data-testid="database-name-select"
+                disableClearable={true}
                 errorText={fieldState.error?.message}
                 id="databaseName"
                 onChange={(e, option) => {
@@ -150,10 +151,11 @@ export const DatabaseAddConnectionPoolDrawer = (props: Props) => {
             control={control}
             name="mode"
             render={({ field, fieldState }) => (
-              <Select
+              <Autocomplete
                 label="Pool Mode"
                 {...field}
                 data-testid="pool-mode-select"
+                disableClearable={true}
                 errorText={fieldState.error?.message}
                 id="poolMode"
                 onChange={(e, option) => {
@@ -193,10 +195,11 @@ export const DatabaseAddConnectionPoolDrawer = (props: Props) => {
             control={control}
             name="username"
             render={({ field, fieldState }) => (
-              <Select
+              <Autocomplete
                 label="Username"
                 {...field}
                 data-testid="username-select"
+                disableClearable={true}
                 errorText={fieldState.error?.message}
                 id="username"
                 onChange={(e, option) => {
diff --git a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseEditConnectionPoolDrawer.tsx b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseEditConnectionPoolDrawer.tsx
index 80cd1998ad7..0f6c8058690 100644
--- a/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseEditConnectionPoolDrawer.tsx
+++ b/packages/manager/src/features/Databases/DatabaseDetail/DatabaseNetworking/DatabaseEditConnectionPoolDrawer.tsx
@@ -2,9 +2,9 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useUpdateDatabaseConnectionPoolMutation } from '@linode/queries';
 import {
   ActionsPanel,
+  Autocomplete,
   Drawer,
   Notice,
-  Select,
   Stack,
   TextField,
 } from '@linode/ui';
@@ -108,10 +108,11 @@ export const DatabaseEditConnectionPoolDrawer = (props: Props) => {
             control={control}
             name="database"
             render={({ field, fieldState }) => (
-              <Select
+              <Autocomplete
                 label="Database Name"
                 {...field}
                 data-testid="database-name-select"
+                disableClearable={true}
                 errorText={fieldState.error?.message}
                 id="databaseName"
                 onChange={(e, option) => {
@@ -128,10 +129,11 @@ export const DatabaseEditConnectionPoolDrawer = (props: Props) => {
             control={control}
             name="mode"
             render={({ field, fieldState }) => (
-              <Select
+              <Autocomplete
                 label="Pool Mode"
                 {...field}
                 data-testid="pool-mode-select"
+                disableClearable={true}
                 errorText={fieldState.error?.message}
                 id="poolMode"
                 onChange={(e, option) => {
@@ -169,10 +171,11 @@ export const DatabaseEditConnectionPoolDrawer = (props: Props) => {
             control={control}
             name="username"
             render={({ field, fieldState }) => (
-              <Select
+              <Autocomplete
                 label="Username"
                 {...field}
                 data-testid="username-select"
+                disableClearable={true}
                 errorText={fieldState.error?.message}
                 id="username"
                 onChange={(e, option) => {