diff --git a/internal/db/schema/migrations/oss/postgres/46/01_credentials.up.sql b/internal/db/schema/migrations/oss/postgres/46/01_credentials.up.sql
index 15cdcde21..d4b37e711 100644
--- a/internal/db/schema/migrations/oss/postgres/46/01_credentials.up.sql
+++ b/internal/db/schema/migrations/oss/postgres/46/01_credentials.up.sql
@@ -46,6 +46,7 @@ begin;
   -- insert_credential_library_subtype() is a before insert trigger
   -- function for subtypes of credential_library.
   -- Replaces the insert_credential_library_subtype function defined in 22/02_credential_type.up.sql
+  -- Replaced in 80/04_credential_library_base_table_updates.up.sql
   create or replace function insert_credential_library_subtype() returns trigger
   as $$
   begin
@@ -97,7 +98,7 @@ begin;
   -- insert_credential_static_subtype() is a before insert trigger
   -- function for subtypes of credential_static
   -- Replaces the insert_credential_static_subtype function defined in 10/03_credential.up.sql
-  -- Replaced in 79/03_credential_static_base_table_updates.up.sql
+  -- Replaced in 80/03_credential_static_base_table_updates.up.sql
   create or replace function insert_credential_static_subtype() returns trigger
   as $$
   begin
diff --git a/internal/db/schema/migrations/oss/postgres/80/04_credential_library_base_table_updates.up.sql b/internal/db/schema/migrations/oss/postgres/80/04_credential_library_base_table_updates.up.sql
new file mode 100644
index 000000000..20f8621ef
--- /dev/null
+++ b/internal/db/schema/migrations/oss/postgres/80/04_credential_library_base_table_updates.up.sql
@@ -0,0 +1,63 @@
+-- Copyright (c) HashiCorp, Inc.
+-- SPDX-License-Identifier: BUSL-1.1
+
+begin;
+
+  -- Add create_time and update_time to credential_library table.
+  alter table credential_library add column create_time wt_timestamp;
+  alter table credential_library add column update_time wt_timestamp;
+
+  -- Update rows with current values
+  update credential_library
+    set create_time = cvl.create_time, update_time = cvl.update_time
+    from credential_library as cl
+    left join credential_vault_library as cvl on cl.public_id = cvl.public_id;
+  update credential_library
+    set create_time = cvscl.create_time, update_time = cvscl.update_time
+    from credential_library as cl
+    left join credential_vault_ssh_cert_library as cvscl on cl.public_id = cvscl.public_id;
+
+  -- Replace the insert trigger to also set the create_time
+  -- Replaces the insert_credential_library_subtype function defined in 46/01_credentials.up.sql
+  create or replace function insert_credential_library_subtype() returns trigger
+  as $$
+  begin
+    select project_id into new.project_id
+      from credential_store
+     where credential_store.public_id = new.store_id;
+
+    insert into credential_library
+      (public_id, store_id, project_id, credential_type, create_time)
+    values
+      (new.public_id, new.store_id, new.project_id, new.credential_type, new.create_time);
+    return new;
+  end;
+  $$ language plpgsql;
+
+  -- Add trigger to update the new update_time column on every subtype update.
+  create function update_credential_library_table_update_time() returns trigger
+  as $$
+  begin
+    update credential_library set update_time = now() where public_id = new.public_id;
+    return new;
+  end;
+  $$ language plpgsql;
+  comment on function update_credential_library_table_update_time() is
+    'update_credential_library_table_update_time is used to automatically update the update_time '
+    'of the base table whenever one of the subtype tables are updated';
+
+  -- Add triggers to subtype tables
+  create trigger update_credential_library_table_update_time before update on credential_vault_library
+    for each row execute procedure update_credential_library_table_update_time();
+  create trigger update_credential_library_table_update_time before update on credential_vault_ssh_cert_library
+    for each row execute procedure update_credential_library_table_update_time();
+
+  -- Add new indexes for the create and update time queries.
+  create index credential_library_create_time_public_id_idx
+      on credential_library (create_time desc, public_id asc);
+  create index credential_library_update_time_public_id_idx
+      on credential_library (update_time desc, public_id asc);
+
+  analyze credential_library;
+
+commit;
diff --git a/internal/db/sqltest/tests/pagination/credential_library.sql b/internal/db/sqltest/tests/pagination/credential_library.sql
new file mode 100644
index 000000000..8d1f4a277
--- /dev/null
+++ b/internal/db/sqltest/tests/pagination/credential_library.sql
@@ -0,0 +1,32 @@
+-- Copyright (c) HashiCorp, Inc.
+-- SPDX-License-Identifier: BUSL-1.1
+
+begin;
+  select plan(9);
+
+  -- Verify the trigger functions exist and are declared properly
+  select has_function('update_credential_library_table_update_time');
+  select volatility_is('update_credential_library_table_update_time', 'volatile');
+  select isnt_strict('update_credential_library_table_update_time');
+  select has_trigger('credential_vault_library', 'update_credential_library_table_update_time');
+  select has_trigger('credential_vault_ssh_cert_library', 'update_credential_library_table_update_time');
+  select has_index('credential_library', 'credential_library_create_time_public_id_idx', array['create_time', 'public_id']);
+  select has_index('credential_library', 'credential_library_update_time_public_id_idx', array['update_time', 'public_id']);
+
+  -- To test that the trigger that sets the create_time of the base table
+  -- when an insert into a subtype table happens works, we check that the
+  -- create time of the entries in both tables match
+  prepare credential_library_create_time as select create_time from credential_library where public_id='cvl_______b1';
+  prepare credential_vault_library_create_time as select create_time from credential_vault_library where public_id='cvl_______b1';
+  select results_eq('credential_library_create_time','credential_vault_library_create_time');
+  -- To test the trigger that updates the update_time of the base table,
+  -- we update one of the existing creds and check that the base table
+  -- entry has the same update_time as the subtype one.
+  update credential_vault_library set name='blue black vault library' where public_id='cvl_______b1';
+  prepare credential_library_update_time as select update_time from credential_library where public_id='cvl_______b1';
+  prepare credential_vault_library_update_time as select update_time from credential_vault_library where public_id='cvl_______b1';
+  select results_eq('credential_library_update_time','credential_vault_library_update_time');
+
+  select * from finish();
+
+rollback;