WHT-31 - Modified bucket name to static instead of development/staging
WHT-31 - Changes to fix errors raised in code review 2.0