diff --git a/pkg/util/configuration_map.go b/pkg/util/configuration_map.go
index a27a9844314..3b99c54722a 100644
--- a/pkg/util/configuration_map.go
+++ b/pkg/util/configuration_map.go
@@ -40,9 +40,9 @@ func (m *ConfigurationMap) Set(value string) error {
 		}
 		arr := strings.SplitN(s, "=", 2)
 		if len(arr) == 2 {
-			(*m)[arr[0]] = arr[1]
+			(*m)[strings.TrimSpace(arr[0])] = strings.TrimSpace(arr[1])
 		} else {
-			(*m)[arr[0]] = ""
+			(*m)[strings.TrimSpace(arr[0])] = ""
 		}
 	}
 	return nil