Replace echo-heredoc with cat-heredoc