diff --git a/go/svc/arista-proxy/BUILD.bazel b/go/svc/arista-proxy/BUILD.bazel
index 0d88e08..5699607 100644
--- a/go/svc/arista-proxy/BUILD.bazel
+++ b/go/svc/arista-proxy/BUILD.bazel
@@ -1,19 +1,4 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
-
-proto_library(
-    name = "proto_proto",
-    srcs = ["arista.proto"],
-    visibility = ["//visibility:public"],
-)
-
-go_proto_library(
-    name = "proto_go_proto",
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
-    importpath = "code.hackerspace.pl/hscloud/go/svc/arista-proxy",
-    proto = ":proto_proto",
-    visibility = ["//visibility:public"],
-)
 
 go_library(
     name = "go_default_library",
@@ -21,7 +6,6 @@
         "main.go",
         "service.go",
     ],
-    embed = [":proto_go_proto"],
     importpath = "code.hackerspace.pl/hscloud/go/svc/arista-proxy",
     visibility = ["//visibility:private"],
     deps = [
diff --git a/go/svc/arista-proxy/proto/BUILD.bazel b/go/svc/arista-proxy/proto/BUILD.bazel
index ae4ee9b..af116e3 100644
--- a/go/svc/arista-proxy/proto/BUILD.bazel
+++ b/go/svc/arista-proxy/proto/BUILD.bazel
@@ -1,8 +1,23 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+
+proto_library(
+    name = "proto_proto",
+    srcs = ["arista.proto"],
+    visibility = ["//visibility:public"],
+)
+
+go_proto_library(
+    name = "proto_go_proto",
+    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
+    importpath = "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto",
+    proto = ":proto_proto",
+    visibility = ["//visibility:public"],
+)
 
 go_library(
     name = "go_default_library",
-    srcs = ["generate.go"],
+    embed = [":proto_go_proto"],
     importpath = "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto",
     visibility = ["//visibility:public"],
 )
diff --git a/go/svc/arista-proxy/arista.proto b/go/svc/arista-proxy/proto/arista.proto
similarity index 90%
rename from go/svc/arista-proxy/arista.proto
rename to go/svc/arista-proxy/proto/arista.proto
index d6bf105..d306b43 100644
--- a/go/svc/arista-proxy/arista.proto
+++ b/go/svc/arista-proxy/proto/arista.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
-
 package proto;
+option go_package = "code.hackerspace.pl/hscloud/go/svc/arista-proxy/proto";
 
 message ShowVersionRequest {
 };
diff --git a/go/svc/arista-proxy/proto/generate.go b/go/svc/arista-proxy/proto/generate.go
deleted file mode 100644
index 92f2720..0000000
--- a/go/svc/arista-proxy/proto/generate.go
+++ /dev/null
@@ -1,3 +0,0 @@
-//go:generate protoc -I.. ../arista.proto --go_out=plugins=grpc:.
-
-package proto