diff --git a/WindowsAgent/WindowsAgent/App.config b/WindowsAgent/WindowsAgent/App.config
index 2c1d906..3df6972 100644
--- a/WindowsAgent/WindowsAgent/App.config
+++ b/WindowsAgent/WindowsAgent/App.config
@@ -18,4 +18,13 @@
 			<logger name="*" minlevel="Debug" writeTo="file" />
 		</rules>
 	</nlog>
+	<appSettings>
+		<add key="rabbitmq.host" value="localhost"/>
+		<add key="rabbitmq.user" value="guest"/>
+		<add key="rabbitmq.password" value="guest"/>
+		<add key="rabbitmq.vhost" value="/"/>
+		<add key="rabbitmq.resultExchange" value=""/>
+		<add key="rabbitmq.resultQueue" value="-execution-results"/>
+
+	</appSettings>
 </configuration>
\ No newline at end of file
diff --git a/WindowsAgent/WindowsAgent/ExecutionPlan.cs b/WindowsAgent/WindowsAgent/ExecutionPlan.cs
index 9c0be86..899c5cc 100644
--- a/WindowsAgent/WindowsAgent/ExecutionPlan.cs
+++ b/WindowsAgent/WindowsAgent/ExecutionPlan.cs
@@ -16,5 +16,6 @@ namespace Mirantis.Keero.WindowsAgent
 
 		public string[] Scripts { get; set; }
 		public LinkedList<Command> Commands { get; set; }
+		public int RebootOnCompletion { get; set; }
 	}
 }
diff --git a/WindowsAgent/WindowsAgent/PlanExecutor.cs b/WindowsAgent/WindowsAgent/PlanExecutor.cs
index 7baab0b..ad4910c 100644
--- a/WindowsAgent/WindowsAgent/PlanExecutor.cs
+++ b/WindowsAgent/WindowsAgent/PlanExecutor.cs
@@ -24,20 +24,23 @@ namespace Mirantis.Keero.WindowsAgent
 			this.path = path;
 		}
 
+		public bool RebootNeeded { get; set; }
+
 		public string Execute()
 		{
+			RebootNeeded = false;
 			try
 			{
 				var plan = JsonConvert.DeserializeObject<ExecutionPlan>(File.ReadAllText(this.path));
 				var resultPath = this.path + ".result";
-				List<object> currentResults = null;
+				List<ExecutionResult> currentResults = null;
 				try
 				{
-					currentResults = JsonConvert.DeserializeObject<List<object>>(File.ReadAllText(resultPath));
+					currentResults = JsonConvert.DeserializeObject<List<ExecutionResult>>(File.ReadAllText(resultPath));
 				}
 				catch
 				{
-					currentResults = new List<object>();
+					currentResults = new List<ExecutionResult>();
 				}
 
 
@@ -100,6 +103,19 @@ namespace Mirantis.Keero.WindowsAgent
 					IsException = false,
 					Result = currentResults
 				}, Formatting.Indented);
+
+				if (plan.RebootOnCompletion > 0)
+				{
+					if (plan.RebootOnCompletion == 1)
+					{
+						RebootNeeded = !currentResults.Any(t => t.IsException);
+					}
+					else
+					{
+						RebootNeeded = true;
+					}
+				}
+
 				File.Delete(resultPath);
 				return executionResult;
 			}
diff --git a/WindowsAgent/WindowsAgent/Program.cs b/WindowsAgent/WindowsAgent/Program.cs
index 8bb4942..d228f92 100644
--- a/WindowsAgent/WindowsAgent/Program.cs
+++ b/WindowsAgent/WindowsAgent/Program.cs
@@ -29,6 +29,7 @@ namespace Mirantis.Keero.WindowsAgent
 
 		void Loop()
 		{
+			var doReboot = false;
 			const string filePath = "data.json";
 			while (!stop)
 			{
@@ -40,10 +41,16 @@ namespace Mirantis.Keero.WindowsAgent
 						File.WriteAllText(filePath, message.Body);
 						message.Ack();
 					}
-					var result = new PlanExecutor(filePath).Execute();
+					var executor = new PlanExecutor(filePath);
+					var result = executor.Execute();
 					if(stop) break;
 					rabbitMqClient.SendResult(result);
 					File.Delete(filePath);
+					if (executor.RebootNeeded)
+					{
+						doReboot = true;
+						break;
+					}
 				}
 				catch (Exception exception)
 				{
@@ -51,6 +58,18 @@ namespace Mirantis.Keero.WindowsAgent
 				}
 				
 			}
+			if (doReboot)
+			{
+				Console.WriteLine("Rebooting...");
+				try
+				{
+					System.Diagnostics.Process.Start("shutdown.exe", "-r -t 0");
+				}
+				catch (Exception ex)
+				{
+					Console.WriteLine(ex);
+				}
+			}
 
 		}
 
diff --git a/WindowsAgent/WindowsAgent/RabbitMqClient.cs b/WindowsAgent/WindowsAgent/RabbitMqClient.cs
index 18a5bc2..0ce1a77 100644
--- a/WindowsAgent/WindowsAgent/RabbitMqClient.cs
+++ b/WindowsAgent/WindowsAgent/RabbitMqClient.cs
@@ -45,9 +45,7 @@ namespace Mirantis.Keero.WindowsAgent
 				session.QueueDeclare(queueName, true, false, false, null);
 				var consumer = new QueueingBasicConsumer(session);
 				var consumeTag = session.BasicConsume(queueName, false, consumer);
-				Console.WriteLine("Deq");
 				var e = (RabbitMQ.Client.Events.BasicDeliverEventArgs)consumer.Queue.Dequeue();
-				Console.WriteLine("Message received");
 				Action ackFunc = delegate {
 					session.BasicAck(e.DeliveryTag, false);
 					session.BasicCancel(consumeTag);
diff --git a/WindowsAgent/WindowsAgent/SampleExecutionPlan.json b/WindowsAgent/WindowsAgent/SampleExecutionPlan.json
index 333ec85..9522b70 100644
--- a/WindowsAgent/WindowsAgent/SampleExecutionPlan.json
+++ b/WindowsAgent/WindowsAgent/SampleExecutionPlan.json
@@ -32,5 +32,6 @@
 			"Name": "TestThrow",
 
 		}
-	]
+	],
+	"RebootOnCompletion": 0
 }
\ No newline at end of file
diff --git a/WindowsAgent/WindowsAgent/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/WindowsAgent/WindowsAgent/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/WindowsAgent/WindowsAgent/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/WindowsAgent/WindowsAgent/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/WindowsAgent/WindowsAgent/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/WindowsAgent/WindowsAgent/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
deleted file mode 100644
index e69de29..0000000