diff --git a/src/main/resources/com/microsoft/azure/util/AzureCredentials/credentials.jelly b/src/main/resources/com/microsoft/azure/util/AzureCredentials/credentials.jelly
index e925c43..be027f7 100644
--- a/src/main/resources/com/microsoft/azure/util/AzureCredentials/credentials.jelly
+++ b/src/main/resources/com/microsoft/azure/util/AzureCredentials/credentials.jelly
@@ -2,42 +2,36 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
     <j:set var="uniqueId" value="${h.generateId()}"/>
-    <f:entry title="${%SubscriptionID}" field="subscriptionId"
-             help="/plugin/azure-credentials/help-subscriptionId.html">
+    <f:entry title="${%SubscriptionID}" field="subscriptionId" help="/plugin/azure-credentials/help-subscriptionId.html">
         <f:textbox/>
     </f:entry>
-    <f:entry title="${%ClientID}" field="clientId" help="/plugin/azure-credentials/help-clientId.html">
+    <f:entry title="${%ClientID}" field="clientId">
         <f:textbox/>
     </f:entry>
-    <f:entry title="${%ClientSecret}" field="clientSecret" help="/plugin/azure-credentials/help-clientSecret.html">
+    <f:entry title="${%ClientSecret}" field="clientSecret" >
         <f:password/>
     </f:entry>
-    <f:entry title="${%CertificateId}" field="certificateId" help="/plugin/azure-credentials/help-certificateId.html">
+    <f:entry title="${%CertificateId}" field="certificateId">
         <c:select expressionAllowed="false" checkMethod="post" />
     </f:entry>
-    <f:entry title="${%Tenant}" field="tenant" help="/plugin/azure-credentials/help-tenant.html">
+    <f:entry title="${%Tenant}" field="tenant">
         <f:textbox/>
     </f:entry>
-    <f:entry title="${%AzureEnvironmentName}" field="azureEnvironmentName"
-             help="/plugin/azure-credentials/help-azureEnvironmentName.html">
+    <f:entry title="${%AzureEnvironmentName}" field="azureEnvironmentName" help="/plugin/azure-credentials/help-azureEnvironmentName.html">
         <f:select/>
     </f:entry>
 
     <f:advanced>
-        <f:entry title="${%ManagementServiceURL}" field="serviceManagementURL"
-                 help="/plugin/azure-credentials/help-serviceManagementURL.html">
+        <f:entry title="${%ManagementServiceURL}" field="serviceManagementURL">
             <f:textbox/>
         </f:entry>
-        <f:entry title="${%AuthEndpoint}" field="authenticationEndpoint"
-                 help="/plugin/azure-credentials/help-authenticationEndpoint.html">
+        <f:entry title="${%AuthEndpoint}" field="authenticationEndpoint">
             <f:textbox/>
         </f:entry>
-        <f:entry title="${%ResourceManagerURL}" field="resourceManagerEndpoint"
-                 help="/plugin/azure-credentials/help-resourceManagerEndpoint.html">
+        <f:entry title="${%ResourceManagerURL}" field="resourceManagerEndpoint">
             <f:textbox/>
         </f:entry>
-        <f:entry title="${%GraphEndpointURL}" field="graphEndpoint"
-                 help="/plugin/azure-credentials/help-graphEndpoint.html">
+        <f:entry title="${%GraphEndpointURL}" field="graphEndpoint">
             <f:textbox/>
         </f:entry>
     </f:advanced>
