diff --git a/plugin.yaml b/plugin.yaml
index ccb5db76..582e69ff 100644
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -5,7 +5,7 @@
 plugins:
   pkg:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/master.zip
+    source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/1.4.zip
     package_name: cloudify-azure-plugin
     package_version: '1.4'
 
@@ -1039,7 +1039,7 @@ node_types:
               default: powershell -ExecutionPolicy Unrestricted -file ps_enable_winrm_http.ps1
             file_uris:
               default:
-              - https://raw.githubusercontent.com/01000101/cloudify-azure-plugin/rebuild/scripts/ps_enable_winrm_http.ps1
+              - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-azure-plugin/1.4/scripts/ps_enable_winrm_http.ps1
         delete: pkg.cloudify_azure.resources.compute.virtualmachine.delete
         
   cloudify.azure.nodes.compute.VirtualMachineExtension:
diff --git a/system_tests/local/azure_tests.py b/system_tests/local/azure_tests.py
index 6fec3899..9f7b0e91 100644
--- a/system_tests/local/azure_tests.py
+++ b/system_tests/local/azure_tests.py
@@ -108,7 +108,7 @@ def test_local(self):
 
         self.localenv.execute('install', task_retries=40)
         self.post_install_assertions()
-        self.localenv.execute('uninstall', task_retries=5)
+        self.localenv.execute('uninstall', task_retries=40)
         self.post_uninstall_assertions()
 
     @property