diff --git a/imagefactory_plugins/EC2/EC2.py b/imagefactory_plugins/EC2/EC2.py
index 9e927f99..85842431 100644
--- a/imagefactory_plugins/EC2/EC2.py
+++ b/imagefactory_plugins/EC2/EC2.py
@@ -61,7 +61,7 @@ def __init__(self):
         self.log = logging.getLogger('%s.%s' % (__name__, self.__class__.__name__))
         config_obj = ApplicationConfiguration()
         self.app_config = config_obj.configuration
-        self.oz_config = configparser.SafeConfigParser()
+        self.oz_config = configparser.ConfigParser()
         self.oz_config.read("/etc/oz/oz.cfg")
         self.oz_config.set('paths', 'output_dir', self.app_config["imgdir"])
         self.guest = None
@@ -118,7 +118,7 @@ def builder_did_create_target_image(self, builder, target, image_id, template, p
 
             # populate a config object to pass to OZ; this allows us to specify our
             # own output dir but inherit other Oz behavior
-            self.oz_config = configparser.SafeConfigParser()
+            self.oz_config = configparser.ConfigParser()
             self.oz_config.read("/etc/oz/oz.cfg")
             self.oz_config.set('paths', 'output_dir', self.app_config["imgdir"])
 
diff --git a/imagefactory_plugins/IndirectionCloud/IndirectionCloud.py b/imagefactory_plugins/IndirectionCloud/IndirectionCloud.py
index ff364db8..83606444 100644
--- a/imagefactory_plugins/IndirectionCloud/IndirectionCloud.py
+++ b/imagefactory_plugins/IndirectionCloud/IndirectionCloud.py
@@ -282,7 +282,7 @@ def oz_refresh_customizations(self, partial_tdl):
     def _init_oz(self):
         # populate a config object to pass to OZ; this allows us to specify our
         # own output dir but inherit other Oz behavior
-        self.oz_config = configparser.SafeConfigParser()
+        self.oz_config = configparser.ConfigParser()
         if self.oz_config.read("/etc/oz/oz.cfg") != []:
             self.oz_config.set('paths', 'output_dir', self.app_config["imgdir"])
             if "oz_data_dir" in self.app_config:
diff --git a/imagefactory_plugins/Nova/Nova.py b/imagefactory_plugins/Nova/Nova.py
index ff7cc08f..8a31e7aa 100644
--- a/imagefactory_plugins/Nova/Nova.py
+++ b/imagefactory_plugins/Nova/Nova.py
@@ -28,7 +28,7 @@
 from time import sleep
 from base64 import b64decode
 #TODO: remove dependency on Oz
-from configparser import SafeConfigParser
+from configparser import ConfigParser
 from oz.TDL import TDL
 import oz.GuestFactory
 
@@ -438,7 +438,7 @@ def _confirm_ssh_access(self, guest, addr, timeout=300):
         return confirmation
 
     def _oz_config(self, private_key_file):
-        config = SafeConfigParser()
+        config = ConfigParser()
         if config.read("/etc/oz/oz.cfg"):
             config.set('paths', 'output_dir', self.app_config['imgdir'])
             config.set('paths', 'sshprivkey', private_key_file)
diff --git a/imagefactory_plugins/Rackspace/Rackspace.py b/imagefactory_plugins/Rackspace/Rackspace.py
index e045d145..9cfb6115 100644
--- a/imagefactory_plugins/Rackspace/Rackspace.py
+++ b/imagefactory_plugins/Rackspace/Rackspace.py
@@ -64,7 +64,7 @@ def __init__(self):
         self.log = logging.getLogger('%s.%s' % (__name__, self.__class__.__name__))
         config_obj = ApplicationConfiguration()
         self.app_config = config_obj.configuration
-        self.oz_config = configparser.SafeConfigParser()
+        self.oz_config = configparser.ConfigParser()
         self.oz_config.read("/etc/oz/oz.cfg")
         self.oz_config.set('paths', 'output_dir', self.app_config["imgdir"])
         self.active_image = None
diff --git a/imagefactory_plugins/TinMan/TinMan.py b/imagefactory_plugins/TinMan/TinMan.py
index 219a78e4..0d6099dc 100644
--- a/imagefactory_plugins/TinMan/TinMan.py
+++ b/imagefactory_plugins/TinMan/TinMan.py
@@ -269,7 +269,7 @@ def _init_oz(self):
 
         # populate a config object to pass to OZ; this allows us to specify our
         # own output dir but inherit other Oz behavior
-        self.oz_config = configparser.SafeConfigParser()
+        self.oz_config = configparser.ConfigParser()
         if self.oz_config.read("/etc/oz/oz.cfg") != []:
             if self.parameters.get("oz_overrides", None) != None:
                 oz_overrides = json.loads(self.parameters.get("oz_overrides",None).replace("'", "\""))