diff --git a/pom.xml b/pom.xml
index 2a6f694..c48a8a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure</artifactId>
-      <version>1.30.0</version>
+      <version>1.36.3</version>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
diff --git a/src/main/java/com/microsoft/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java b/src/main/java/com/microsoft/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java
index 93c01f7..62e9c91 100644
--- a/src/main/java/com/microsoft/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java
+++ b/src/main/java/com/microsoft/azure/management/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java
@@ -9,6 +9,7 @@
 import com.microsoft.azure.management.Azure;
 import com.microsoft.azure.management.appservice.ConnectionStringType;
 import com.microsoft.azure.management.appservice.PricingTier;
+import com.microsoft.azure.management.appservice.RuntimeStack;
 import com.microsoft.azure.management.appservice.WebApp;
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
@@ -95,11 +96,9 @@ public static boolean runSample(Azure azure) {
                     .withRegion(Region.US_WEST)
                     .withExistingResourceGroup(rgName)
                     .withNewLinuxPlan(PricingTier.STANDARD_S1)
-                    .withPublicDockerHubImage("tomcat:8-jre8")
-                    .withStartUpCommand("/bin/bash -c \"sed -ie 's/appBase=\\\"webapps\\\"/appBase=\\\"\\\\/home\\\\/site\\\\/wwwroot\\\\/webapps\\\"/g' conf/server.xml && catalina.sh run\"")
+                    .withBuiltInImage(RuntimeStack.TOMCAT_8_5_JRE8)
                     .withConnectionString("storage.connectionString", connectionString, ConnectionStringType.CUSTOM)
                     .withAppSetting("storage.containerName", containerName)
-                    .withAppSetting("PORT", "8080")
                     .create();
 
             System.out.println("Created web app " + app1.name());
diff --git a/src/main/java/com/microsoft/azure/management/samples/Utils.java b/src/main/java/com/microsoft/azure/management/samples/Utils.java
index 9940f93..a385709 100644
--- a/src/main/java/com/microsoft/azure/management/samples/Utils.java
+++ b/src/main/java/com/microsoft/azure/management/samples/Utils.java
@@ -1420,7 +1420,7 @@ public static void createCertificate(String certPath, String pfxPath,
                 "-keystore", pfxPath, "-storepass", password, "-validity",
                 validityInDays, "-keyalg", keyAlg, "-sigalg", sigAlg, "-keysize", keySize,
                 "-storetype", storeType, "-dname", "CN=" + cnName, "-ext", "EKU=1.3.6.1.5.5.7.3.1"};
-        Utils.cmdInvocation(commandArgs, false);
+        Utils.cmdInvocation(commandArgs, true);
 
         // Create cer file i.e. extract public key from pfx
         File pfxFile = new File(pfxPath);