diff --git a/src/main/webapp/help-authenticationEndpoint.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-authenticationEndpoint.html
similarity index 100%
rename from src/main/webapp/help-authenticationEndpoint.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-authenticationEndpoint.html
diff --git a/src/main/webapp/help-certificateId.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-certificateId.html
similarity index 100%
rename from src/main/webapp/help-certificateId.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-certificateId.html
diff --git a/src/main/webapp/help-clientId.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-clientId.html
similarity index 100%
rename from src/main/webapp/help-clientId.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-clientId.html
diff --git a/src/main/webapp/help-clientSecret.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-clientSecret.html
similarity index 100%
rename from src/main/webapp/help-clientSecret.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-clientSecret.html
diff --git a/src/main/webapp/help-graphEndpoint.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-graphEndpoint.html
similarity index 100%
rename from src/main/webapp/help-graphEndpoint.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-graphEndpoint.html
diff --git a/src/main/webapp/help-resourceManagerEndpoint.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-resourceManagerEndpoint.html
similarity index 100%
rename from src/main/webapp/help-resourceManagerEndpoint.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-resourceManagerEndpoint.html
diff --git a/src/main/webapp/help-serviceManagementURL.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-serviceManagementURL.html
similarity index 100%
rename from src/main/webapp/help-serviceManagementURL.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-serviceManagementURL.html
diff --git a/src/main/webapp/help-tenant.html b/src/main/resources/com/microsoft/azure/util/AzureCredentials/help-tenant.html
similarity index 100%
rename from src/main/webapp/help-tenant.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentials/help-tenant.html
diff --git a/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/config-variables.jelly b/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/config-variables.jelly
index f273d45..ac491d0 100644
--- a/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/config-variables.jelly
+++ b/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/config-variables.jelly
@@ -5,16 +5,16 @@
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
-    <f:entry title="${%SubscriptionIdVariable}" field="subscriptionIdVariable" help="/plugin/azure-credentials/help-subscriptionIdVariable.html">
+    <f:entry title="${%SubscriptionIdVariable}" field="subscriptionIdVariable">
         <f:textbox default="${descriptor.getDefaultSubscriptionIdVariable()}"/>
     </f:entry>
     <f:entry title="${%ClientIdVariable}" field="clientIdVariable" help="/plugin/azure-credentials/help-clientIdVariable.html">
         <f:textbox default="${descriptor.getDefaultClientIdVariable()}"/>
     </f:entry>
-    <f:entry title="${%ClientSecretVariable}" field="clientSecretVariable" help="/plugin/azure-credentials/help-clientSecretVariable.html">
+    <f:entry title="${%ClientSecretVariable}" field="clientSecretVariable">
         <f:textbox default="${descriptor.getDefaultClientSecretVariable()}"/>
     </f:entry>
-    <f:entry title="${%TenantIdVariable}" field="tenantIdVariable" help="/plugin/azure-credentials/help-tenantIdVariable.html">
+    <f:entry title="${%TenantIdVariable}" field="tenantIdVariable">
         <f:textbox default="${descriptor.getDefaultTenantIdVariable()}"/>
     </f:entry>
 </j:jelly>
diff --git a/src/main/webapp/help-clientIdVariable.html b/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-clientIdVariable.html
similarity index 100%
rename from src/main/webapp/help-clientIdVariable.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-clientIdVariable.html
diff --git a/src/main/webapp/help-clientSecretVariable.html b/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-clientSecretVariable.html
similarity index 100%
rename from src/main/webapp/help-clientSecretVariable.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-clientSecretVariable.html
diff --git a/src/main/webapp/help-subscriptionIdVariable.html b/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-subscriptionIdVariable.html
similarity index 100%
rename from src/main/webapp/help-subscriptionIdVariable.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-subscriptionIdVariable.html
diff --git a/src/main/webapp/help-tenantIdVariable.html b/src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-tenantIdVariable.html
similarity index 100%
rename from src/main/webapp/help-tenantIdVariable.html
rename to src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/help-tenantIdVariable.html
diff --git a/src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/credentials.jelly b/src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/credentials.jelly
index b5ceee9..8155cf3 100644
--- a/src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/credentials.jelly
+++ b/src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/credentials.jelly
@@ -2,17 +2,15 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
     <j:set var="uniqueId" value="${h.generateId()}"/>
-    <f:entry title="${%Subscription ID}" field="subscriptionId"
-             help="/plugin/azure-credentials/help-subscriptionId.html">
+    <f:entry title="${%Subscription ID}" field="subscriptionId" help="/plugin/azure-credentials/help-subscriptionId.html">
         <f:textbox/>
     </f:entry>
 
-    <f:entry title="${%Client ID}" field="clientId">
+    <f:entry title="${%Client ID}" field="clientIdImds">
         <f:textbox/>
     </f:entry>
 
-    <f:entry title="${%AzureEnvironmentName}" field="azureEnvName"
-             help="/plugin/azure-credentials/help-azureEnvironmentName.html">
+    <f:entry title="${%AzureEnvironmentName}" field="azureEnvName" help="/plugin/azure-credentials/help-azureEnvironmentName.html">
         <f:select/>
     </f:entry>
 
