diff --git a/internal/codespaces/rpc/codespace/codespace_host_service.v1.pb.go b/internal/codespaces/rpc/codespace/codespace_host_service.v1.pb.go
index 6da7f9e39..aa3601f96 100644
--- a/internal/codespaces/rpc/codespace/codespace_host_service.v1.pb.go
+++ b/internal/codespaces/rpc/codespace/codespace_host_service.v1.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.12.4
 // source: codespace/codespace_host_service.v1.proto
 
 package codespace
diff --git a/internal/codespaces/rpc/codespace/codespace_host_service.v1_grpc.pb.go b/internal/codespaces/rpc/codespace/codespace_host_service.v1_grpc.pb.go
index e876578ad..c8bf17a8f 100644
--- a/internal/codespaces/rpc/codespace/codespace_host_service.v1_grpc.pb.go
+++ b/internal/codespaces/rpc/codespace/codespace_host_service.v1_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.21.12
+// - protoc             v3.12.4
 // source: codespace/codespace_host_service.v1.proto
 
 package codespace
diff --git a/internal/codespaces/rpc/generate.sh b/internal/codespaces/rpc/generate.sh
index 4ba2f898a..2314b6b57 100755
--- a/internal/codespaces/rpc/generate.sh
+++ b/internal/codespaces/rpc/generate.sh
@@ -20,11 +20,11 @@ function generate {
 
   local contract="$dir/$proto"
 
-  protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative "$contract"
+  protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative "$contract" --experimental_allow_proto3_optional
   echo "Generated protocol buffers for $contract"
 
-  services=$(cat "$contract" | grep -Eo "service .+ {" | awk '{print $2 "Server"}')
-  moq -out $contract.mock.go $dir $services
+  services=$(grep -Eo "service .+ {" <$contract | awk '{print $2 "Server"}')
+  moq -out "$contract.mock.go" "$dir" "$services"
   echo "Generated mock protocols for $contract"
 }
 
diff --git a/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1.pb.go b/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1.pb.go
index b8f400d3c..ba1987b87 100644
--- a/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1.pb.go
+++ b/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.12.4
 // source: jupyter/jupyter_server_host_service.v1.proto
 
 package jupyter
diff --git a/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1_grpc.pb.go b/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1_grpc.pb.go
index 31802020d..0473d5a8f 100644
--- a/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1_grpc.pb.go
+++ b/internal/codespaces/rpc/jupyter/jupyter_server_host_service.v1_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.21.12
+// - protoc             v3.12.4
 // source: jupyter/jupyter_server_host_service.v1.proto
 
 package jupyter
diff --git a/internal/codespaces/rpc/ssh/ssh_server_host_service.v1.pb.go b/internal/codespaces/rpc/ssh/ssh_server_host_service.v1.pb.go
index 3dd22f583..d36dd7b56 100644
--- a/internal/codespaces/rpc/ssh/ssh_server_host_service.v1.pb.go
+++ b/internal/codespaces/rpc/ssh/ssh_server_host_service.v1.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.12
+// 	protoc        v3.12.4
 // source: ssh/ssh_server_host_service.v1.proto
 
 package ssh
diff --git a/internal/codespaces/rpc/ssh/ssh_server_host_service.v1_grpc.pb.go b/internal/codespaces/rpc/ssh/ssh_server_host_service.v1_grpc.pb.go
index a111656e8..995eb6ce5 100644
--- a/internal/codespaces/rpc/ssh/ssh_server_host_service.v1_grpc.pb.go
+++ b/internal/codespaces/rpc/ssh/ssh_server_host_service.v1_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.21.12
+// - protoc             v3.12.4
 // source: ssh/ssh_server_host_service.v1.proto
 
 package ssh