diff --git a/Makefile b/Makefile
index 61ddf82..0b03b62 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,11 @@ endif
 # If $GOPATH/bin/protoc-gen-go does not exist, we'll run this command to install
 # it.
 $(PROTOC_GEN_GO):
-	go get -u github.com/golang/protobuf/protoc-gen-go
+	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1
 
 events.pb.go: events/events.proto | $(PROTOC_GEN_GO) $(PROTOC)
-	protoc --go_out=./go events/events.proto
+	protoc --go_out=./go --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative events/events.proto
 
 events.pb.py: events/events.proto | $(PROTOC)
 	protoc --python_out=./python events/events.proto
diff --git a/events/events.proto b/events/events.proto
index f89c791..a2ae000 100644
--- a/events/events.proto
+++ b/events/events.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 package robocar.events;
-option go_package = "events";
+option go_package = "./events";
 
 import "google/protobuf/timestamp.proto";
 
diff --git a/go/events/events.pb.go b/go/events/events.pb.go
index a6f4854..b5e1bb2 100644
--- a/go/events/events.pb.go
+++ b/go/events/events.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0-devel
+// 	protoc-gen-go v1.26.0
 // 	protoc        v3.12.4
 // source: events/events.proto
 
@@ -966,8 +966,8 @@ var file_events_events_proto_rawDesc = []byte{
 	0x50, 0x49, 0x4c, 0x4f, 0x54, 0x10, 0x02, 0x2a, 0x32, 0x0a, 0x0a, 0x54, 0x79, 0x70, 0x65, 0x4f,
 	0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4e, 0x59, 0x10, 0x00, 0x12, 0x07,
 	0x0a, 0x03, 0x43, 0x41, 0x52, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x55, 0x4d, 0x50, 0x10,
-	0x02, 0x12, 0x08, 0x0a, 0x04, 0x50, 0x4c, 0x4f, 0x54, 0x10, 0x03, 0x42, 0x08, 0x5a, 0x06, 0x65,
-	0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x02, 0x12, 0x08, 0x0a, 0x04, 0x50, 0x4c, 0x4f, 0x54, 0x10, 0x03, 0x42, 0x0a, 0x5a, 0x08, 0x2e,
+	0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (