diff --git a/monkey/monkey_island/windows/build_pyinstaller.bat b/monkey/monkey_island/windows/build_pyinstaller.bat
index 244c1170c..eaf771ccf 100644
--- a/monkey/monkey_island/windows/build_pyinstaller.bat
+++ b/monkey/monkey_island/windows/build_pyinstaller.bat
@@ -1 +1,4 @@
 pyinstaller -F --log-level=DEBUG --clean --upx-dir=.\bin monkey_island.spec
+move dist\monkey_island.exe monkey_island.exe
+rmdir /S /Q build
+rmdir /S /Q dist
diff --git a/monkey/monkey_island/windows/run_cc_exe.bat b/monkey/monkey_island/windows/run_cc_exe.bat
new file mode 100644
index 000000000..498ac3399
--- /dev/null
+++ b/monkey/monkey_island/windows/run_cc_exe.bat
@@ -0,0 +1,4 @@
+@title C^&C Server
+@pushd ..
+@monkey_island\monkey_island.exe
+@popd
\ No newline at end of file
diff --git a/monkey/monkey_island/windows/run_server.bat b/monkey/monkey_island/windows/run_server.bat
index a15fbcc04..c321e01a8 100644
--- a/monkey/monkey_island/windows/run_server.bat
+++ b/monkey/monkey_island/windows/run_server.bat
@@ -1,4 +1,4 @@
 if not exist db mkdir db
 start windows\run_mongodb.bat
-start windows\run_cc.bat
+start windows\run_cc_exe.bat
 start https://localhost:5000
\ No newline at end of file
diff --git a/monkey/monkey_island/windows/run_server_py.bat b/monkey/monkey_island/windows/run_server_py.bat
new file mode 100644
index 000000000..a15fbcc04
--- /dev/null
+++ b/monkey/monkey_island/windows/run_server_py.bat
@@ -0,0 +1,4 @@
+if not exist db mkdir db
+start windows\run_mongodb.bat
+start windows\run_cc.bat
+start https://localhost:5000
\ No newline at end of file