diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go
index 5dd54057c..0f411ae08 100644
--- a/contrib/snapshotservice/service.go
+++ b/contrib/snapshotservice/service.go
@@ -32,6 +32,7 @@ var empty = &ptypes.Empty{}
 
 type service struct {
 	sn snapshots.Snapshotter
+	snapshotsapi.UnimplementedSnapshotsServer
 }
 
 // FromSnapshotter returns a Snapshot API server from a containerd snapshotter
diff --git a/services/containers/service.go b/services/containers/service.go
index ac58eb1ea..50b8399f7 100644
--- a/services/containers/service.go
+++ b/services/containers/service.go
@@ -55,6 +55,7 @@ func init() {
 
 type service struct {
 	local api.ContainersClient
+	api.UnimplementedContainersServer
 }
 
 var _ api.ContainersServer = &service{}
diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go
index b7fa24382..30395a6e3 100644
--- a/services/content/contentserver/contentserver.go
+++ b/services/content/contentserver/contentserver.go
@@ -38,6 +38,7 @@ import (
 
 type service struct {
 	store content.Store
+	api.UnimplementedContentServer
 }
 
 var bufPool = sync.Pool{
diff --git a/services/diff/service.go b/services/diff/service.go
index 4ac780976..13f3558e8 100644
--- a/services/diff/service.go
+++ b/services/diff/service.go
@@ -53,6 +53,7 @@ func init() {
 
 type service struct {
 	local diffapi.DiffClient
+	diffapi.UnimplementedDiffServer
 }
 
 var _ diffapi.DiffServer = &service{}
diff --git a/services/events/service.go b/services/events/service.go
index 302764700..309ad42e0 100644
--- a/services/events/service.go
+++ b/services/events/service.go
@@ -52,6 +52,7 @@ func init() {
 type service struct {
 	ttService *ttrpcService
 	events    *exchange.Exchange
+	api.UnimplementedEventsServer
 }
 
 // NewService returns the GRPC events server
diff --git a/services/images/service.go b/services/images/service.go
index 86502dfec..355c9e8c3 100644
--- a/services/images/service.go
+++ b/services/images/service.go
@@ -54,6 +54,7 @@ func init() {
 
 type service struct {
 	local imagesapi.ImagesClient
+	imagesapi.UnimplementedImagesServer
 }
 
 var _ imagesapi.ImagesServer = &service{}
diff --git a/services/introspection/service.go b/services/introspection/service.go
index 33617b7b9..cd5ae964b 100644
--- a/services/introspection/service.go
+++ b/services/introspection/service.go
@@ -62,6 +62,7 @@ func init() {
 
 type server struct {
 	local api.IntrospectionClient
+	api.UnimplementedIntrospectionServer
 }
 
 var _ = (api.IntrospectionServer)(&server{})
diff --git a/services/leases/service.go b/services/leases/service.go
index 8b5f76035..9cebf7330 100644
--- a/services/leases/service.go
+++ b/services/leases/service.go
@@ -47,6 +47,7 @@ func init() {
 
 type service struct {
 	lm leases.Manager
+	api.UnimplementedLeasesServer
 }
 
 func (s *service) Register(server *grpc.Server) error {
diff --git a/services/namespaces/service.go b/services/namespaces/service.go
index 22a501c3e..9a5fe1d1b 100644
--- a/services/namespaces/service.go
+++ b/services/namespaces/service.go
@@ -54,6 +54,7 @@ func init() {
 
 type service struct {
 	local api.NamespacesClient
+	api.UnimplementedNamespacesServer
 }
 
 var _ api.NamespacesServer = &service{}
diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go
index 12dc5b08a..b0e7f6c74 100644
--- a/services/sandbox/controller_service.go
+++ b/services/sandbox/controller_service.go
@@ -59,6 +59,7 @@ func init() {
 
 type controllerService struct {
 	local api.ControllerClient
+	api.UnimplementedControllerServer
 }
 
 var _ api.ControllerServer = (*controllerService)(nil)
diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go
index 45bb65519..00212c2dd 100644
--- a/services/sandbox/store_service.go
+++ b/services/sandbox/store_service.go
@@ -55,6 +55,7 @@ func init() {
 
 type sandboxService struct {
 	local api.StoreClient
+	api.UnimplementedStoreServer
 }
 
 var _ api.StoreServer = (*sandboxService)(nil)
diff --git a/services/snapshots/service.go b/services/snapshots/service.go
index 2cc4d9a4e..3bc3a1c17 100644
--- a/services/snapshots/service.go
+++ b/services/snapshots/service.go
@@ -48,6 +48,7 @@ var empty = &ptypes.Empty{}
 
 type service struct {
 	ss map[string]snapshots.Snapshotter
+	snapshotsapi.UnimplementedSnapshotsServer
 }
 
 func newService(ic *plugin.InitContext) (interface{}, error) {
diff --git a/services/tasks/service.go b/services/tasks/service.go
index fb89a95fc..3cd56ece5 100644
--- a/services/tasks/service.go
+++ b/services/tasks/service.go
@@ -58,6 +58,7 @@ func init() {
 
 type service struct {
 	local api.TasksClient
+	api.UnimplementedTasksServer
 }
 
 func (s *service) Register(server *grpc.Server) error {
diff --git a/services/version/service.go b/services/version/service.go
index d388070f1..0344dd9b3 100644
--- a/services/version/service.go
+++ b/services/version/service.go
@@ -41,6 +41,7 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
 }
 
 type service struct {
+	api.UnimplementedVersionServer
 }
 
 func (s *service) Register(server *grpc.Server) error {