diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 6e58e85..7965ca2 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -17,6 +17,12 @@ jobs:
         distribution: zulu
         java-version: 17
 
+    - uses: bufbuild/buf-setup-action@v1
+
+    - uses: bufbuild/buf-lint-action@v1
+      with:
+        input: "src/main/proto"
+
     - name: Install
       run: |
         ./mvnw install
diff --git a/src/main/proto/buf.yaml b/src/main/proto/buf.yaml
new file mode 100644
index 0000000..d81c923
--- /dev/null
+++ b/src/main/proto/buf.yaml
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+version: v1
+lint:
+  use:
+    - BASIC
diff --git a/src/main/proto/orc_proto.proto b/src/main/proto/orc/proto/orc_proto.proto
similarity index 100%
rename from src/main/proto/orc_proto.proto
rename to src/main/proto/orc/proto/orc_proto.proto