diff --git a/devops-service/db/mongo/models/stack/stack_ec2.rb b/devops-service/db/mongo/models/stack/stack_ec2.rb
index fcfec56..03ae847 100644
--- a/devops-service/db/mongo/models/stack/stack_ec2.rb
+++ b/devops-service/db/mongo/models/stack/stack_ec2.rb
@@ -8,7 +8,8 @@ module Devops
       end
 
       def stack_status
-        details['StackStatus'] if details
+        puts self.details.inspect
+        self.details['StackStatus'] if self.details
       end
 
       def bson_safe_details
diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index 5da703d..74bdaa1 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?
@@ -157,7 +150,8 @@ module Provider
       end
       s.public_ip = details["ipAddress"]
       s.private_ip = details["privateIpAddress"]
-#      set_server_tags(s)
+      tags = set_server_tags(s)
+      out << "Server tags: #{tags.inspect}\n"
       out << "\nDone\n\n"
       out << s.info
 
@@ -166,8 +160,14 @@ 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
     end
 
     def delete_server s
@@ -283,7 +283,10 @@ module Provider
     end
 
     def stack_details(stack)
-      cloud_formation.describe_stacks({'StackName' => stack.name}).body['Stacks'][0]
+      #cloud_formation.describe_stacks({'StackName' => stack.name}).body['Stacks'][0]
+      b = cloud_formation.describe_stacks({'StackName' => stack.name}).body
+      pp b
+      b['Stacks'][0]
     end
 
     def stack_resources(stack)