Reverted back to `.on` approach for global admin and app server