diff --git a/.gitignore b/.gitignore
index 8cc243e2..e5f3b799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 !/.trampolinerc
 !/.kokoro
 !/tsconfig*.json
+!/.ci
diff --git a/system-test/mysql2-connect.cjs b/system-test/mysql2-connect.cjs
index e7253f54..0a91361f 100644
--- a/system-test/mysql2-connect.cjs
+++ b/system-test/mysql2-connect.cjs
@@ -20,7 +20,7 @@ t.test('open connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'PASSWORD',
   });
   const conn = await mysql.createConnection({
@@ -42,7 +42,7 @@ t.test('open IAM connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
   const conn = await mysql.createConnection({
diff --git a/system-test/mysql2-connect.mjs b/system-test/mysql2-connect.mjs
index 9811eb61..86a6f898 100644
--- a/system-test/mysql2-connect.mjs
+++ b/system-test/mysql2-connect.mjs
@@ -20,7 +20,7 @@ t.test('open connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'PASSWORD',
   });
   const conn = await mysql.createConnection({
@@ -42,7 +42,7 @@ t.test('open IAM connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
   const conn = await mysql.createConnection({
diff --git a/system-test/mysql2-connect.ts b/system-test/mysql2-connect.ts
index 4da5b546..a7e24e06 100644
--- a/system-test/mysql2-connect.ts
+++ b/system-test/mysql2-connect.ts
@@ -29,6 +29,7 @@ t.test('open connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: String(process.env.MYSQL_CONNECTION_NAME),
+    ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
   });
   const conn = await mysql.createConnection({
     ...clientOpts,
@@ -50,7 +51,7 @@ t.test('open IAM connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: String(process.env.MYSQL_CONNECTION_NAME),
-    ipType: IpAddressTypes.PUBLIC,
+    ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
     authType: AuthTypes.IAM,
   });
   const conn = await mysql.createConnection({
diff --git a/system-test/pg-connect.cjs b/system-test/pg-connect.cjs
index ddd86157..f100a6e7 100644
--- a/system-test/pg-connect.cjs
+++ b/system-test/pg-connect.cjs
@@ -21,6 +21,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
+    ipType: process.env.IP_TYPE || 'PUBLIC',
   });
   const client = new Client({
     ...clientOpts,
@@ -49,7 +50,7 @@ t.test('open IAM connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
   const client = new Client({
@@ -79,6 +80,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       instanceConnectionName: String(process.env.POSTGRES_CAS_CONNECTION_NAME),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
@@ -112,6 +114,7 @@ t.test(
       instanceConnectionName: String(
         process.env.POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
       ),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
@@ -142,6 +145,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       domainName: String(process.env.POSTGRES_CUSTOMER_CAS_DOMAIN_NAME),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
@@ -172,6 +176,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       domainName: String(process.env.POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
diff --git a/system-test/pg-connect.mjs b/system-test/pg-connect.mjs
index 6860bdc7..ff41576f 100644
--- a/system-test/pg-connect.mjs
+++ b/system-test/pg-connect.mjs
@@ -22,6 +22,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
+    ipType: process.env.IP_TYPE || 'PUBLIC',
   });
   const client = new Client({
     ...clientOpts,
@@ -50,7 +51,7 @@ t.test('open IAM connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
   const client = new Client({
@@ -80,6 +81,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       instanceConnectionName: String(process.env.POSTGRES_CAS_CONNECTION_NAME),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
@@ -113,6 +115,7 @@ t.test(
       instanceConnectionName: String(
         process.env.POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
       ),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
@@ -143,6 +146,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       domainName: String(process.env.POSTGRES_CUSTOMER_CAS_DOMAIN_NAME),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
@@ -173,6 +177,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       domainName: String(process.env.POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME),
+      ipType: process.env.IP_TYPE || 'PUBLIC',
     });
     const client = new Client({
       ...clientOpts,
diff --git a/system-test/pg-connect.ts b/system-test/pg-connect.ts
index 60fe3076..0966aa3a 100644
--- a/system-test/pg-connect.ts
+++ b/system-test/pg-connect.ts
@@ -25,6 +25,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
+    ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
   });
   const client = new Client({
     ...clientOpts,
@@ -53,7 +54,7 @@ t.test('open IAM connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
-    ipType: IpAddressTypes.PUBLIC,
+    ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
     authType: AuthTypes.IAM,
   });
   const client = new Client({
@@ -83,6 +84,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       instanceConnectionName: String(process.env.POSTGRES_CAS_CONNECTION_NAME),
+      ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
     });
     const client = new Client({
       ...clientOpts,
@@ -116,6 +118,7 @@ t.test(
       instanceConnectionName: String(
         process.env.POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
       ),
+      ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
     });
     const client = new Client({
       ...clientOpts,
@@ -146,6 +149,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       domainName: String(process.env.POSTGRES_CUSTOMER_CAS_DOMAIN_NAME),
+      ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
     });
     const client = new Client({
       ...clientOpts,
@@ -176,6 +180,7 @@ t.test(
     const connector = new Connector();
     const clientOpts = await connector.getOptions({
       domainName: String(process.env.POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME),
+      ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
     });
     const client = new Client({
       ...clientOpts,
diff --git a/system-test/tedious-connect.cjs b/system-test/tedious-connect.cjs
index f2ead835..56cfadee 100644
--- a/system-test/tedious-connect.cjs
+++ b/system-test/tedious-connect.cjs
@@ -20,7 +20,7 @@ t.test('open connection and run basic sqlserver commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getTediousOptions({
     instanceConnectionName: process.env.SQLSERVER_CONNECTION_NAME,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
   });
   const connection = new Connection({
     server: '0.0.0.0',
diff --git a/system-test/tedious-connect.mjs b/system-test/tedious-connect.mjs
index 9fd0aa73..a5414441 100644
--- a/system-test/tedious-connect.mjs
+++ b/system-test/tedious-connect.mjs
@@ -20,7 +20,7 @@ t.test('open connection and run basic sqlserver commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getTediousOptions({
     instanceConnectionName: process.env.SQLSERVER_CONNECTION_NAME,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
   });
   const connection = new Connection({
     server: '0.0.0.0',
diff --git a/system-test/tedious-connect.ts b/system-test/tedious-connect.ts
index e789e273..ad7d62a1 100644
--- a/system-test/tedious-connect.ts
+++ b/system-test/tedious-connect.ts
@@ -20,7 +20,7 @@ t.test('open connection and run basic sqlserver commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getTediousOptions({
     instanceConnectionName: String(process.env.SQLSERVER_CONNECTION_NAME),
-    ipType: IpAddressTypes.PUBLIC,
+    ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
   });
   const connection = new Connection({
     server: '0.0.0.0',