tools.deploy.backend: with-variables need to be on the whole block

The last pr killed a bug but birthed a new one. Sorry bout that. Here is a new commit to fix the error in `make-deploy-image`.