[Misc] Use a better (more specific) tomcat image tag so that if tomcat changes the jdk version for tag "9", we won't be affected

* After template execution

  * Missing update of docker-compose so that the build don't put back
    12.1-alpine