diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 855022f617ab9df3f9c6629c769b6bfa09c20c36..e41c52ccb04d9e4f82fa69fe023fec335aadca6a 100644
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -68,13 +68,16 @@ def add_prefix(target):
     return wrapper
 
 
-def sysprep(message, enabled=True):
+def sysprep(message, enabled=True, **kwargs):
     """Decorator for system preparation tasks"""
     def wrapper1(func):
         func.sysprep = True
         func.enabled = enabled
         func.executed = False
 
+        for key, val in kwargs.items():
+            setattr(func, key, val)
+
         @wraps(func)
         def wrapper2(self, print_message=True):
             if print_message: