diff --git a/src/cloudfront/fusionauth-website-request-handler.js b/src/cloudfront/fusionauth-website-request-handler.js
index 012efc1a9d..e4a3b21049 100644
--- a/src/cloudfront/fusionauth-website-request-handler.js
+++ b/src/cloudfront/fusionauth-website-request-handler.js
@@ -4,6 +4,9 @@ var ex="/learn/expert-advice";
 var idp="/identity-providers";
 var bc="/blog/category";
 var bac="/blog/archive/category";
+var ib="identity-basics";
+var tu="tutorials";
+var pe="/pricing/edition";
 
 var ip = {};
 ip['/']=true;
@@ -61,9 +64,9 @@ ip[d+'/premium-features/webauthn/']=true;
 ip[d+'/reference/']=true;
 ip[d+'/samlv2/']=true;
 ip[d+'/themes/']=true;
-ip[d+'/tutorials/']=true;
-ip[d+'/tutorials/gating/']=true;
-ip[d+'/tutorials/two-factor/']=true;
+ip[d+'/'+tu+'/']=true;
+ip[d+'/'+tu+'/gating/']=true;
+ip[d+'/'+tu+'/two-factor/']=true;
 ip['/how-to/']=true;
 ip['/quickstarts/']=true;
 ip['/blog/latest/']=true;
@@ -95,19 +98,19 @@ rd[d+'/reference/password-encryptors']=d+'/reference/password-hashes';
 rd[d+'/reactor']=d+'/admin-guide/licensing';
 rd[d+'/reactor/']=d+'/admin-guide/licensing';
 rd[d+'/troubleshooting']=d+'/admin-guide/troubleshooting';
-rd[d+'/tutorials/gate-accounts-until-verified']=d+'/tutorials/gating/gate-accounts-until-user-email-verified';
-rd[d+'/tutorials/migrate-users']=d+'/migration-guide/tutorial';
-rd[d+'/tutorials/setting-up-user-account-lockout']=d+'/tutorials/gating/setting-up-user-account-lockout';
-rd[d+'/tutorials/two-factor/authenticator-app']=d+'/tutorials/two-factor/authenticator-app-pre-1-26';
-rd[d+'/tutorials/two-factor/twilio-push']=d+'/tutorials/two-factor/twilio-push-pre-1-26';
-rd[d+'/tutorials/integrate-angular']= '/docs/quickstarts/quickstart-javascript-angular-web';
-rd[d+'/tutorials/integrate-python-django']= '/docs/quickstarts/quickstart-python-django-web';
-rd[d+'/tutorials/integrate-python-flask']= '/docs/quickstarts/quickstart-python-flask-web';
-rd[d+'/tutorials/integrate-ruby-rails']= '/docs/quickstarts/quickstart-ruby-rails-web';
-rd[d+'/tutorials/integrate-dotnet']= '/docs/quickstarts/quickstart-dotnet-web';
-rd[d+'/tutorials/integrate-java-spring']= '/docs/quickstarts/quickstart-springboot-web';
-rd[d+'/tutorials/integrate-react']= '/docs/quickstarts/quickstart-javascript-react-web';
-rd[d+'/tutorials/integrate-expressjs']= '/docs/quickstarts/quickstart-javascript-express-web';
+rd[d+'/'+tu+'/gate-accounts-until-verified']=d+'/'+tu+'/gating/gate-accounts-until-user-email-verified';
+rd[d+'/'+tu+'/migrate-users']=d+'/migration-guide/tutorial';
+rd[d+'/'+tu+'/setting-up-user-account-lockout']=d+'/'+tu+'/gating/setting-up-user-account-lockout';
+rd[d+'/'+tu+'/two-factor/authenticator-app']=d+'/'+tu+'/two-factor/authenticator-app-pre-1-26';
+rd[d+'/'+tu+'/two-factor/twilio-push']=d+'/'+tu+'/two-factor/twilio-push-pre-1-26';
+rd[d+'/'+tu+'/integrate-angular']= '/docs/quickstarts/quickstart-javascript-angular-web';
+rd[d+'/'+tu+'/integrate-python-django']= '/docs/quickstarts/quickstart-python-django-web';
+rd[d+'/'+tu+'/integrate-python-flask']= '/docs/quickstarts/quickstart-python-flask-web';
+rd[d+'/'+tu+'/integrate-ruby-rails']= '/docs/quickstarts/quickstart-ruby-rails-web';
+rd[d+'/'+tu+'/integrate-dotnet']= '/docs/quickstarts/quickstart-dotnet-web';
+rd[d+'/'+tu+'/integrate-java-spring']= '/docs/quickstarts/quickstart-springboot-web';
+rd[d+'/'+tu+'/integrate-react']= '/docs/quickstarts/quickstart-javascript-react-web';
+rd[d+'/'+tu+'/integrate-expressjs']= '/docs/quickstarts/quickstart-javascript-express-web';
 rd['/features/architecture']='/platform/built-for-developers';
 rd['/features/advanced-registration-forms']='/platform/registration-forms';
 rd['/features/breached-password-detection']='/features/authentication';
