diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc44fe1..1ff8db6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 CHANGE: Update to OpenZiti SDK (`github.com/openziti/sdk-golang`) at `v0.23.22`.
 
+CHANGE: Added indexes to `environments`, `shares`, and `frontends` tables to improve overall query performance on both PostgreSQL and Sqlite.
+
 FIX: Also update the Python SDK to include the permission mode and access grants fields on the `ShareRequest` (https://github.com/openziti/zrok/issues/432)
 
 FIX: Add a way to find the username on Linux when /etc/passwd and stdlib can't resolve the UID (https://github.com/openziti/zrok/issues/454)
diff --git a/controller/store/sql/postgresql/020_v0_4_27_performance_indexes.sql b/controller/store/sql/postgresql/020_v0_4_27_performance_indexes.sql
new file mode 100644
index 00000000..de9e7603
--- /dev/null
+++ b/controller/store/sql/postgresql/020_v0_4_27_performance_indexes.sql
@@ -0,0 +1,6 @@
+-- +migrate Up
+
+create index environments_account_id_idx on environments (account_id);
+create index shares_token_perf_idx on shares (token);
+create index shares_environment_id_idx on shares (environment_id);
+create index frontends_environment_id_idx on frontends (environment_id);
\ No newline at end of file
diff --git a/controller/store/sql/sqlite3/020_v0_4_27_performance_indexes.sql b/controller/store/sql/sqlite3/020_v0_4_27_performance_indexes.sql
new file mode 100644
index 00000000..de9e7603
--- /dev/null
+++ b/controller/store/sql/sqlite3/020_v0_4_27_performance_indexes.sql
@@ -0,0 +1,6 @@
+-- +migrate Up
+
+create index environments_account_id_idx on environments (account_id);
+create index shares_token_perf_idx on shares (token);
+create index shares_environment_id_idx on shares (environment_id);
+create index frontends_environment_id_idx on frontends (environment_id);
\ No newline at end of file