diff --git a/muranoconductor/commands/cloud_formation.py b/muranoconductor/commands/cloud_formation.py
index de2fdbc..bd7e829 100644
--- a/muranoconductor/commands/cloud_formation.py
+++ b/muranoconductor/commands/cloud_formation.py
@@ -132,7 +132,8 @@ class HeatExecutor(CommandBase):
                 self._heat_client.stacks.create(
                     stack_name=self._stack,
                     parameters=arguments,
-                    template=template)
+                    template=template,
+                    disable_rollback=False)
 
                 log.debug('Waiting for the stack {0} to be create'.format(
                     self._stack))
diff --git a/tests/conductor/test_heat_commands.py b/tests/conductor/test_heat_commands.py
index e3c2fe3..b0f236d 100644
--- a/tests/conductor/test_heat_commands.py
+++ b/tests/conductor/test_heat_commands.py
@@ -84,7 +84,8 @@ class TestHeatExecutor(unittest.TestCase):
                 "testName": {
                     "testKey": "testValue"
                 }
-            })
+            },
+            disable_rollback=False)
         callback.assert_called_with({})
 
     @mock.patch('heatclient.v1.client.Client')