diff --git a/src/main/java/com/devshawn/kafka/gitops/cli/AccountCommand.java b/src/main/java/com/devshawn/kafka/gitops/cli/AccountCommand.java
index 1f9dab9f..e654184c 100644
--- a/src/main/java/com/devshawn/kafka/gitops/cli/AccountCommand.java
+++ b/src/main/java/com/devshawn/kafka/gitops/cli/AccountCommand.java
@@ -46,7 +46,7 @@ private ManagerConfig generateStateManagerConfig() {
                 .setDeleteDisabled(parent.isDeleteDisabled())
                 .setIncludeUnchangedEnabled(false)
                 .setSkipAclsDisabled(parent.areAclsDisabled())
-                .setConfigFile(parent.getConfigFile())
+                .setNullableConfigFile(parent.getConfigFile())
                 .setStateFile(parent.getStateFile())
                 .build();
     }
diff --git a/src/main/java/com/devshawn/kafka/gitops/cli/ApplyCommand.java b/src/main/java/com/devshawn/kafka/gitops/cli/ApplyCommand.java
index 0c94bd96..55f39ff9 100644
--- a/src/main/java/com/devshawn/kafka/gitops/cli/ApplyCommand.java
+++ b/src/main/java/com/devshawn/kafka/gitops/cli/ApplyCommand.java
@@ -55,7 +55,7 @@ private ManagerConfig generateStateManagerConfig() {
                 .setDeleteDisabled(parent.isDeleteDisabled())
                 .setIncludeUnchangedEnabled(false)
                 .setSkipAclsDisabled(parent.areAclsDisabled())
-                .setConfigFile(parent.getConfigFile())
+                .setNullableConfigFile(parent.getConfigFile())
                 .setStateFile(parent.getStateFile())
                 .setNullablePlanFile(planFile)
                 .build();
diff --git a/src/main/java/com/devshawn/kafka/gitops/cli/PlanCommand.java b/src/main/java/com/devshawn/kafka/gitops/cli/PlanCommand.java
index f8c4e8f4..2800bc41 100644
--- a/src/main/java/com/devshawn/kafka/gitops/cli/PlanCommand.java
+++ b/src/main/java/com/devshawn/kafka/gitops/cli/PlanCommand.java
@@ -58,7 +58,7 @@ private ManagerConfig generateStateManagerConfig() {
                 .setVerboseRequested(parent.isVerboseRequested())
                 .setDeleteDisabled(parent.isDeleteDisabled())
                 .setIncludeUnchangedEnabled(includeUnchanged)
-                .setConfigFile(parent.getConfigFile())
+                .setNullableConfigFile(parent.getConfigFile())
                 .setStateFile(parent.getStateFile())
                 .setSkipAclsDisabled(parent.areAclsDisabled())
                 .setNullablePlanFile(outputFile)
diff --git a/src/main/java/com/devshawn/kafka/gitops/cli/ValidateCommand.java b/src/main/java/com/devshawn/kafka/gitops/cli/ValidateCommand.java
index c9553be0..bc390891 100644
--- a/src/main/java/com/devshawn/kafka/gitops/cli/ValidateCommand.java
+++ b/src/main/java/com/devshawn/kafka/gitops/cli/ValidateCommand.java
@@ -38,7 +38,7 @@ private ManagerConfig generateStateManagerConfig() {
                 .setDeleteDisabled(parent.isDeleteDisabled())
                 .setIncludeUnchangedEnabled(false)
                 .setSkipAclsDisabled(parent.areAclsDisabled())
-                .setConfigFile(parent.getConfigFile())
+                .setNullableConfigFile(parent.getConfigFile())
                 .setStateFile(parent.getStateFile())
                 .build();
     }
diff --git a/src/main/java/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoader.java b/src/main/java/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoader.java
index 4cb329bf..13416c79 100644
--- a/src/main/java/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoader.java
+++ b/src/main/java/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoader.java
@@ -33,7 +33,7 @@ private static void setConfigFromFile(File configFile, KafkaGitopsConfig.Builder
         if (configFile == null) {
             return;
         }
-        try(InputStream inputStream = new FileInputStream(configFile)) {
+        try (InputStream inputStream = new FileInputStream(configFile)) {
             Properties properties = new Properties();
             properties.load(inputStream);
             properties.forEach( (k, v) -> builder.putConfig(k.toString(), v));
@@ -60,21 +60,21 @@ private static void setConfigFromEnvironment(KafkaGitopsConfig.Builder builder)
             }
         });
 
-        handleDefaultConfig(config);
         handleAuthentication(username, password, config);
 
         log.info("Kafka Config: {}", config);
 
         builder.putAllConfig(config);
+        handleDefaultConfig(builder);
     }
 
-    private static void handleDefaultConfig(Map<String, Object> config) {
-        if (!config.containsKey(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)) {
-            config.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+    private static void handleDefaultConfig(KafkaGitopsConfig.Builder builder) {
+        if (!builder.getConfig().containsKey(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG)) {
+            builder.putConfig(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
         }
 
-        if (!config.containsKey(CommonClientConfigs.CLIENT_ID_CONFIG)) {
-            config.put(CommonClientConfigs.CLIENT_ID_CONFIG, "kafka-gitops");
+        if (!builder.getConfig().containsKey(CommonClientConfigs.CLIENT_ID_CONFIG)) {
+            builder.putConfig(CommonClientConfigs.CLIENT_ID_CONFIG, "kafka-gitops");
         }
     }
 
diff --git a/src/main/java/com/devshawn/kafka/gitops/config/ManagerConfig.java b/src/main/java/com/devshawn/kafka/gitops/config/ManagerConfig.java
index 9f450fc8..1c765442 100644
--- a/src/main/java/com/devshawn/kafka/gitops/config/ManagerConfig.java
+++ b/src/main/java/com/devshawn/kafka/gitops/config/ManagerConfig.java
@@ -18,7 +18,7 @@ public interface ManagerConfig {
 
     boolean isSkipAclsDisabled();
 
-    File getConfigFile();
+    Optional<File> getConfigFile();
 
     File getStateFile();
 
diff --git a/src/test/groovy/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoaderSpec.groovy b/src/test/groovy/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoaderSpec.groovy
index a949286f..8202cb79 100644
--- a/src/test/groovy/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoaderSpec.groovy
+++ b/src/test/groovy/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoaderSpec.groovy
@@ -48,13 +48,14 @@ class KafkaGitopsConfigLoaderSpec extends Specification {
     void 'test command config file'() {
         setup:
         File configFile = new File(getClass().getResource("/command.properties").toURI())
+        environmentVariables.clear("KAFKA_BOOTSTRAP_SERVERS")
 
         when:
         KafkaGitopsConfig config = KafkaGitopsConfigLoader.load(configFile)
 
         then:
-        config.config.get(CommonClientConfigs.CLIENT_ID_CONFIG) == "kafka-gitops"
-        config.config.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG) == "localhost:9092"
+        config.config.get(CommonClientConfigs.CLIENT_ID_CONFIG) == "kafka-client-id"
+        config.config.get(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG) == "example.com:9092"
         config.config.get(SaslConfigs.SASL_MECHANISM) == "PLAIN"
     }
 
diff --git a/src/test/resources/command.properties b/src/test/resources/command.properties
index 25cb1e92..9783d4c8 100644
--- a/src/test/resources/command.properties
+++ b/src/test/resources/command.properties
@@ -1,2 +1,2 @@
-bootstrap.servers=commande.9092
-client.id=kafka-gitops
\ No newline at end of file
+bootstrap.servers=example.com:9092
+client.id=kafka-client-id
\ No newline at end of file