Fix image name
Externalize keys