diff --git a/service/application/src/main/resources/command-configs.properties b/service/application/src/main/resources/command-configs.properties
index 95214535..c10c875c 100644
--- a/service/application/src/main/resources/command-configs.properties
+++ b/service/application/src/main/resources/command-configs.properties
@@ -1 +1 @@
-COMMAND_PATH=${user.home}${file.separator}commands
\ No newline at end of file
+COMMAND_PATH=${app.commandroot:-${user.home}}${file.separator}commands
diff --git a/service/terraform-plugin/src/main/java/com/solace/maas/ep/event/management/agent/plugin/terraform/configuration/TerraformProperties.java b/service/terraform-plugin/src/main/java/com/solace/maas/ep/event/management/agent/plugin/terraform/configuration/TerraformProperties.java
index c285e474..8cf7f52d 100644
--- a/service/terraform-plugin/src/main/java/com/solace/maas/ep/event/management/agent/plugin/terraform/configuration/TerraformProperties.java
+++ b/service/terraform-plugin/src/main/java/com/solace/maas/ep/event/management/agent/plugin/terraform/configuration/TerraformProperties.java
@@ -7,6 +7,6 @@
 @Service
 @Data
 public class TerraformProperties {
-    @Value("${COMMAND_PATH:${user.home}${file.separator}tfcommands}")
+    @Value("${app.commandroot:${user.home}}${file.separator}tfcommands")
     private String workingDirectoryRoot;
 }