diff --git a/lib/utils/aws/CloudFormation.js b/lib/utils/aws/CloudFormation.js
index 1504f7e11..dd267094d 100644
--- a/lib/utils/aws/CloudFormation.js
+++ b/lib/utils/aws/CloudFormation.js
@@ -135,30 +135,28 @@ module.exports = function(config) {
 
     // CF Params
     let params = {
-      Capabilities:        [
+      Capabilities: [
         'CAPABILITY_IAM'
       ],
       Parameters: [],
-      Tags: [{
-        Key:   'STAGE',
-        Value: stage
-      }],
       TemplateURL: templateUrl
     };
 
-    // Create or Update
+    // Create stack
     if (!stackName) {
+      params.Tags = [{
+        Key:   'STAGE',
+        Value: stage
+      }];
 
       params.StackName = CloudFormation.sGetResourcesStackName(stage, project);
       params.OnFailure = 'DELETE';
       return CloudFormation.createStackPromised(params);
-
-    } else if (type == 'update') {
-
-      params.StackName = stackName;
-      params.OnFailure = 'ROLLBACK';
-      return CloudFormation.updateStackPromised(params);
     }
+
+    // Update stack
+    params.StackName = stackName;
+    return CloudFormation.updateStackPromised(params);
   };
 
   /**