diff --git a/modules/openconfig_bootz/0.6.1/MODULE.bazel b/modules/openconfig_bootz/0.6.1/MODULE.bazel
new file mode 100644
index 00000000000..40c0b8eb432
--- /dev/null
+++ b/modules/openconfig_bootz/0.6.1/MODULE.bazel
@@ -0,0 +1,24 @@
+module(
+    name = "openconfig_bootz",
+    version = "0.6.1",
+)
+
+bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "grpc", version = "1.74.1", repo_name = "com_github_grpc_grpc")
+bazel_dep(name = "protobuf", version = "32.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_go", version = "0.57.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "openconfig_gnmi", version = "0.14.1")
+bazel_dep(name = "openconfig_gnsi", version = "1.9.0")
+
+go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
+go_sdk.download(version = "1.25.1")
+
+go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
+go_deps.from_file(go_mod = "//:go.mod")
+use_repo(go_deps, "com_github_coredhcp_coredhcp", "com_github_golang_glog", "com_github_google_go_cmp", "com_github_h_fam_errdiff", "com_github_insomniacslk_dhcp", "org_golang_google_grpc", "org_golang_google_grpc_cmd_protoc_gen_go_grpc", "org_golang_google_protobuf", "org_mozilla_go_pkcs7")
+
+go_deps_dev = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps", dev_dependency = True)
+go_deps_dev.gazelle_override(
+    build_file_generation = "clean",
+    path = "github.com/h-fam/errdiff",
+)
diff --git a/modules/openconfig_bootz/0.6.1/patches/module_dot_bazel.patch b/modules/openconfig_bootz/0.6.1/patches/module_dot_bazel.patch
new file mode 100644
index 00000000000..47616dd2574
--- /dev/null
+++ b/modules/openconfig_bootz/0.6.1/patches/module_dot_bazel.patch
@@ -0,0 +1,10 @@
+--- MODULE.bazel
++++ MODULE.bazel
+@@ -1,6 +1,6 @@
+ module(
+     name = "openconfig_bootz",
+-    version = "0.0.0",
++    version = "0.6.1",
+ )
+ 
+ bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
diff --git a/modules/openconfig_bootz/0.6.1/presubmit.yml b/modules/openconfig_bootz/0.6.1/presubmit.yml
new file mode 100644
index 00000000000..eb7d9488559
--- /dev/null
+++ b/modules/openconfig_bootz/0.6.1/presubmit.yml
@@ -0,0 +1,17 @@
+matrix:
+  platform:
+  - debian10
+  - ubuntu2004
+  bazel:
+  - 8.x
+  - 7.x
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_flags:
+    - '--host_cxxopt=-std=c++17'
+    - '--cxxopt=-std=c++17'
+    build_targets:
+    - '@openconfig_bootz//...'
diff --git a/modules/openconfig_bootz/0.6.1/source.json b/modules/openconfig_bootz/0.6.1/source.json
new file mode 100644
index 00000000000..aa39fc6a6cb
--- /dev/null
+++ b/modules/openconfig_bootz/0.6.1/source.json
@@ -0,0 +1,9 @@
+{
+    "url": "https://github.com/openconfig/bootz/archive/refs/tags/v0.6.1.tar.gz",
+    "integrity": "sha256-Hxzhh+YFE+Fdk3QjVs+KA5lYkTRVFDT7bEZY0oj5av8=",
+    "strip_prefix": "bootz-0.6.1",
+    "patch_strip": 0,
+    "patches": {
+        "module_dot_bazel.patch": "sha256-srmZhixWRnpNggFy/Xt9ITia3GEsWBNz99FxM/6dgN8="
+    }
+}
diff --git a/modules/openconfig_bootz/metadata.json b/modules/openconfig_bootz/metadata.json
index 4df72ddcfd2..0ab94b1ab60 100644
--- a/modules/openconfig_bootz/metadata.json
+++ b/modules/openconfig_bootz/metadata.json
@@ -19,7 +19,8 @@
     ],
     "versions": [
         "0.5.0",
-        "0.6.0"
+        "0.6.0",
+        "0.6.1"
     ],
     "yanked_versions": {}
 }