diff --git a/pom.xml b/pom.xml
index a5d2b779cd..110d25a51c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
     <featureExtraction.version>3.8.0</featureExtraction.version>
     <SqlRender.version>1.19.1</SqlRender.version>
     <hive-jdbc.version>3.1.2</hive-jdbc.version>
+    <bigquery-jdbc.version>1.5.0</bigquery-jdbc.version>
     <jackson.version>2.18.2</jackson.version>
     <java.version>21</java.version>
     <maven.compiler.source>21</maven.compiler.source>
@@ -931,187 +932,21 @@
     </profile>
     <profile>
       <id>webapi-bigquery</id>
-      <properties>
-        <bigquery.enabled>true</bigquery.enabled>
-        <!-- BigQuery JDBC driver path -->
-        <bigquery.classpath>${basedir}/src/main/extras/bigquery</bigquery.classpath>
-      </properties>
       <dependencies>
-        <dependency>
-          <groupId>com.google.api-client</groupId>
-          <artifactId>google-api-client</artifactId>
-          <version>2.7.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.apis</groupId>
-          <artifactId>google-api-services-bigquery</artifactId>
-          <version>v2-rev20240919-2.0.0</version>
-        </dependency>
         <dependency>
           <groupId>com.google.cloud</groupId>
-          <artifactId>google-cloud-bigquery</artifactId>
-          <version>1.6.2.1003</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.http-client</groupId>
-          <artifactId>google-http-client</artifactId>
-          <version>1.45.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.http-client</groupId>
-          <artifactId>google-http-client-gson</artifactId>
-          <version>1.45.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.oauth-client</groupId>
-          <artifactId>google-oauth-client</artifactId>
-          <version>1.36.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.cloud</groupId>
-          <artifactId>google-cloud-bigquerystorage</artifactId>
-          <version>3.9.3</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.auth</groupId>
-          <artifactId>google-auth-library-oauth2-http</artifactId>
-          <version>1.28.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.auth</groupId>
-          <artifactId>google-auth-library-credentials</artifactId>
-          <version>1.28.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.api</groupId>
-          <artifactId>gax</artifactId>
-          <version>2.55.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.api</groupId>
-          <artifactId>gax-grpc</artifactId>
-          <version>2.55.0</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.api.grpc</groupId>
-          <artifactId>proto-google-cloud-bigquerystorage-v1</artifactId>
-          <version>3.9.3</version>
-        </dependency>
-        <dependency>
-          <groupId>io.opencensus</groupId>
-          <artifactId>opencensus-contrib-http-util</artifactId>
-          <version>0.31.1</version>
+          <artifactId>google-cloud-bigquery-jdbc</artifactId>
+          <version>${bigquery-jdbc.version}</version>
+          <classifier>all</classifier>
+          <scope>runtime</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>*</groupId>
+              <artifactId>*</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <version>2.5.2</version>
-            <executions>
-              <execution>
-                <id>google-api-client</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>com.google.api-client</groupId>
-                  <artifactId>google-api-client</artifactId>
-                  <version>2.7.0</version>
-                  <packaging>jar</packaging>
-                  <file>${bigquery.classpath}/google-api-client-2.7.0.jar</file>
-                </configuration>
-              </execution>
-              <execution>
-                <id>google-api-services-bigquery</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>com.google.apis</groupId>
-                  <artifactId>google-api-services-bigquery</artifactId>
-                  <version>v2-rev20240919-2.0.0</version>
-                  <packaging>jar</packaging>
-                  <file>${bigquery.classpath}/google-api-services-bigquery-v2-rev20240919-2.0.0.jar</file>
-                </configuration>
-              </execution>
-              <execution>
-                <id>google-cloud-bigquery</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>com.google.cloud</groupId>
-                  <artifactId>google-cloud-bigquery</artifactId>
-                  <version>1.6.2.1003</version>
-                  <packaging>jar</packaging>
-                  <file>${bigquery.classpath}/GoogleBigQueryJDBC42.jar</file>
-                </configuration>
-              </execution>
-              <execution>
-                <id>google-http-client</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>com.google.http-client</groupId>
-                  <artifactId>google-http-client</artifactId>
-                  <version>1.45.0</version>
-                  <packaging>jar</packaging>
-                  <file>${bigquery.classpath}/google-http-client-1.45.0.jar</file>
-                </configuration>
-              </execution>
-              <execution>
-                <id>google-http-client-gson</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>com.google.http-client</groupId>
-                  <artifactId>google-http-client-gson</artifactId>
-                  <version>1.45.0</version>
-                  <packaging>jar</packaging>
-                  <file>${bigquery.classpath}/google-http-client-gson-1.45.0.jar</file>
-                </configuration>
-              </execution>
-              <execution>
-                <id>google-oauth-client</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>com.google.oauth-client</groupId>
-                  <artifactId>google-oauth-client</artifactId>
-                  <version>1.36.0</version>
-                  <packaging>jar</packaging>
-                  <file>${bigquery.classpath}/google-oauth-client-1.36.0.jar</file>
-                </configuration>
-              </execution>
-              <execution>
-                <id>google-cloud-bigquerystorage</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>install-file</goal>
-                </goals>
-                <configuration>
-                  <groupId>com.google.cloud</groupId>
-                  <artifactId>google-cloud-bigquerystorage</artifactId>
-                  <version>3.9.3</version>
-                  <packaging>jar</packaging>
-                  <file>${bigquery.classpath}/google-cloud-bigquerystorage-3.9.3.jar</file>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
     <profile>
       <id>webapi-hive</id>
