diff --git a/Asset/NetworkTestCertificate1.pfx b/Asset/NetworkTestCertificate1.pfx
deleted file mode 100644
index dd8a5e5..0000000
Binary files a/Asset/NetworkTestCertificate1.pfx and /dev/null differ
diff --git a/Asset/NetworkTestCertificate2.pfx b/Asset/NetworkTestCertificate2.pfx
deleted file mode 100644
index 4d91f40..0000000
Binary files a/Asset/NetworkTestCertificate2.pfx and /dev/null differ
diff --git a/Asset/SampleTestCertificate.pfx b/Asset/SampleTestCertificate.pfx
deleted file mode 100644
index 38b85d9..0000000
Binary files a/Asset/SampleTestCertificate.pfx and /dev/null differ
diff --git a/Common/Utilities.cs b/Common/Utilities.cs
index 28927cd..9021a52 100644
--- a/Common/Utilities.cs
+++ b/Common/Utilities.cs
@@ -761,6 +761,16 @@ public static string CreateRandomName(string namePrefix)
             return SdkContext.RandomResourceName(namePrefix, 30);
         }
 
+        public static string CreatePassword()
+        {
+            return SdkContext.RandomResourceName("Pa5$", 15);
+        }
+
+        public static string CreateUsername()
+        {
+            return "tirekicker";
+        }
+
         public static void PrintAvailabilitySet(IAvailabilitySet resource)
         {
             Utilities.Log(new StringBuilder().Append("Availability Set: ").Append(resource.Id)
@@ -3066,6 +3076,7 @@ public static string PostAddress(string url, string body, IDictionary<string, st
 
         public static void DeprovisionAgentInLinuxVM(string host, int port, string userName, string password)
         {
+            Utilities.Log("is mocked:" + IsRunningMocked);
             if (!IsRunningMocked)
             {
                 Console.WriteLine("Trying to de-provision: " + host);
@@ -3081,7 +3092,7 @@ public static void DeprovisionAgentInLinuxVM(string host, int port, string userN
         public static string GetArmTemplate(string templateFileName)
         {
             var adminUsername = "tirekicker";
-            var adminPassword = "12NewPA$$w0rd!";
+            var adminPassword = CreatePassword();
             var hostingPlanName = SdkContext.RandomResourceName("hpRSAT", 24);
             var webAppName = SdkContext.RandomResourceName("wnRSAT", 24);
             var armTemplateString = File.ReadAllText(Path.Combine(Utilities.ProjectPath, "Asset", templateFileName));
diff --git a/ManageVirtualMachineWithUnmanagedDisks.csproj b/ManageVirtualMachineWithUnmanagedDisks.csproj
index 3a1acfc..00865f1 100644
--- a/ManageVirtualMachineWithUnmanagedDisks.csproj
+++ b/ManageVirtualMachineWithUnmanagedDisks.csproj
@@ -18,8 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.19" />
-    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.30.0" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
+    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.36.1" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
     <PackageReference Include="CoreFTP" Version="1.2.0" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="0.0.2-preview" />
diff --git a/Program.cs b/Program.cs
index 3aa342c..2711a9d 100644
--- a/Program.cs
+++ b/Program.cs
@@ -14,8 +14,8 @@ namespace ManageVirtualMachineWithUnmanagedDisks
 {
     public class Program
     {
-        private const string UserName = "tirekicker";
-        private const string Password = "12NewPA$$w0rd!";
+        private static readonly string UserName = Utilities.CreateUsername();
+        private static readonly string Password = Utilities.CreatePassword();
         private const string DataDiskName = "disk2";
 
         /**
@@ -51,7 +51,7 @@ public static void RunSample(IAzure azure)
                         .WithAdminUsername(UserName)
                         .WithAdminPassword(Password)
                         .WithUnmanagedDisks()
-                        .WithSize(VirtualMachineSizeTypes.StandardD3V2)
+                        .WithSize(VirtualMachineSizeTypes.Parse("Standard_D2a_v4"))
                         .Create();
                 var endTime = DateTimeOffset.Now.UtcDateTime;
 
@@ -167,7 +167,7 @@ public static void RunSample(IAzure azure)
                         .WithPopularLinuxImage(KnownLinuxVirtualMachineImage.UbuntuServer16_04_Lts)
                         .WithRootUsername(UserName)
                         .WithRootPassword(Password)
-                        .WithSize(VirtualMachineSizeTypes.StandardD3V2)
+                        .WithSize(VirtualMachineSizeTypes.Parse("Standard_D2a_v4"))
                         .Create();
 
                 Utilities.Log("Created a Linux VM (in the same virtual network): " + linuxVM.Id);