diff --git a/otelcollector/main/main.go b/otelcollector/main/main.go
index aa3fe8c1..32bd9655 100644
--- a/otelcollector/main/main.go
+++ b/otelcollector/main/main.go
@@ -56,7 +56,7 @@ func main() {
 		shared.StartCommand("powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", "C:\\opt\\scripts\\filesystemwatcher.ps1")
 	}
 
-	if ccpMetricsEnabled != "true" {
+	if ccpMetricsEnabled != "true" && osType == "linux" {
 		if err := shared.SetupArcEnvironment(); err != nil {
 			shared.EchoError(err.Error())
 		}
diff --git a/otelcollector/shared/configmap/mp/configmapparser.go b/otelcollector/shared/configmap/mp/configmapparser.go
index 419f4b21..da6e63df 100644
--- a/otelcollector/shared/configmap/mp/configmapparser.go
+++ b/otelcollector/shared/configmap/mp/configmapparser.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 
 	"github.com/prometheus-collector/shared"
@@ -239,18 +238,17 @@ func Configmapparser() {
 		}
 
 		// Source prom_config_validator_env_var
-		cmd := exec.Command("bash", "-c", "source /opt/microsoft/prom_config_validator_env_var && env")
-		if err := cmd.Run(); err != nil {
-			shared.EchoError("Error sourcing env file:" + err.Error())
-			return
-		}
-
-		// Source envvars.env
-		cmd = exec.Command("bash", "-c", "source /opt/envvars.env && env")
-		if err := cmd.Run(); err != nil {
-			shared.EchoError("Error sourcing envvars.env:" + err.Error())
-			return
-		}
+		filename := "/opt/microsoft/prom_config_validator_env_var"
+	  err = shared.SetEnvVarsFromFile(filename)
+	  if err != nil {
+		  fmt.Printf("Error when settinng env for /opt/microsoft/prom_config_validator_env_var: %v\n", err)
+	  }
+
+		filename = "/opt/envvars.env"
+	  err = shared.SetEnvVarsFromFile(filename)
+	  if err != nil {
+		  fmt.Printf("Error when settinng env for /opt/envvars.env: %v\n", err)
+	  }		
 	}
 
 	fmt.Printf("prom-config-validator::Use default prometheus config: %s\n", os.Getenv("AZMON_USE_DEFAULT_PROMETHEUS_CONFIG"))