diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/pom.xml b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/pom.xml
index 48bf4ab..7494456 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/pom.xml
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-invitro-pharmacology</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.2.0-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -103,17 +103,7 @@
             <version>2.3.0</version>
         </dependency>
 
-        <!-- DATABASE Dependencies  TO BE MOVED TO GSRS-CI? -->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>19.6.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+        <!-- DATABASE Dependencies  -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/GsrsSpringInvitroPharmacologyApplication.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/GsrsSpringInvitroPharmacologyApplication.java
index e26c6e6..78c3ae8 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/GsrsSpringInvitroPharmacologyApplication.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/GsrsSpringInvitroPharmacologyApplication.java
@@ -3,19 +3,10 @@
 import gsrs.*;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.*;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.jdbc.*;
-import org.springframework.boot.context.properties.*;
-import org.springframework.context.annotation.*;
-import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.transaction.annotation.*;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /* June 4, 2021 */
 @SpringBootApplication
@@ -32,25 +23,11 @@
 @EnableGsrsBackup
 @EnableAsync
 
+// SB 3x is the file needed if so make WebMbv config file like in service
+
 public class GsrsSpringInvitroPharmacologyApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GsrsSpringInvitroPharmacologyApplication.class, args);
     }
-
-    @Bean
-    public WebMvcConfigurer corsConfigurer() {
-        return new WebMvcConfigurerAdapter() {
-            @Override
-            public void addCorsMappings(CorsRegistry registry) {
-                registry.addMapping("/**");
-                        /*
-                        .allowedOrigins("http://localhost:4200")
-                        .allowedMethods("GET", "PUT", "POST", "PATCH", "DELETE", "OPTIONS")
-                        .allowedHeaders("origin", "Content-Type", "Authorization", "Accept", "Accept-Language", "X-Authorization", "X-Requested-With", "auth-username", "auth-password", "auth-token", "auth-key", "auth-token")
-                        .allowCredentials(false).maxAge(300);
-                         */
-            }
-        };
-    }
 }
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/InvitroPharmacologyDataSourceConfig.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/InvitroPharmacologyDataSourceConfig.java
index eb0bfd8..4b80733 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/InvitroPharmacologyDataSourceConfig.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/InvitroPharmacologyDataSourceConfig.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/GsrsInvitroPharmacologyAutoConfiguration.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/GsrsInvitroPharmacologyAutoConfiguration.java
index 95ac5c1..eadcd4b 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/GsrsInvitroPharmacologyAutoConfiguration.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/GsrsInvitroPharmacologyAutoConfiguration.java
@@ -6,7 +6,7 @@
 import gsrs.EnableGsrsApi;
 import gsrs.EnableGsrsJpaEntities;
 
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Bean;
 
@@ -14,7 +14,7 @@
 
 @EnableGsrsJpaEntities
 @EnableGsrsApi
-@Configuration
+@AutoConfiguration
 @Import({
         SubstanceApiService.class
 })
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/SubstancesApiConfiguration.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/SubstancesApiConfiguration.java
index 0662fc6..462566f 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/SubstancesApiConfiguration.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/autoconfigure/SubstancesApiConfiguration.java
@@ -15,7 +15,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 @Configuration
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroAssayScreeningController.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroAssayScreeningController.java
index 031cb3b..59f6178 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroAssayScreeningController.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroAssayScreeningController.java
@@ -43,17 +43,12 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.IOException;
-import java.io.OutputStream;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import net.minidev.json.JSONObject;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroPharmacologyController.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroPharmacologyController.java
index cef1a91..a62f674 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroPharmacologyController.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/controllers/InvitroPharmacologyController.java
@@ -45,9 +45,9 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.servlet.http.HttpServletRequest;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/indexers/InvitroPharmacologyIndexValueMaker.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/indexers/InvitroPharmacologyIndexValueMaker.java
index d0631a8..3bdba61 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/indexers/InvitroPharmacologyIndexValueMaker.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/indexers/InvitroPharmacologyIndexValueMaker.java
@@ -16,9 +16,9 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 
 import java.util.function.Consumer;
 import java.util.Optional;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayAnalyte.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayAnalyte.java
index d3a426b..f98d1a2 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayAnalyte.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayAnalyte.java
@@ -13,7 +13,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Set;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayInformation.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayInformation.java
index 52757a0..8473770 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayInformation.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayInformation.java
@@ -14,7 +14,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Date;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResult.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResult.java
index b8a14b4..978cf70 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResult.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResult.java
@@ -14,7 +14,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResultInformation.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResultInformation.java
index d1af1d2..6af9be5 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResultInformation.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayResultInformation.java
@@ -12,7 +12,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayScreening.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayScreening.java
index 4846745..a9f6d3c 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayScreening.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssayScreening.java
@@ -14,7 +14,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Date;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssaySet.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssaySet.java
index 1d6d9c1..1590e91 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssaySet.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroAssaySet.java
@@ -14,7 +14,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Date;
 import java.util.Set;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroControl.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroControl.java
