diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad3881fedb..1ff86fb9e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,6 +95,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - [#5981](https://github.com/apache/trafficcontrol/issues/5891) - `/deliveryservices/{{ID}}/safe` returns incorrect response for the requested API version
 - [#5984](https://github.com/apache/trafficcontrol/issues/5894) - `/servers/{{ID}}/deliveryservices` returns incorrect response for the requested API version
 - [#6027](https://github.com/apache/trafficcontrol/issues/6027) - Collapsed DB migrations
+- [#6066](https://github.com/apache/trafficcontrol/issues/6066) - Fixed missing/incorrect indices on some tables
 
 ### Changed
 - Updated the Traffic Ops Python client to 3.0
diff --git a/traffic_ops/app/db/migrations/2021080408053529_fix_indices.down.sql b/traffic_ops/app/db/migrations/2021080408053529_fix_indices.down.sql
new file mode 100644
index 0000000000..031a2549c3
--- /dev/null
+++ b/traffic_ops/app/db/migrations/2021080408053529_fix_indices.down.sql
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+ALTER INDEX phys_location_last_updated_idx RENAME TO pys_location_last_updated_idx;
+
+DROP INDEX topology_last_updated_idx;
+
+CREATE INDEX topology_last_updated_idx ON topology_cachegroup (last_updated DESC NULLS LAST);
diff --git a/traffic_ops/app/db/migrations/2021080408053529_fix_indices.up.sql b/traffic_ops/app/db/migrations/2021080408053529_fix_indices.up.sql
new file mode 100644
index 0000000000..ed0ea5599d
--- /dev/null
+++ b/traffic_ops/app/db/migrations/2021080408053529_fix_indices.up.sql
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership.  The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+ALTER INDEX pys_location_last_updated_idx RENAME TO phys_location_last_updated_idx;
+
+DROP INDEX topology_last_updated_idx;
+
+CREATE INDEX topology_last_updated_idx ON topology (last_updated DESC NULLS LAST);