diff --git a/Dockerfile b/Dockerfile
index d25e7eac1..17cefca97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN make yarn
 COPY ./ui/ ./ui/
 RUN make build-ui
 
-FROM golang:1.21.5-bookworm@sha256:a6b787c7f9046e3fdaa97bca1f76fd23ff4108f612de885e1af87e0dccc02f99 as build
+FROM golang:1.21.5-bookworm@sha256:1415bb0b25d3bffc0a44dcf9851c20a9f8bbe558095221d931f2e4a4cc3596eb as build
 WORKDIR /go/src/github.com/pomerium/pomerium
 
 RUN apt-get update \
diff --git a/Dockerfile.debug b/Dockerfile.debug
index 496d3765c..09ad6a83d 100644
--- a/Dockerfile.debug
+++ b/Dockerfile.debug
@@ -13,7 +13,7 @@ RUN make yarn
 COPY ./ui/ ./ui/
 RUN make build-ui
 
-FROM golang:1.21.5-bookworm@sha256:a6b787c7f9046e3fdaa97bca1f76fd23ff4108f612de885e1af87e0dccc02f99 as build
+FROM golang:1.21.5-bookworm@sha256:1415bb0b25d3bffc0a44dcf9851c20a9f8bbe558095221d931f2e4a4cc3596eb as build
 WORKDIR /go/src/github.com/pomerium/pomerium
 
 RUN apt-get update \
diff --git a/pkg/grpcutil/serve.go b/pkg/grpcutil/serve.go
index 16ed15b96..9877f44d5 100644
--- a/pkg/grpcutil/serve.go
+++ b/pkg/grpcutil/serve.go
@@ -2,6 +2,7 @@ package grpcutil
 
 import (
 	"context"
+	"errors"
 	"net"
 	"time"
 
@@ -34,5 +35,9 @@ func ServeWithGracefulStop(ctx context.Context, srv *grpc.Server, li net.Listene
 		srv.Stop()
 	}()
 
-	return srv.Serve(li)
+	err := srv.Serve(li)
+	if errors.Is(err, grpc.ErrServerStopped) {
+		err = nil
+	}
+	return err
 }