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 Name Job ID Coverage
  Lint
passed shellcheck #8514

00:00:12

passed shfmt #8515

00:00:09

 
  Build
passed build:secure #8516
secure

00:30:18