@@ -124,18 +127,18 @@ rd[ex+'/authentication/gaming-identity-provider-needs']=a+'/gaming-entertainment
 rd[ex+'/authentication/login-authentication-workflows']=a+'/login-authentication-workflows/authentication-workflows-overview';
 rd[ex+'/authentication/login-authentication-workflows/']=a+'/login-authentication-workflows/authentication-workflows-overview';
 rd[ex+'/dev-tools/jwt-debugger']='/dev-tools/jwt-decoder';
-rd[ex+'/identity-basics/avoid-lockin']=a+'/authentication/avoid-lockin';
-rd[ex+'/identity-basics/common-authentication-implementation-risks']=a+'/authentication/common-authentication-implementation-risks';
-rd[ex+'/identity-basics/making-sure-your-auth-system-scales']=a+'/ciam/making-sure-your-auth-system-scales';
-rd[ex+'/identity-basics/value-standards-compliant-authentication']=a+'/oauth/value-standards-compliant-authentication';
+rd[ex+'/'+ib+'/avoid-lockin']=a+'/authentication/avoid-lockin';
+rd[ex+'/'+ib+'/common-authentication-implementation-risks']=a+'/authentication/common-authentication-implementation-risks';
+rd[ex+'/'+ib+'/making-sure-your-auth-system-scales']=a+'/ciam/making-sure-your-auth-system-scales';
+rd[ex+'/'+ib+'/value-standards-compliant-authentication']=a+'/oauth/value-standards-compliant-authentication';
 rd[ex+'/tokens/anatomy-of-jwt']=a+'/tokens/jwt-components-explained';
 rd[ex+'/tokens/jwt-authentication-token-components-explained']=a+'/tokens/jwt-components-explained';
 rd['/podcast']='/';
 rd['/pricing/cloud/']='/pricing';
-rd['/pricing/edition']='/pricing';
-rd['/pricing/edition/']='/pricing';
-rd['/pricing/editions']='/pricing';
-rd['/pricing/editions/']='/pricing';
+rd[pe]='/pricing';
+rd[pe+'/']='/pricing';
+rd[pe+'s']='/pricing';
+rd[pe+'s/']='/pricing';
 rd['/products/identity-user-management/ciam-vs-iam']=ex+'/ciam/ciam-vs-iam';
 rd['/resources/auth0-migration']='/auth0-migration';
 rd['/resources/guide-to-user-data-security']=ex+'/security/guide-to-user-data-security';
@@ -145,11 +148,11 @@ rd['/upgrade/from-saas']='/compare';
 
 // order matters
 var redirectsByPrefix = [
-  ['/learn/expert-advice/dev-tools', '/dev-tools'],
-  ['/learn/expert-advice/authentication/spa', '/articles/login-authentication-workflows/spa'],
-  ['/learn/expert-advice/authentication/mobile', '/articles/login-authentication-workflows/mobile'],
-  ['/learn/expert-advice/authentication/webapp', '/articles/login-authentication-workflows/webapp'],
-  ['/learn/expert-advice', '/articles']
+  [ex+'/dev-tools', '/dev-tools'],
+  [ex+'/authentication/spa', '/articles/login-authentication-workflows/spa'],
+  [ex+'/learn/expert-advice/authentication/mobile', '/articles/login-authentication-workflows/mobile'],
+  [ex+'/authentication/webapp', '/articles/login-authentication-workflows/webapp'],
+  [ex, '/articles']
 ]
 
 // order matters