Even more...that workaround is as ugly as it gets. When it comes to builds and QA/Staging/Demo/Prod environments, I like to have the build identical between these envs. Adding the database name to the build (inside persistence.xml in the war/ear) makes the builds differ between envs. Ugly