diff --git a/client/src/driver/BitBakeProjectScanner.ts b/client/src/driver/BitBakeProjectScanner.ts
index a451b2c8..f9fc280d 100644
--- a/client/src/driver/BitBakeProjectScanner.ts
+++ b/client/src/driver/BitBakeProjectScanner.ts
@@ -238,7 +238,7 @@ export class BitBakeProjectScanner {
     }
     if (this.containerMountPoint === undefined && !hostToContainer) {
       // Should only be called through scanAvailableLayers()
-      const hostWorkdir = this.bitbakeDriver?.bitbakeSettings.workingDirectory
+      const hostWorkdir = this.bitbakeDriver?.getBuildConfig('workingDirectory')
       if (hostWorkdir === undefined) {
         throw new Error('hostWorkdir is undefined')
       }
diff --git a/client/src/driver/BitbakeDriver.ts b/client/src/driver/BitbakeDriver.ts
index 43c476c8..7960c2cc 100644
--- a/client/src/driver/BitbakeDriver.ts
+++ b/client/src/driver/BitbakeDriver.ts
@@ -40,7 +40,7 @@ export class BitbakeDriver {
     })
   }
 
-  private getBuildConfig (property: keyof BitbakeBuildConfigSettings): any {
+  getBuildConfig (property: keyof BitbakeBuildConfigSettings): any {
     return getBuildSetting(this.bitbakeSettings, this.activeBuildConfiguration, property)
   }
 
@@ -129,7 +129,7 @@ export class BitbakeDriver {
       return false
     }
 
-    if ((this.bitbakeSettings.workingDirectory != null) && !fs.existsSync(this.bitbakeSettings.workingDirectory)) {
+    if ((this.getBuildConfig('workingDirectory') != null) && !fs.existsSync(this.getBuildConfig('workingDirectory'))) {
       // If it is not defined, then we will use the workspace folder which is always valid
       clientNotificationManager.showBitbakeSettingsError('Working directory does not exist.')
       return false
diff --git a/client/src/ui/BitbakeCommands.ts b/client/src/ui/BitbakeCommands.ts
index 2137aabc..d231c3c5 100644
--- a/client/src/ui/BitbakeCommands.ts
+++ b/client/src/ui/BitbakeCommands.ts
@@ -451,7 +451,7 @@ async function checkIdeSdkAvailable (bitbakeDriver: BitbakeDriver): Promise<bool
 }
 
 function checkIdeSdkConfiguration (bitbakeDriver: BitbakeDriver): boolean {
-  const sdkImage = bitbakeDriver.bitbakeSettings.sdkImage
+  const sdkImage = bitbakeDriver.getBuildConfig('sdkImage')
   return sdkImage !== undefined && sdkImage !== ''
 }
 
@@ -620,7 +620,7 @@ async function devtoolDeployCommand (bitbakeWorkspace: BitbakeWorkspace, bitBake
   const bitbakeDriver = bitBakeProjectScanner.bitbakeDriver
   if (chosenRecipe !== undefined) {
     logger.debug(`Command: devtool-deploy: ${chosenRecipe}`)
-    const sshTarget = bitbakeDriver.bitbakeSettings.sshTarget
+    const sshTarget = bitbakeDriver.getBuildConfig('sshTarget')
     if (sshTarget === undefined || sshTarget === '') {
       clientNotificationManager.showSDKConfigurationError()
       return