diff --git a/src/main/extras/bigquery/README.md b/src/main/extras/bigquery/README.md
deleted file mode 100644
index 1b52d3fe98..0000000000
--- a/src/main/extras/bigquery/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-To build WebAPI with Google BigQuery support do the following:
-1. Go to https://cloud.google.com/bigquery/partners/simba-drivers/ and 
-2. Download the JDBC 4.2 driver
-3. Unpack archive and set the bigquery.classpath property in your settings.xml to the unpacked archive location (ie: C://downloads/bigquery) inside the webapi-bigquery profile.
-4. Build WebAPI with webapi-bigquery profile. 
-   * mvn -Pwebapi-postgresql,webapi-bigquery clean package
diff --git a/src/main/java/org/ohdsi/webapi/DataAccessConfig.java b/src/main/java/org/ohdsi/webapi/DataAccessConfig.java
index 87a1b3a153..6013996212 100644
--- a/src/main/java/org/ohdsi/webapi/DataAccessConfig.java
+++ b/src/main/java/org/ohdsi/webapi/DataAccessConfig.java
@@ -99,7 +99,7 @@ public DataSource primaryDataSource() {
         HikariDataSource ds = new HikariDataSource(hikariConfig);
 
         String[] supportedDrivers;
-        supportedDrivers = new String[]{"org.postgresql.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "oracle.jdbc.driver.OracleDriver", "com.amazon.redshift.jdbc.Driver", "com.cloudera.impala.jdbc.Driver", "net.starschema.clouddb.jdbc.BQDriver", "org.netezza.Driver", "com.simba.googlebigquery.jdbc42.Driver", "org.apache.hive.jdbc.HiveDriver", "com.simba.spark.jdbc.Driver", "net.snowflake.client.jdbc.SnowflakeDriver", "com.databricks.client.jdbc.Driver", "com.intersystems.jdbc.IRISDriver"};
+        supportedDrivers = new String[]{"org.postgresql.Driver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "oracle.jdbc.driver.OracleDriver", "com.amazon.redshift.jdbc.Driver", "com.cloudera.impala.jdbc.Driver", "org.netezza.Driver", "com.google.cloud.bigquery.jdbc.BigQueryDriver", "org.apache.hive.jdbc.HiveDriver", "com.simba.spark.jdbc.Driver", "net.snowflake.client.jdbc.SnowflakeDriver", "com.databricks.client.jdbc.Driver", "com.intersystems.jdbc.IRISDriver"};
         for (String driverName : supportedDrivers) {
             try {
                 Class.forName(driverName);