Merge branch 'terraform-stuff' into 'master'

Terraform stuff

See merge request !241
2 jobs for master in 40 seconds (queued for 2 seconds)