Merge branch 'remove-machine-id' into 'master'

Readd "remove machine-id" logic

Closes #117

See merge request !141
3 jobs for master in 30 minutes and 30 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Lint
passed #8514
shellcheck

00:00:12

passed #8515
shfmt

00:00:09

 
  Build
passed #8516
secure
build:secure

00:30:18