index 89a7402..e75de5b 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroControl.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroControl.java
@@ -13,7 +13,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Set;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroLaboratory.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroLaboratory.java
index d0f1ede..5801fe0 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroLaboratory.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroLaboratory.java
@@ -9,7 +9,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @SingleParent
 @Data
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroPharmacologyCommanData.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroPharmacologyCommanData.java
index e8acdc6..e8b9501 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroPharmacologyCommanData.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroPharmacologyCommanData.java
@@ -15,7 +15,7 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroReference.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroReference.java
index 01b8324..5e307a1 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroReference.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroReference.java
@@ -13,7 +13,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Set;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsor.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsor.java
index 7ea59a4..f1e49d8 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsor.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsor.java
@@ -14,7 +14,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Date;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorReport.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorReport.java
index 859e1ae..b95e707 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorReport.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorReport.java
@@ -10,7 +10,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorSubmitter.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorSubmitter.java
index 13a91a6..b14d6cc 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorSubmitter.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSponsorSubmitter.java
@@ -14,7 +14,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.Date;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSummary.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSummary.java
index 89c0db4..5f5ff3b 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSummary.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroSummary.java
@@ -14,7 +14,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroTestAgent.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroTestAgent.java
index bfef5c8..c82de35 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroTestAgent.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/models/InvitroTestAgent.java
@@ -14,7 +14,7 @@
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroAssayScreeningEntityService.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroAssayScreeningEntityService.java
index c1cc5b1..7357cea 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroAssayScreeningEntityService.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroAssayScreeningEntityService.java
@@ -19,7 +19,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroPharmacologyEntityService.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroPharmacologyEntityService.java
index 2f54b52..6078e2b 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroPharmacologyEntityService.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/services/InvitroPharmacologyEntityService.java
@@ -20,8 +20,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/validators/AssayInformationUniqueValidator.java b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/validators/AssayInformationUniqueValidator.java
index 27bc5aa..2ced19d 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/validators/AssayInformationUniqueValidator.java
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/invitropharmacology/validators/AssayInformationUniqueValidator.java
@@ -11,8 +11,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.util.Objects;
 
 public class AssayInformationUniqueValidator implements ValidatorPlugin<InvitroAssayInformation> {
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
index 79c4551..e69de29 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=gov.hhs.gsrs.invitropharmacology.autoconfigure.GsrsInvitroPharmacologyAutoConfiguration,\
-gov.hhs.gsrs.invitropharmacology.autoconfigure.SubstancesApiConfiguration
\ No newline at end of file
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..0bf1cf5
--- /dev/null
+++ b/gsrs-module-invitro-pharmacology-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+gov.hhs.gsrs.invitropharmacology.autoconfigure.GsrsInvitroPharmacologyAutoConfiguration
+gov.hhs.gsrs.invitropharmacology.autoconfigure.SubstancesApiConfiguration
+
diff --git a/gsrs-module-invitro-pharmacology-spring-boot-starter/pom.xml b/gsrs-module-invitro-pharmacology-spring-boot-starter/pom.xml
index c4d4f91..2c30a79 100644
--- a/gsrs-module-invitro-pharmacology-spring-boot-starter/pom.xml
+++ b/gsrs-module-invitro-pharmacology-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>gsrs-module-invitro-pharmacology</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.2.0-SNAPSHOT </version>
+        <version>3.2.5-SNAPSHOT </version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 777fbf7..7ba90fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>gov.nih.ncats</groupId>
     <artifactId>gsrs-module-invitro-pharmacology</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.2.5-SNAPSHOT</version>
     <name>GSRS Invitro Pharmacology Module</name>
     <description>GSRS Invitro Pharmacology Module for Spring Boot</description>
 
@@ -29,15 +29,14 @@
     </scm>
 
     <properties>
-        <java.version>1.8</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
-        <lucene.version>4.10.0</lucene.version>
-        <gsrs.version>3.2.0-SNAPSHOT</gsrs.version>
-        <gsrs.invitro-pharmacology.version>3.2.0-SNAPSHOT</gsrs.invitro-pharmacology.version>
-        <log4j2.version>2.17.1</log4j2.version>
-        <spring-boot.version>2.7.18</spring-boot.version>
+        <java.version>17</java.version>
+        <spring-cloud.version>2025.008</spring-cloud.version>
+        <gsrs.version>3.2.5-SNAPSHOT</gsrs.version>
+        <gsrs.invitro-pharmacology.version>3.2.5-SNAPSHOT</gsrs.invitro-pharmacology.version>
+        <log4j2.version>2.22.1</log4j2.version>
+        <spring-boot.version>3.5.7</spring-boot.version>
         <!-- TO BE REMOVE -->
-        <gsrs.substance.version>3.2.0-SNAPSHOT</gsrs.substance.version>
+        <gsrs.substance.version>3.2.5-SNAPSHOT</gsrs.substance.version>
     </properties>
 
     <!-- NEW Maven Central Repository BEGIN - July 2025 -->
@@ -86,32 +85,4 @@
         </repository>
     </distributionManagement>
     <!-- NEW Maven Central Repository END -->
-
-
-    <!-- OLD Maven Repository -->
-    <!--
-    <repositories>
-        <repository>
-            <id>oss.sonatype.org-snapshot</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-    -->
 </project>