diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index 26366f8..ed3f07d 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -103,14 +103,7 @@ module Provider
       options = {
         "InstanceType" => flavor,
 #        "Placement.AvailabilityZone" => s.options[:availability_zone],
-        "KeyName" => self.ssh_key,
-        "Tags" => {
-          "Name" => s.chef_node_name,
-          "cid:project" => s.project,
-          "cid:deployEnv" => s.deploy_env,
-          "cid:user" => s.created_by,
-          "cid:remoteUser" => s.remote_user
-        }
+        "KeyName" => self.ssh_key
       }
       vpcId = nil
       unless subnets.empty?
@@ -167,6 +160,11 @@ module Provider
 
     def set_server_tags s
       tags = {
+        "Name" => s.chef_node_name,
+        "cid:project" => s.project,
+        "cid:deployEnv" => s.deploy_env,
+        "cid:user" => s.created_by,
+        "cid:remoteUser" => s.remote_user
       }
       compute.create_tags(s.id, tags)
       tags
@@ -233,6 +231,7 @@ module Provider
             'Capabilities' => ['CAPABILITY_IAM'],
             'Tags' => {
               "StackName" => stack.name,
+              "StackTemplate" => stack.stack_template,
               "cid:project" => stack.project,
               "cid:deployEnv" => stack.deploy_env,
               "cid:user" => stack.owner