diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
index 7a70155c3ea..2aa3a643f8f 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
@@ -23,9 +23,7 @@
 
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
-import org.springframework.samples.petclinic.model.Person;
-
-import jakarta.persistence.Entity;
+import org.springframework.samples.petclinic.model.Person;import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
@@ -42,10 +40,11 @@
  * @author Arjen Poutsma
  */
 @Entity
-@Table(name = "vets")
-public class Vet extends Person {
+@Table(name = "vets")public class Vet extends Person {
 
-	@ManyToMany(fetch = FetchType.EAGER)
+	@ManyToMany(fetch = FetchType.LAZY)
+	@BatchSize(size = 100)
+	@ToString.Exclude
 	@JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
 			inverseJoinColumns = @JoinColumn(name = "specialty_id"))
 	private Set<Specialty> specialties;
@@ -76,4 +75,4 @@ public void addSpecialty(Specialty specialty) {
 		getSpecialtiesInternal().add(specialty);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
index 8b9e0823c86..0f20618c9a5 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
@@ -20,9 +20,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Collection;
+import org.springframework.transaction.annotation.Transactional;import java.util.Collection;
 
 /**
  * Repository class for <code>Vet</code> domain objects All method names are compliant
@@ -34,15 +32,16 @@
  * @author Juergen Hoeller
  * @author Sam Brannen
  * @author Michael Isvy
- */
-public interface VetRepository extends Repository<Vet, Integer> {
+ */public interface VetRepository extends Repository<Vet, Integer> {
 
 	/**
 	 * Retrieve all <code>Vet</code>s from the data store.
 	 * @return a <code>Collection</code> of <code>Vet</code>s
 	 */
+	@EntityGraph(attributePaths = {"specialties"})
 	@Transactional(readOnly = true)
 	@Cacheable("vets")
+	@Query("SELECT DISTINCT vet FROM Vet vet JOIN FETCH vet.specialties")
 	Collection<Vet> findAll() throws DataAccessException;
 
 	/**
@@ -55,4 +54,4 @@ public interface VetRepository extends Repository<Vet, Integer> {
 	@Cacheable("vets")
 	Page<Vet> findAll(Pageable pageable) throws DataAccessException;
 
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/db/postgres/indexes.sql b/src/main/resources/db/postgres/indexes.sql
new file mode 100644
index 00000000000..7b52df54ec2
--- /dev/null
+++ b/src/main/resources/db/postgres/indexes.sql
@@ -0,0 +1,3 @@
+-- Add indexes for vet_specialties and specialties tables
+CREATE INDEX IF NOT EXISTS idx_vet_specialties_vet_id ON vet_specialties(vet_id);
+CREATE INDEX IF NOT EXISTS idx_specialties_id ON specialties(id);
\ No newline at end of file