diff --git a/AutomationScripts/5-installCertManager.sh b/AutomationScripts/4-installCertManager.sh
similarity index 94%
rename from AutomationScripts/5-installCertManager.sh
rename to AutomationScripts/4-installCertManager.sh
index a61798b..e004e9f 100644
--- a/AutomationScripts/5-installCertManager.sh
+++ b/AutomationScripts/4-installCertManager.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "BEGIN @ $(date +"%T"): Install Cert Manager..."
-TLS_SECRET_NAME=$APP_HOSTNAME-tls
+TLS_SECRET_NAME=$AD_APP_NAME-tls
 
 kubectl create namespace cert-manager
 
diff --git a/AutomationScripts/4-deployMSALProxy.sh b/AutomationScripts/5-deployMSALProxy.sh
similarity index 73%
rename from AutomationScripts/4-deployMSALProxy.sh
rename to AutomationScripts/5-deployMSALProxy.sh
index 23aab16..507de55 100644
--- a/AutomationScripts/4-deployMSALProxy.sh
+++ b/AutomationScripts/5-deployMSALProxy.sh
@@ -9,7 +9,7 @@ echo "BEGIN @ $(date +"%T"): Deploy MSAL Proxy..."
 echo "BEGIN @ $(date +"%T"): Calling Helm..."
 echo ""
 
-helm install --set azureAd.tenantId=$AZURE_TENANT_ID --set azureAd.clientId=$CLIENT_ID --set secret.azureclientsecret=$CLIENT_SECRET --set appHostName=$APP_HOSTNAME --set tlsSecretName=$APP_HOSTNAME-tls easyauth-proxy ./charts/easyauth-proxy
+helm install --set azureAd.tenantId=$AZURE_TENANT_ID --set azureAd.clientId=$CLIENT_ID --set secret.name=easyauth-proxy-$AD_APP_NAME-secret --set secret.azureclientsecret=$CLIENT_SECRET --set appHostName=$APP_HOSTNAME --set tlsSecretName=$TLS_SECRET_NAME easyauth-proxy-$AD_APP_NAME ./charts/easyauth-proxy
 
 echo ""
 echo "COMPLETE @ $(date +"%T"): Calling Helm"
diff --git a/main.sh b/main.sh
index b9719a2..787ed33 100644
--- a/main.sh
+++ b/main.sh
@@ -141,18 +141,18 @@ echo "****BEGIN @ $(date +"%T"): Call ADD App Creation script****"
 . ./AutomationScripts/3-registerAADApp.sh
 echo "****COMPLETE @ $(date +"%T"): AAD App created script****"
 
-echo "****BEGIN @ $(date +"%T"): Call Deploy MSAL Proxy script****"
-. ./AutomationScripts/4-deployMSALProxy.sh
-echo "****COMPLETE @ $(date +"%T"): Deployed MSAL Proxy script****"
-
 echo "****BEGIN @ $(date +"%T"): Call Install Cert Manager script****"
-. ./AutomationScripts/5-installCertManager.sh
+. ./AutomationScripts/4-installCertManager.sh
 echo "****COMPLETE @ $(date +"%T"): Installed Cert Manager script****"
 
+echo "****BEGIN @ $(date +"%T"): Call Deploy MSAL Proxy script****"
+. ./AutomationScripts/5-deployMSALProxy.sh
+echo "****COMPLETE @ $(date +"%T"): Deployed MSAL Proxy script****"
+
 echo "BEGIN @ $(date +"%T"): Deploy sample app..."
 # If we have a parameter for an image install a custom image. If not, then we install kuard.
 if [ -z "$INPUTIMAGE" ]; then
-    echo "No image input, installing kuard."
+    echo "No image input, installing sample."
     kubectl run easyauth-sample-pod --image=docker.io/lesterjt/easyauthfork8s-sample:latest --expose --port=80
 else
     echo "Your custom image $INPUTIMAGE installed"