diff --git a/v3/pom.xml b/v3/pom.xml
index 068a7bcb..166c7d24 100644
--- a/v3/pom.xml
+++ b/v3/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>skyflow-java</artifactId>
-    <version>2.0.0-beta.4-dev.f012079</version>
+    <version>2.0.0-beta.4-dev.4b56b3d</version>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Skyflow V3 SDK for the Java programming language</description>
diff --git a/v3/src/main/java/com/skyflow/VaultClient.java b/v3/src/main/java/com/skyflow/VaultClient.java
index a2297b49..b53143fd 100644
--- a/v3/src/main/java/com/skyflow/VaultClient.java
+++ b/v3/src/main/java/com/skyflow/VaultClient.java
@@ -95,11 +95,13 @@ private void prioritiseCredentials() throws SkyflowException {
             } else if (this.commonCredentials != null) {
                 this.finalCredentials = this.commonCredentials;
             } else {
-                Dotenv dotenv = Dotenv.load();
-                String sysCredentials = dotenv.get(Constants.ENV_CREDENTIALS_KEY_NAME);
+                String sysCredentials = System.getenv(Constants.ENV_CREDENTIALS_KEY_NAME);
                 if (sysCredentials == null) {
-                    throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
-                            ErrorMessage.EmptyCredentials.getMessage());
+                    Dotenv dotenv = Dotenv.load();
+                    sysCredentials = dotenv.get(Constants.ENV_CREDENTIALS_KEY_NAME);
+                }
+                if (sysCredentials == null) {
+                    throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyCredentials.getMessage());
                 } else {
                     this.finalCredentials = new Credentials();
                     this.finalCredentials.setCredentialsString(sysCredentials);
diff --git a/v3/test/java/com/skyflow/vault/controller/VaultControllerTests.java b/v3/test/java/com/skyflow/vault/controller/VaultControllerTests.java
index 7ffa1d3a..4467057c 100644
--- a/v3/test/java/com/skyflow/vault/controller/VaultControllerTests.java
+++ b/v3/test/java/com/skyflow/vault/controller/VaultControllerTests.java
@@ -16,7 +16,7 @@
 
 
 public class VaultControllerTests {
-    private static final String ENV_PATH = "/home/saib/skyflow3/skyflow-java/v3/.env";
+    private static final String ENV_PATH = "./.env";
 
     private VaultConfig vaultConfig;
     private Credentials credentials;
@@ -42,14 +42,28 @@ public void tearDown() {
     }
 
     private void writeEnv(String content) {
-        try (FileWriter writer = new FileWriter(ENV_PATH)) {
+        java.io.File envFile = new java.io.File(ENV_PATH);
+        java.io.File parentDir = envFile.getParentFile();
+        if (parentDir != null && !parentDir.exists()) {
+            parentDir.mkdirs(); // Create parent directory if it doesn't exist
+        }
+        try (FileWriter writer = new FileWriter(envFile)) {
             writer.write(content);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+        // Print the contents of the .env file
+        try (Scanner scanner = new Scanner(envFile)) {
+            System.out.println("Current .env contents:");
+            while (scanner.hasNextLine()) {
+                System.out.println(scanner.nextLine());
+            }
+        } catch (IOException e) {
+            System.out.println("Could not read .env file: " + e.getMessage());
+        }
     }
 
-    private VaultController createController() {
+    private VaultController createController() throws SkyflowException {
         return new VaultController(vaultConfig, credentials);
     }
 
@@ -354,7 +368,7 @@ public void testHighConcurrencyForLowRecords() throws Exception {
     public void testFractionalLastBatch() throws Exception {
         writeEnv("INSERT_BATCH_SIZE=100");
         VaultController controller = createController();
-        InsertRequest insertRequest = InsertRequest.builder().table("table1").values(generateValues(10050)).build();
+        InsertRequest insertRequest = InsertRequest.builder().table("table1").values(generateValues(9050)).build();
 
         try {
             controller.bulkInsert(insertRequest);