diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb
index fc725db..4aa63d3 100644
--- a/devops-service/lib/executors/server_executor.rb
+++ b/devops-service/lib/executors/server_executor.rb
@@ -252,12 +252,12 @@ module Devops
         begin
           #raise "hello"
           @out << "\n"
+          run_list = compute_run_list
+          @out << "\nComputed run list: #{run_list.join(", ")}"
           @out.flush
-          # run_list = @server.run_list + provider.run_list
-          # @out << "\nRun list: #{run_list.inspect}"
-          # s.options[:run_list] += run_list
-          # @knife_instance.set_run_list(@server.chef_node_name, run_list)
-          deploy_status = deploy_server(@project.deploy_info(@deploy_env))
+          @knife_instance.set_run_list(@server.chef_node_name, run_list)
+          deploy_info = @project.deploy_info(@deploy_env)
+          deploy_status = deploy_server(deploy_info)
           if deploy_status == 0
             0
           else
@@ -346,7 +346,7 @@ module Devops
           @out.flush
           cmd << " -j http://#{DevopsConfig.config[:address]}:#{DevopsConfig.config[:port]}/#{DevopsConfig.config[:url_prefix]}/v2.0/deploy/data/#{file}"
         else
-          cmd << " -r #{deploy_info["run_list"].join(",")}"
+          cmd << " -r #{deploy_info["run_list"].join(",")}" unless @server.stack.nil?
         end
         ip = if @server.public_ip.nil?
           @server.private_ip
@@ -433,16 +433,28 @@ module Devops
         out << "Project run list: #{@project.run_list.join(", ")}\n"
         out << "Deploy environment run list: #{@deploy_env.run_list.join(", ")}\n"
         out << "Server run list: #{@server.run_list.join(", ")}\n"
+=begin
         rlist = Set.new.merge(@deploy_env.provider_instance.run_list).merge(@project.run_list).merge(@deploy_env.run_list).merge(@server.run_list)
         if @server.stack
           stack = Devops::Db.connector.stack(@server.stack)
           out << "Stack run list: #{stack.run_list.join(", ")}\n"
           rlist.merge(stack.run_list)
         end
-        deploy_info["run_list"] = rlist.to_a
+=end
+        deploy_info["run_list"] = compute_run_list
         out << "New deploy run list: #{deploy_info["run_list"].join(", ")}\nRun list has been generated\n\n"
       end
 
+      def compute_run_list
+        rlist = Set.new.merge(@deploy_env.provider_instance.run_list).merge(@project.run_list).merge(@deploy_env.run_list).merge(@server.run_list)
+        if @server.stack
+          stack = Devops::Db.connector.stack(@server.stack)
+          out << "Stack run list: #{stack.run_list.join(", ")}\n"
+          rlist.merge(stack.run_list)
+        end
+        rlist.to_a
+      end
+
       private
 
       def schedule_expiration(server)