diff --git a/colorbleed/plugins/maya/create/colorbleed_renderglobals.py b/colorbleed/plugins/maya/create/colorbleed_renderglobals.py
index e942a827d7..9fc3e0ceab 100644
--- a/colorbleed/plugins/maya/create/colorbleed_renderglobals.py
+++ b/colorbleed/plugins/maya/create/colorbleed_renderglobals.py
@@ -1,5 +1,7 @@
 from maya import cmds
 
+import colorbleed.maya.lib as lib
+
 from avalon.vendor import requests
 import avalon.maya
 from avalon import api
@@ -57,6 +59,6 @@ class CreateRenderGlobals(avalon.maya.Creator):
         if exists:
             return cmds.warning("%s already exists." % exists[0])
 
-        super(CreateRenderGlobals, self).process()
-
-        cmds.setAttr("{}.machineList".format(self.name), lock=True)
+        with lib.undo_chunk():
+            super(CreateRenderGlobals, self).process()
+            cmds.setAttr("{}.machineList".format(self.name), lock=True)
diff --git a/colorbleed/plugins/maya/create/colorbleed_rig.py b/colorbleed/plugins/maya/create/colorbleed_rig.py
index 6947aaac31..1212abb6ce 100644
--- a/colorbleed/plugins/maya/create/colorbleed_rig.py
+++ b/colorbleed/plugins/maya/create/colorbleed_rig.py
@@ -1,5 +1,6 @@
 from maya import cmds
 
+import colorbleed.maya.lib as lib
 import avalon.maya
 
 
@@ -12,10 +13,11 @@ class CreateRig(avalon.maya.Creator):
     icon = "wheelchair"
 
     def process(self):
-        instance = super(CreateRig, self).process()
 
-        self.log.info("Creating Rig instance set up ...")
+        with lib.undo_chunk():
+            instance = super(CreateRig, self).process()
 
-        controls = cmds.sets(name="controls_SET", empty=True)
-        pointcache = cmds.sets(name="out_SET", empty=True)
-        cmds.sets([controls, pointcache], forceElement=instance)
+            self.log.info("Creating Rig instance set up ...")
+            controls = cmds.sets(name="controls_SET", empty=True)
+            pointcache = cmds.sets(name="out_SET", empty=True)
+            cmds.sets([controls, pointcache], forceElement=instance)
diff --git a/colorbleed/plugins/maya/create/colorbleed_yeti_rig.py b/colorbleed/plugins/maya/create/colorbleed_yeti_rig.py
index 3b21c586a7..55051100ad 100644
--- a/colorbleed/plugins/maya/create/colorbleed_yeti_rig.py
+++ b/colorbleed/plugins/maya/create/colorbleed_yeti_rig.py
@@ -1,5 +1,6 @@
 from maya import cmds
 
+import colorbleed.maya.lib as lib
 import avalon.maya
 
 
@@ -12,9 +13,9 @@ class CreateYetiRig(avalon.maya.Creator):
 
     def process(self):
 
-        instance = super(CreateYetiRig, self).process()
+        with lib.undo_chunk():
+            instance = super(CreateYetiRig, self).process()
 
-        self.log.info("Creating Rig instance set up ...")
-
-        input_meshes = cmds.sets(name="input_SET", empty=True)
-        cmds.sets(input_meshes, forceElement=instance)
+            self.log.info("Creating Rig instance set up ...")
+            input_meshes = cmds.sets(name="input_SET", empty=True)
+            cmds.sets(input_meshes, forceElement=instance)