diff --git a/bootconfig/BUILD.bazel b/bootconfig/BUILD.bazel
index c3040eb..b8497c9 100644
--- a/bootconfig/BUILD.bazel
+++ b/bootconfig/BUILD.bazel
@@ -28,7 +28,11 @@ proto_library(
     srcs = ["bootconfig.proto"],
     deps = [
         "//types:types_proto",
-        "@com_github_openconfig_bootz//proto:bootz_proto",
+        "@com_github_openconfig_bootz//proto:bootz_proto",        
+        "@com_github_openconfig_gnsi//authz:authz_proto",
+        "@com_github_openconfig_gnsi//credentialz:credentialz_proto",
+        "@com_github_openconfig_gnsi//certz:certz_proto",
+        "@com_github_openconfig_gnsi//pathz:pathz_proto",
     ],
 )
 
@@ -52,6 +56,9 @@ go_proto_library(
     deps = [
         "//types",
         "@com_github_openconfig_bootz//proto:bootz_go_proto",
+        "@com_github_openconfig_gnsi//authz:authz_go_proto",
+        "@com_github_openconfig_gnsi//certz:certz_go_proto",
+        "@com_github_openconfig_gnsi//pathz:pathz_go_proto",
     ],
 )
 
diff --git a/bootconfig/bootconfig.proto b/bootconfig/bootconfig.proto
index f2b88c0..94b9a80 100644
--- a/bootconfig/bootconfig.proto
+++ b/bootconfig/bootconfig.proto
@@ -19,6 +19,9 @@ package gnoi.bootconfig;
 
 import "github.com/openconfig/bootz/proto/bootz.proto";
 import "github.com/openconfig/gnoi/types/types.proto";
+import "github.com/openconfig/gnsi/authz/authz.proto";
+import "github.com/openconfig/gnsi/certz/certz.proto";
+import "github.com/openconfig/gnsi/pathz/pathz.proto";
 
 option go_package = "github.com/openconfig/gnoi/bootconfig";
 
@@ -48,7 +51,11 @@ message GetBootConfigResponse {
 }
 
 message SetBootConfigRequest {
-  bootz.BootConfig boot_config = 1;
+  bootz.BootConfig boot_config = 1;  
+  bootz.Credentials credentials = 2;
+  gnsi.pathz.v1.UploadRequest pathz = 3;
+  gnsi.authz.v1.UploadRequest authz = 4;
+  gnsi.certz.v1.UploadRequest certificates = 5;
 }
 
 message SetBootConfigResponse {
diff --git a/go.mod b/go.mod
index 82ded8f..51b82f1 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 
 require (
 	github.com/openconfig/gnmi v0.0.0-20220617175856-41246b1b3507 // indirect
-	github.com/openconfig/gnsi v1.2.3 // indirect
+	github.com/openconfig/gnsi v1.2.5 // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
diff --git a/go.sum b/go.sum
index 723d646..929dccb 100644
--- a/go.sum
+++ b/go.sum
@@ -8,8 +8,8 @@ github.com/openconfig/bootz v0.1.1 h1:pCBi4GXcT+XM2Vud8kh0Q6uyw6oUxN1CFvrxnW+I/a
 github.com/openconfig/bootz v0.1.1/go.mod h1:Yu6GNRKov77EqB56mereAy1yQ3Y5IMUNmAGtk1U8CUs=
 github.com/openconfig/gnmi v0.0.0-20220617175856-41246b1b3507 h1:tv9HygDMXnoGyWuLmNCodMV2+PK6+uT/ndAxDVzsUUQ=
 github.com/openconfig/gnmi v0.0.0-20220617175856-41246b1b3507/go.mod h1:ycJVRtLs20E2c1WD+9oacgxbrBFwQygd8/uaOuGMlfc=
-github.com/openconfig/gnsi v1.2.3 h1:Y/fBMQOn5xqdo9xuT7AK2YHSRejx/ws4sDOMBCHQG6w=
-github.com/openconfig/gnsi v1.2.3/go.mod h1:QikTHkm468uc2rq/kVhETfyZ6FPeM+zitubrHBbB0HE=
+github.com/openconfig/gnsi v1.2.5 h1:P6MjCnLZuINIivGLbp4No1HarZt7456wuJRNbSQyGu0=
+github.com/openconfig/gnsi v1.2.5/go.mod h1:jzPF4rVWPHhIG0F3t910Hh2VqqTbSfv18shbgE4AXhw=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=