diff --git a/bootstrapper/cmd/bootstrapper/main.go b/bootstrapper/cmd/bootstrapper/main.go
index fd7080c74..23b2cf474 100644
--- a/bootstrapper/cmd/bootstrapper/main.go
+++ b/bootstrapper/cmd/bootstrapper/main.go
@@ -43,16 +43,14 @@ const (
 )
 
 func main() {
-	gRPCDebug := flag.Bool("debug", false, "Enable gRPC debug logging")
 	verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
 	flag.Parse()
 	log := logger.NewJSONLogger(logger.VerbosityFromInt(*verbosity)).WithGroup("bootstrapper")
-
-	if *gRPCDebug {
-		logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
-	} else {
-		logger.ReplaceGRPCLogger(slog.New(logger.NewLevelHandler(slog.LevelWarn, log.Handler())).WithGroup("gRPC"))
-	}
+	logger.ReplaceGRPCLogger(
+		slog.New(
+			logger.NewLevelHandler(logger.VerbosityFromInt(*verbosity), log.Handler()),
+		).WithGroup("gRPC"),
+	)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
index 76ef974ce..cf93df780 100644
--- a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
+++ b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-bootstrapper.service
@@ -10,7 +10,7 @@ RemainAfterExit=yes
 Restart=on-failure
 EnvironmentFile=/run/constellation.env
 Environment=PATH=/run/state/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
-ExecStart=/usr/bin/bootstrapper $CONSTELLATION_DEBUG_FLAGS
+ExecStart=/usr/bin/bootstrapper
 
 [Install]
 WantedBy=multi-user.target
diff --git a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-upgrade-agent.service b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-upgrade-agent.service
index c3fefdcc5..ffa204085 100644
--- a/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-upgrade-agent.service
+++ b/image/base/mkosi.skeleton/usr/lib/systemd/system/constellation-upgrade-agent.service
@@ -8,7 +8,7 @@ RemainAfterExit=yes
 Restart=on-failure
 EnvironmentFile=/run/constellation.env
 Environment=PATH=/run/state/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
-ExecStart=/usr/bin/upgrade-agent $CONSTELLATION_DEBUG_FLAGS
+ExecStart=/usr/bin/upgrade-agent
 
 [Install]
 WantedBy=multi-user.target
diff --git a/upgrade-agent/cmd/main.go b/upgrade-agent/cmd/main.go
index 2eaabb91d..fe16caa13 100644
--- a/upgrade-agent/cmd/main.go
+++ b/upgrade-agent/cmd/main.go
@@ -23,17 +23,14 @@ const (
 )
 
 func main() {
-	gRPCDebug := flag.Bool("debug", false, "Enable gRPC debug logging")
 	verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
 	flag.Parse()
-
-	log := logger.NewJSONLogger(logger.VerbosityFromInt(*verbosity)).WithGroup("bootstrapper")
-
-	if *gRPCDebug {
-		logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
-	} else {
-		logger.ReplaceGRPCLogger(slog.New(logger.NewLevelHandler(slog.LevelWarn, log.Handler())).WithGroup("gRPC"))
-	}
+	log := logger.NewJSONLogger(logger.VerbosityFromInt(*verbosity)).WithGroup("upgrade-agent")
+	logger.ReplaceGRPCLogger(
+		slog.New(
+			logger.NewLevelHandler(logger.VerbosityFromInt(*verbosity), log.Handler()),
+		).WithGroup("gRPC"),
+	)
 
 	handler := file.NewHandler(afero.NewOsFs())
 	server, err := server.New(log, handler)