diff --git a/cloud/lxc/lxc_container.py b/cloud/lxc/lxc_container.py
index 678360afaec..2abbb41aedf 100644
--- a/cloud/lxc/lxc_container.py
+++ b/cloud/lxc/lxc_container.py
@@ -424,6 +424,8 @@ lxc_container:
             sample: True
 """
 
+import re
+
 try:
     import lxc
 except ImportError:
@@ -745,10 +747,13 @@ class LxcContainerManagement(object):
 
         config_change = False
         for key, value in parsed_options:
+            key = key.strip()
+            value = value.strip()
             new_entry = '%s = %s\n' % (key, value)
+            keyre = re.compile(r'%s(\s+)?=' % key)
             for option_line in container_config:
                 # Look for key in config
-                if option_line.startswith(key):
+                if keyre.match(option_line):
                     _, _value = option_line.split('=', 1)
                     config_value = ' '.join(_value.split())
                     line_index = container_config.index(option_line)