diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go
index 149ca66f4..cdeaf5364 100644
--- a/contrib/fuzz/builtins.go
+++ b/contrib/fuzz/builtins.go
@@ -25,6 +25,7 @@ import (
 	_ "github.com/containerd/containerd/v2/metadata/plugin"
 	_ "github.com/containerd/containerd/v2/pkg/cri"
 	_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
+	_ "github.com/containerd/containerd/v2/plugins/cri/images"
 	_ "github.com/containerd/containerd/v2/plugins/imageverifier"
 	_ "github.com/containerd/containerd/v2/plugins/sandbox"
 	_ "github.com/containerd/containerd/v2/plugins/streaming"
diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go
index eed97bb35..218692f06 100644
--- a/contrib/fuzz/cri_server_fuzzer.go
+++ b/contrib/fuzz/cri_server_fuzzer.go
@@ -43,14 +43,15 @@ func FuzzCRIServer(data []byte) int {
 	defer client.Close()
 
 	config := criconfig.Config{}
+	imageConfig := criconfig.ImageConfig{}
 
-	imageService, err := images.NewService(config.ImageConfig, map[string]string{}, map[string]images.RuntimePlatform{}, client)
+	imageService, err := images.NewService(imageConfig, &images.CRIImageServiceOptions{
+		Client: client,
+	})
 	if err != nil {
 		panic(err)
 	}
 
-	is := images.NewGRPCService(imageService)
-
 	c, rs, err := server.NewCRIService(config, &server.CRIServiceOptions{
 		ImageService: imageService,
 		Client:       client,
@@ -63,7 +64,7 @@ func FuzzCRIServer(data []byte) int {
 	return fuzzCRI(f, &service{
 		CRIService:           c,
 		RuntimeServiceServer: rs,
-		ImageServiceServer:   is,
+		ImageServiceServer:   imageService.GRPCService(),
 	})
 }