diff --git a/internal/cmd/base/listener.go b/internal/cmd/base/listener.go
index b972779a8b..6e4e3bb6b9 100644
--- a/internal/cmd/base/listener.go
+++ b/internal/cmd/base/listener.go
@@ -108,7 +108,7 @@ func tcpListenerFactory(l *configutil.Listener, logger hclog.Logger, ui cli.Ui)
 		return alpnMux, props, nil, nil
 	}
 
-	tlsConfig, reloadFunc, err := listenerutil.GetTLSConfig(ln, l, props, ui)
+	tlsConfig, reloadFunc, err := listenerutil.TLSConfig(l, props, ui)
 	if err != nil {
 		return nil, nil, nil, err
 	}
diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go
index c9e1f445a0..e084a6fd8c 100644
--- a/internal/cmd/base/servers.go
+++ b/internal/cmd/base/servers.go
@@ -169,7 +169,13 @@ func (b *Server) SetupMetrics(ui cli.Ui, telemetry *configutil.Telemetry) error
 	// TODO: Figure out a user-agent we want to use for the last param
 	// TODO: Do we want different names for different components?
 	var err error
-	b.InmemSink, b.PrometheusEnabled, err = configutil.SetupTelemetry(telemetry, ui, "watchtower", "Watchtower", "watchtower")
+	b.InmemSink, _, b.PrometheusEnabled, err = configutil.SetupTelemetry(&configutil.SetupTelemetryOpts{
+		Config:      telemetry,
+		Ui:          ui,
+		ServiceName: "watchtower",
+		DisplayName: "Watchtower",
+		UserAgent:   "watchtower",
+	})
 	if err != nil {
 		return fmt.Errorf("Error initializing telemetry: %w", err)
 	}