diff --git a/BUILD.bazel b/BUILD.bazel
index 9e8e3c84..9a23f639 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -129,7 +129,7 @@ test_sources = glob(
         "test/desc",
     ],
     defines = [
-      'GZ_MSGS_TEST_PATH=\\"msgs/test\\"',
+        'GZ_MSGS_TEST_PATH=\\"msgs/test\\"',
     ],
     deps = [
         ":msgs",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 346c6d35..eb211c2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,7 @@ set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
 # Note that CLI files are installed regardless of whether the dependency is
 # available during build time
 find_program(HAVE_GZ_TOOLS gz)
-set(GZ_TOOLS_VER 1)
+set(GZ_TOOLS_VER 2)
 
 #--------------------------------------
 # Find Tinyxml2
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
index 8bdd14a8..bba0c8c1 100644
--- a/tools/BUILD.bazel
+++ b/tools/BUILD.bazel
@@ -1,7 +1,8 @@
-load("@gz//bazel/skylark:gz_py.bzl", "gz_py_binary")
+load("@gz//bazel/skylark:build_defs.bzl", "gz_py_binary")
 
 gz_py_binary(
     name = "gz_msgs_generate_py",
     srcs = ["gz_msgs_generate.py"],
+    main = "gz_msgs_generate.py",
     visibility = ["//visibility:public"],
 )