diff --git a/build/base/Dockerfile b/build/base/Dockerfile
index a4e44383..24ab4661 100644
--- a/build/base/Dockerfile
+++ b/build/base/Dockerfile
@@ -92,6 +92,13 @@ RUN apt-get install -y \
 
 COPY build/base/fonts.conf /etc/fonts/conf.d/100-gotenberg.conf
 
+# |--------------------------------------------------------------------------
+# | Default user
+# |--------------------------------------------------------------------------
+# |
+# | TODO find a correct description for why we're doing this.
+# |
+
 RUN groupadd --gid 1001 gotenberg \
   && useradd --uid 1001 --gid gotenberg --shell /bin/bash --no-create-home gotenberg \
   && mkdir /gotenberg \
diff --git a/internal/pkg/pm2/chrome.go b/internal/pkg/pm2/chrome.go
index 52326713..105c76cc 100644
--- a/internal/pkg/pm2/chrome.go
+++ b/internal/pkg/pm2/chrome.go
@@ -66,15 +66,15 @@ func (p *chrome) viable() bool {
 'http://localhost:9222/json/version'`, p.name())
 	v, err := devtool.New("http://localhost:9222").Version(ctx)
 	if err != nil {
-		p.manager.notifyf("%v: Chrome version endpoint returned error: %v", p.name(), err)
+		p.manager.notifyf("%s: %s version endpoint returned error: %v", p.name(), p.Fullname(), err)
 		return false
 	}
-	p.manager.notifyf("%v: Chrome returned version info: %+v", p.name(), *v)
+	p.manager.notifyf("%s: %s returned version info: %+v", p.name(), p.Fullname(), *v)
 	return true
 }
 
 func (p *chrome) warmup() {
-	p.manager.notifyf("%v: allowing Chrome %v to startup", p.name(), warmupTime)
+	p.manager.notifyf("%s: allowing %s %v to startup", p.name(), p.Fullname(), warmupTime)
 	time.Sleep(warmupTime)
 }
 
diff --git a/internal/pkg/pm2/pm2.go b/internal/pkg/pm2/pm2.go
index 9fc253c4..d8595cad 100644
--- a/internal/pkg/pm2/pm2.go
+++ b/internal/pkg/pm2/pm2.go
@@ -85,7 +85,7 @@ func (m *processManager) pm2(p Process, cmdName string) error {
 	)
 	m.notifyf("executing command '%v'", strings.Join(cmd.Args, " "))
 	if m.verbose {
-		chromeStdErr, err := cmd.StderrPipe()
+		processStdErr, err := cmd.StderrPipe()
 		if err != nil {
 			return fmt.Errorf("failed getting Chrome stderr: %v", err)
 		}
@@ -95,7 +95,7 @@ func (m *processManager) pm2(p Process, cmdName string) error {
 		}
 		readFromPipe := func(name string, reader io.ReadCloser) {
 			r := bufio.NewReader(reader)
-			defer reader.Close()
+			defer reader.Close() // nolint: errcheck
 			for {
 				line, _, err := r.ReadLine()
 				if err != nil {