diff --git a/src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/help-clientId.html b/src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/help-clientIdImds.html
similarity index 100%
rename from src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/help-clientId.html
rename to src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/help-clientIdImds.html
diff --git a/src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/credentials.jelly b/src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/credentials.jelly
index dd7401f..e4843ed 100644
--- a/src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/credentials.jelly
+++ b/src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/credentials.jelly
@@ -5,11 +5,11 @@
   -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
-    <f:entry title="${%ServicePrincipal}" field="servicePrincipalId">
+    <f:entry title="${%ServicePrincipal}" field="servicePrincipalId" help="/plugin/azure-credentials/help-servicePrincipalId.html">
         <c:select expressionAllowed="false" checkMethod="post"/>
     </f:entry>
 
-    <f:entry title="${%SecretIdentifier}" field="secretIdentifier">
+    <f:entry title="${%SecretIdentifier}" field="secretIdentifier" help="/plugin/azure-credentials/help-secretIdentifier.html">
         <f:textbox />
     </f:entry>
 
diff --git a/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/credentials.jelly b/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/credentials.jelly
index 60eb4c5..f137c80 100644
--- a/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/credentials.jelly
+++ b/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/credentials.jelly
@@ -5,11 +5,12 @@
   -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
-    <f:entry title="${%ServicePrincipal}" field="servicePrincipalId">
+    <f:entry title="${%ServicePrincipal}" field="servicePrincipalId"
+            help="/plugin/azure-credentials/help-servicePrincipalId.html">
         <c:select expressionAllowed="false" checkMethod="post" />
     </f:entry>
 
-    <f:entry title="${%SecretIdentifier}" field="secretIdentifier">
+    <f:entry title="${%SecretIdentifier}" field="secretIdentifier" help="/plugin/azure-credentials/help-secretIdentifier.html">
         <f:textbox />
     </f:entry>
 
diff --git a/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-secretIdentifier.html b/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-secretIdentifier.html
deleted file mode 100644
index 1bd9b43..0000000
--- a/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-secretIdentifier.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
-  ~ Copyright (c) Microsoft Corporation. All rights reserved.
-  ~ Licensed under the MIT License. See LICENSE file in the project root for license information.
-  -->
-
-<div>
-    <p>Secret identifier can be found on Azure Portal.</p>
-
-    <p>Secret value will be interpreted as plain text.</p>
-</div>
diff --git a/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-servicePrincipalId.html b/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-servicePrincipalId.html
deleted file mode 100644
index 0a4b3cd..0000000
--- a/src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-servicePrincipalId.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-  ~ Copyright (c) Microsoft Corporation. All rights reserved.
-  ~ Licensed under the MIT License. See LICENSE file in the project root for license information.
-  -->
-
-<div>
-    The Azure Service Principal credentials used to communicate with the Azure services. Check the following
-    documentation for more information about the service principal:
-    <ul>
-        <li><a href="https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal">
-            Use portal to create an Azure Active Directory application and service principal that can access resources
-        </a></li>
-    </ul>
-</div>
diff --git a/src/main/webapp/help-msiPort.html b/src/main/webapp/help-msiPort.html
deleted file mode 100644
index d02a604..0000000
--- a/src/main/webapp/help-msiPort.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    The listening port of the Managed Service Identity(MSI) extension on the VM.<br/>
-</div>
diff --git a/src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/help-secretIdentifier.html b/src/main/webapp/help-secretIdentifier.html
similarity index 100%
rename from src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/help-secretIdentifier.html
rename to src/main/webapp/help-secretIdentifier.html
diff --git a/src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/help-servicePrincipalId.html b/src/main/webapp/help-servicePrincipalId.html
similarity index 100%
rename from src/main/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/help-servicePrincipalId.html
rename to src/main/webapp/help-servicePrincipalId.html
diff --git a/src/main/webapp/help-subscriptionId.html b/src/main/webapp/help-subscriptionId.html
index dc9b01a..154cef3 100644
--- a/src/main/webapp/help-subscriptionId.html
+++ b/src/main/webapp/help-subscriptionId.html
@@ -2,7 +2,4 @@
     Enter an Azure subscription ID.
 
     You can get this information from the Azure portal or from an Azure publish settings file.
-
-    If you don't have an Azure publish settings file, you can download one from <a
-        href="https://manage.windowsazure.com/publishsettings/Index?SchemaVersion=2.0" target="_blank">here</a>
 </div>