diff --git a/api/mock/api_mock.go b/api/mock/api_mock.go
index af9ea737e94..7a5db429814 100644
--- a/api/mock/api_mock.go
+++ b/api/mock/api_mock.go
@@ -241,6 +241,26 @@ func (mr *MockAPIClientMockRecorder) DefineSecret(arg0, arg1 interface{}, arg2 .
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DefineSecret", reflect.TypeOf((*MockAPIClient)(nil).DefineSecret), varargs...)
 }
 
+// DeleteSecretDefinition mocks base method.
+func (m *MockAPIClient) DeleteSecretDefinition(arg0 context.Context, arg1 *proto0.SecretDefinition, arg2 ...grpc.CallOption) (*emptypb.Empty, error) {
+	m.ctrl.T.Helper()
+	varargs := []interface{}{arg0, arg1}
+	for _, a := range arg2 {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "DeleteSecretDefinition", varargs...)
+	ret0, _ := ret[0].(*emptypb.Empty)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DeleteSecretDefinition indicates an expected call of DeleteSecretDefinition.
+func (mr *MockAPIClientMockRecorder) DeleteSecretDefinition(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSecretDefinition", reflect.TypeOf((*MockAPIClient)(nil).DeleteSecretDefinition), varargs...)
+}
+
 // DeleteSubject mocks base method.
 func (m *MockAPIClient) DeleteSubject(arg0 context.Context, arg1 *proto0.DataRequest, arg2 ...grpc.CallOption) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
diff --git a/api/proto/api.pb.go b/api/proto/api.pb.go
index 66713146660..ff001f0f7ce 100644
--- a/api/proto/api.pb.go
+++ b/api/proto/api.pb.go
@@ -664,7 +664,7 @@ var file_api_proto_rawDesc = []byte{
 	0x6f, 0x6e, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x6a, 0x73, 0x6f, 0x6e, 0x6c,
 	0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04,
 	0x72, 0x6f, 0x77, 0x73, 0x12, 0x15, 0x0a, 0x06, 0x6f, 0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64, 0x32, 0x9f, 0x3c, 0x0a, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67, 0x49, 0x64, 0x32, 0x95, 0x3d, 0x0a, 0x03,
 	0x41, 0x50, 0x49, 0x12, 0x52, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x48, 0x75, 0x6e,
 	0x74, 0x12, 0x0b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x48, 0x75, 0x6e, 0x74, 0x1a, 0x18,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x46, 0x6c, 0x6f, 0x77,
@@ -1081,76 +1081,83 @@ var file_api_proto_rawDesc = []byte{
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70,
 	0x74, 0x79, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69,
 	0x2f, 0x76, 0x31, 0x2f, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74,
-	0x3a, 0x01, 0x2a, 0x12, 0x71, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74,
-	0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74,
-	0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x12, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
-	0x31, 0x2f, 0x47, 0x65, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x44, 0x65, 0x66, 0x69, 0x6e,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x50, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x53, 0x65, 0x63,
-	0x72, 0x65, 0x74, 0x12, 0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x41, 0x64, 0x64, 0x53,
-	0x65, 0x63, 0x72, 0x65, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x63, 0x0a, 0x0c, 0x4d, 0x6f, 0x64, 0x69,
-	0x66, 0x79, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x1f, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x4d, 0x6f,
-	0x64, 0x69, 0x66, 0x79, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x44, 0x0a,
-	0x09, 0x47, 0x65, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x0d, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13,
-	0x12, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x47, 0x65, 0x74, 0x53, 0x65, 0x63,
-	0x72, 0x65, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x56, 0x46, 0x53, 0x47, 0x65, 0x74, 0x42, 0x75, 0x66,
-	0x66, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x56, 0x46, 0x53, 0x46,
-	0x69, 0x6c, 0x65, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x1a, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x56, 0x46, 0x53, 0x46, 0x69, 0x6c, 0x65, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22,
-	0x00, 0x12, 0x38, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x56, 0x51, 0x4c, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x41,
-	0x72, 0x67, 0x73, 0x1a, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x56, 0x51, 0x4c, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x3b, 0x0a, 0x0a, 0x57,
-	0x61, 0x74, 0x63, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x3f, 0x0a, 0x0a, 0x50, 0x75, 0x73, 0x68,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50,
-	0x75, 0x73, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x3a, 0x0a, 0x0a, 0x57, 0x72, 0x69,
-	0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x56, 0x51, 0x4c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x09, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c,
-	0x65, 0x72, 0x12, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64,
-	0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x37, 0x0a, 0x0a, 0x47, 0x65, 0x74,
-	0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x37, 0x0a, 0x0a, 0x53, 0x65, 0x74, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74,
+	0x3a, 0x01, 0x2a, 0x12, 0x74, 0x0a, 0x16, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x44, 0x65, 0x66, 0x69,
+	0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x29,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f,
+	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x44, 0x65, 0x66, 0x69,
+	0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x71, 0x0a, 0x14, 0x47, 0x65, 0x74,
+	0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x12, 0x1c,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x47, 0x65, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65,
+	0x74, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x50, 0x0a, 0x09,
+	0x41, 0x64, 0x64, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76,
+	0x31, 0x2f, 0x41, 0x64, 0x64, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x63,
+	0x0a, 0x0c, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x1a,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x53, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x76, 0x31, 0x2f, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74,
+	0x3a, 0x01, 0x2a, 0x12, 0x44, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74,
+	0x12, 0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x1a,
+	0x0d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x22, 0x19,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f,
+	0x47, 0x65, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x3c, 0x0a, 0x0c, 0x56, 0x46, 0x53,
+	0x47, 0x65, 0x74, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x56, 0x46, 0x53, 0x46, 0x69, 0x6c, 0x65, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x1a,
+	0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x56, 0x46, 0x53, 0x46, 0x69, 0x6c, 0x65, 0x42,
+	0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0x00, 0x12, 0x38, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x12, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x56, 0x51, 0x4c, 0x43, 0x6f, 0x6c, 0x6c,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x41, 0x72, 0x67, 0x73, 0x1a, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x56, 0x51, 0x4c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30,
+	0x01, 0x12, 0x3b, 0x0a, 0x0a, 0x57, 0x61, 0x74, 0x63, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12,
+	0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x3f,
+	0x0a, 0x0a, 0x50, 0x75, 0x73, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x17, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x50, 0x75, 0x73, 0x68, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12,
+	0x3a, 0x0a, 0x0a, 0x57, 0x72, 0x69, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x56, 0x51, 0x4c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x09, 0x53,
+	0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12,
+	0x37, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x12, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x37, 0x0a, 0x0a, 0x53, 0x65, 0x74, 0x53,
+	0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44,
+	0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x3d, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x6a, 0x65,
+	0x63, 0x74, 0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00,
+	0x12, 0x41, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e,
 	0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74,
-	0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x0d, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x12, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x0c, 0x4c, 0x69,
-	0x73, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x12, 0x12, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64,
-	0x72, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3e, 0x0a,
-	0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x48,
-	0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x31, 0x5a,
-	0x2f, 0x77, 0x77, 0x77, 0x2e, 0x76, 0x65, 0x6c, 0x6f, 0x63, 0x69, 0x64, 0x65, 0x78, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x76, 0x65, 0x6c, 0x6f, 0x63, 0x69,
-	0x72, 0x61, 0x70, 0x74, 0x6f, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x19, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x42, 0x31, 0x5a, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x76, 0x65, 0x6c, 0x6f, 0x63,
+	0x69, 0x64, 0x65, 0x78, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f,
+	0x76, 0x65, 0x6c, 0x6f, 0x63, 0x69, 0x72, 0x61, 0x70, 0x74, 0x6f, 0x72, 0x2f, 0x61, 0x70, 0x69,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1321,102 +1328,104 @@ var file_api_proto_depIdxs = []int32{
 	45, // 62: proto.API.UploadNotebookAttachment:input_type -> proto.NotebookFileUploadRequest
 	45, // 63: proto.API.RemoveNotebookAttachment:input_type -> proto.NotebookFileUploadRequest
 	46, // 64: proto.API.DefineSecret:input_type -> proto.SecretDefinition
-	19, // 65: proto.API.GetSecretDefinitions:input_type -> google.protobuf.Empty
-	47, // 66: proto.API.AddSecret:input_type -> proto.Secret
-	48, // 67: proto.API.ModifySecret:input_type -> proto.ModifySecretRequest
-	47, // 68: proto.API.GetSecret:input_type -> proto.Secret
-	4,  // 69: proto.API.VFSGetBuffer:input_type -> proto.VFSFileBuffer
-	49, // 70: proto.API.Query:input_type -> proto.VQLCollectorArgs
-	6,  // 71: proto.API.WatchEvent:input_type -> proto.EventRequest
-	8,  // 72: proto.API.PushEvents:input_type -> proto.PushEventRequest
-	50, // 73: proto.API.WriteEvent:input_type -> proto.VQLResponse
-	51, // 74: proto.API.Scheduler:input_type -> proto.ScheduleRequest
-	52, // 75: proto.API.GetSubject:input_type -> proto.DataRequest
-	52, // 76: proto.API.SetSubject:input_type -> proto.DataRequest
-	52, // 77: proto.API.DeleteSubject:input_type -> proto.DataRequest
-	52, // 78: proto.API.ListChildren:input_type -> proto.DataRequest
-	53, // 79: proto.API.Check:input_type -> proto.HealthCheckRequest
-	0,  // 80: proto.API.CreateHunt:output_type -> proto.StartFlowResponse
-	54, // 81: proto.API.EstimateHunt:output_type -> proto.HuntStats
-	55, // 82: proto.API.GetHuntTable:output_type -> proto.GetTableResponse
-	56, // 83: proto.API.ListHunts:output_type -> proto.ListHuntsResponse
-	9,  // 84: proto.API.GetHunt:output_type -> proto.Hunt
-	19, // 85: proto.API.ModifyHunt:output_type -> google.protobuf.Empty
-	55, // 86: proto.API.GetHuntFlows:output_type -> proto.GetTableResponse
-	55, // 87: proto.API.GetHuntResults:output_type -> proto.GetTableResponse
-	19, // 88: proto.API.NotifyClients:output_type -> google.protobuf.Empty
-	57, // 89: proto.API.LabelClients:output_type -> proto.APIResponse
-	58, // 90: proto.API.ListClients:output_type -> proto.SearchClientsResponse
-	59, // 91: proto.API.GetClient:output_type -> proto.ApiClient
-	60, // 92: proto.API.GetClientMetadata:output_type -> proto.ClientMetadata
-	19, // 93: proto.API.SetClientMetadata:output_type -> google.protobuf.Empty
-	55, // 94: proto.API.GetClientFlows:output_type -> proto.GetTableResponse
-	61, // 95: proto.API.GetUserUITraits:output_type -> proto.ApiUser
-	62, // 96: proto.API.SetGUIOptions:output_type -> proto.SetGUIOptionsResponse
-	63, // 97: proto.API.GetUsers:output_type -> proto.Users
-	63, // 98: proto.API.GetGlobalUsers:output_type -> proto.Users
-	22, // 99: proto.API.GetUserRoles:output_type -> proto.UserRoles
-	19, // 100: proto.API.SetUserRoles:output_type -> google.protobuf.Empty
-	64, // 101: proto.API.GetUser:output_type -> proto.VelociraptorUser
-	19, // 102: proto.API.CreateUser:output_type -> google.protobuf.Empty
-	65, // 103: proto.API.GetUserFavorites:output_type -> proto.Favorites
-	19, // 104: proto.API.SetPassword:output_type -> google.protobuf.Empty
-	66, // 105: proto.API.VFSListDirectory:output_type -> proto.VFSListResponse
-	55, // 106: proto.API.VFSListDirectoryFiles:output_type -> proto.GetTableResponse
-	67, // 107: proto.API.VFSRefreshDirectory:output_type -> proto.ArtifactCollectorResponse
-	66, // 108: proto.API.VFSStatDirectory:output_type -> proto.VFSListResponse
-	68, // 109: proto.API.VFSStatDownload:output_type -> proto.VFSDownloadInfo
-	0,  // 110: proto.API.VFSDownloadFile:output_type -> proto.StartFlowResponse
-	55, // 111: proto.API.GetTable:output_type -> proto.GetTableResponse
-	69, // 112: proto.API.SearchFile:output_type -> proto.SearchFileResponse
-	67, // 113: proto.API.CollectArtifact:output_type -> proto.ArtifactCollectorResponse
-	0,  // 114: proto.API.CancelFlow:output_type -> proto.StartFlowResponse
-	70, // 115: proto.API.GetFlowDetails:output_type -> proto.FlowDetails
-	71, // 116: proto.API.GetFlowRequests:output_type -> proto.ApiFlowRequestDetails
-	72, // 117: proto.API.GetKeywordCompletions:output_type -> proto.KeywordCompletions
-	31, // 118: proto.API.ReformatVQL:output_type -> proto.ReformatVQLMessage
-	73, // 119: proto.API.GetArtifacts:output_type -> proto.ArtifactDescriptors
-	74, // 120: proto.API.GetArtifactFile:output_type -> proto.GetArtifactResponse
-	57, // 121: proto.API.SetArtifactFile:output_type -> proto.APIResponse
-	75, // 122: proto.API.LoadArtifactPack:output_type -> proto.LoadArtifactPackResponse
-	36, // 123: proto.API.GetToolInfo:output_type -> proto.Tool
-	36, // 124: proto.API.SetToolInfo:output_type -> proto.Tool
-	76, // 125: proto.API.GetReport:output_type -> proto.GetReportResponse
-	29, // 126: proto.API.GetServerMonitoringState:output_type -> proto.ArtifactCollectorArgs
-	29, // 127: proto.API.SetServerMonitoringState:output_type -> proto.ArtifactCollectorArgs
-	39, // 128: proto.API.GetClientMonitoringState:output_type -> proto.ClientEventTable
-	19, // 129: proto.API.SetClientMonitoringState:output_type -> google.protobuf.Empty
-	77, // 130: proto.API.ListAvailableEventResults:output_type -> proto.ListAvailableEventResultsResponse
-	78, // 131: proto.API.CreateDownloadFile:output_type -> proto.CreateDownloadResponse
-	79, // 132: proto.API.GetNotebooks:output_type -> proto.Notebooks
-	43, // 133: proto.API.NewNotebook:output_type -> proto.NotebookMetadata
-	43, // 134: proto.API.UpdateNotebook:output_type -> proto.NotebookMetadata
-	43, // 135: proto.API.NewNotebookCell:output_type -> proto.NotebookMetadata
-	80, // 136: proto.API.GetNotebookCell:output_type -> proto.NotebookCell
-	80, // 137: proto.API.UpdateNotebookCell:output_type -> proto.NotebookCell
-	80, // 138: proto.API.RevertNotebookCell:output_type -> proto.NotebookCell
-	19, // 139: proto.API.CancelNotebookCell:output_type -> google.protobuf.Empty
-	19, // 140: proto.API.CreateNotebookDownloadFile:output_type -> google.protobuf.Empty
-	81, // 141: proto.API.UploadNotebookAttachment:output_type -> proto.NotebookFileUploadResponse
-	19, // 142: proto.API.RemoveNotebookAttachment:output_type -> google.protobuf.Empty
-	19, // 143: proto.API.DefineSecret:output_type -> google.protobuf.Empty
-	82, // 144: proto.API.GetSecretDefinitions:output_type -> proto.SecretDefinitionList
-	19, // 145: proto.API.AddSecret:output_type -> google.protobuf.Empty
-	19, // 146: proto.API.ModifySecret:output_type -> google.protobuf.Empty
-	47, // 147: proto.API.GetSecret:output_type -> proto.Secret
-	4,  // 148: proto.API.VFSGetBuffer:output_type -> proto.VFSFileBuffer
-	50, // 149: proto.API.Query:output_type -> proto.VQLResponse
-	7,  // 150: proto.API.WatchEvent:output_type -> proto.EventResponse
-	19, // 151: proto.API.PushEvents:output_type -> google.protobuf.Empty
-	19, // 152: proto.API.WriteEvent:output_type -> google.protobuf.Empty
-	83, // 153: proto.API.Scheduler:output_type -> proto.ScheduleResponse
-	84, // 154: proto.API.GetSubject:output_type -> proto.DataResponse
-	84, // 155: proto.API.SetSubject:output_type -> proto.DataResponse
-	19, // 156: proto.API.DeleteSubject:output_type -> google.protobuf.Empty
-	85, // 157: proto.API.ListChildren:output_type -> proto.ListChildrenResponse
-	86, // 158: proto.API.Check:output_type -> proto.HealthCheckResponse
-	80, // [80:159] is the sub-list for method output_type
-	1,  // [1:80] is the sub-list for method input_type
+	46, // 65: proto.API.DeleteSecretDefinition:input_type -> proto.SecretDefinition
+	19, // 66: proto.API.GetSecretDefinitions:input_type -> google.protobuf.Empty
+	47, // 67: proto.API.AddSecret:input_type -> proto.Secret
+	48, // 68: proto.API.ModifySecret:input_type -> proto.ModifySecretRequest
+	47, // 69: proto.API.GetSecret:input_type -> proto.Secret
+	4,  // 70: proto.API.VFSGetBuffer:input_type -> proto.VFSFileBuffer
+	49, // 71: proto.API.Query:input_type -> proto.VQLCollectorArgs
+	6,  // 72: proto.API.WatchEvent:input_type -> proto.EventRequest
+	8,  // 73: proto.API.PushEvents:input_type -> proto.PushEventRequest
+	50, // 74: proto.API.WriteEvent:input_type -> proto.VQLResponse
+	51, // 75: proto.API.Scheduler:input_type -> proto.ScheduleRequest
+	52, // 76: proto.API.GetSubject:input_type -> proto.DataRequest
+	52, // 77: proto.API.SetSubject:input_type -> proto.DataRequest
+	52, // 78: proto.API.DeleteSubject:input_type -> proto.DataRequest
+	52, // 79: proto.API.ListChildren:input_type -> proto.DataRequest
+	53, // 80: proto.API.Check:input_type -> proto.HealthCheckRequest
+	0,  // 81: proto.API.CreateHunt:output_type -> proto.StartFlowResponse
+	54, // 82: proto.API.EstimateHunt:output_type -> proto.HuntStats
+	55, // 83: proto.API.GetHuntTable:output_type -> proto.GetTableResponse
+	56, // 84: proto.API.ListHunts:output_type -> proto.ListHuntsResponse
+	9,  // 85: proto.API.GetHunt:output_type -> proto.Hunt
+	19, // 86: proto.API.ModifyHunt:output_type -> google.protobuf.Empty
+	55, // 87: proto.API.GetHuntFlows:output_type -> proto.GetTableResponse
+	55, // 88: proto.API.GetHuntResults:output_type -> proto.GetTableResponse
+	19, // 89: proto.API.NotifyClients:output_type -> google.protobuf.Empty
+	57, // 90: proto.API.LabelClients:output_type -> proto.APIResponse
+	58, // 91: proto.API.ListClients:output_type -> proto.SearchClientsResponse
+	59, // 92: proto.API.GetClient:output_type -> proto.ApiClient
+	60, // 93: proto.API.GetClientMetadata:output_type -> proto.ClientMetadata
+	19, // 94: proto.API.SetClientMetadata:output_type -> google.protobuf.Empty
+	55, // 95: proto.API.GetClientFlows:output_type -> proto.GetTableResponse
+	61, // 96: proto.API.GetUserUITraits:output_type -> proto.ApiUser
+	62, // 97: proto.API.SetGUIOptions:output_type -> proto.SetGUIOptionsResponse
+	63, // 98: proto.API.GetUsers:output_type -> proto.Users
+	63, // 99: proto.API.GetGlobalUsers:output_type -> proto.Users
+	22, // 100: proto.API.GetUserRoles:output_type -> proto.UserRoles
+	19, // 101: proto.API.SetUserRoles:output_type -> google.protobuf.Empty
+	64, // 102: proto.API.GetUser:output_type -> proto.VelociraptorUser
+	19, // 103: proto.API.CreateUser:output_type -> google.protobuf.Empty
+	65, // 104: proto.API.GetUserFavorites:output_type -> proto.Favorites
+	19, // 105: proto.API.SetPassword:output_type -> google.protobuf.Empty
+	66, // 106: proto.API.VFSListDirectory:output_type -> proto.VFSListResponse
+	55, // 107: proto.API.VFSListDirectoryFiles:output_type -> proto.GetTableResponse
+	67, // 108: proto.API.VFSRefreshDirectory:output_type -> proto.ArtifactCollectorResponse
+	66, // 109: proto.API.VFSStatDirectory:output_type -> proto.VFSListResponse
+	68, // 110: proto.API.VFSStatDownload:output_type -> proto.VFSDownloadInfo
+	0,  // 111: proto.API.VFSDownloadFile:output_type -> proto.StartFlowResponse
+	55, // 112: proto.API.GetTable:output_type -> proto.GetTableResponse
+	69, // 113: proto.API.SearchFile:output_type -> proto.SearchFileResponse
+	67, // 114: proto.API.CollectArtifact:output_type -> proto.ArtifactCollectorResponse
+	0,  // 115: proto.API.CancelFlow:output_type -> proto.StartFlowResponse
+	70, // 116: proto.API.GetFlowDetails:output_type -> proto.FlowDetails
+	71, // 117: proto.API.GetFlowRequests:output_type -> proto.ApiFlowRequestDetails
+	72, // 118: proto.API.GetKeywordCompletions:output_type -> proto.KeywordCompletions
+	31, // 119: proto.API.ReformatVQL:output_type -> proto.ReformatVQLMessage
+	73, // 120: proto.API.GetArtifacts:output_type -> proto.ArtifactDescriptors
+	74, // 121: proto.API.GetArtifactFile:output_type -> proto.GetArtifactResponse
+	57, // 122: proto.API.SetArtifactFile:output_type -> proto.APIResponse
+	75, // 123: proto.API.LoadArtifactPack:output_type -> proto.LoadArtifactPackResponse
+	36, // 124: proto.API.GetToolInfo:output_type -> proto.Tool
+	36, // 125: proto.API.SetToolInfo:output_type -> proto.Tool
+	76, // 126: proto.API.GetReport:output_type -> proto.GetReportResponse
+	29, // 127: proto.API.GetServerMonitoringState:output_type -> proto.ArtifactCollectorArgs
+	29, // 128: proto.API.SetServerMonitoringState:output_type -> proto.ArtifactCollectorArgs
+	39, // 129: proto.API.GetClientMonitoringState:output_type -> proto.ClientEventTable
+	19, // 130: proto.API.SetClientMonitoringState:output_type -> google.protobuf.Empty
+	77, // 131: proto.API.ListAvailableEventResults:output_type -> proto.ListAvailableEventResultsResponse
+	78, // 132: proto.API.CreateDownloadFile:output_type -> proto.CreateDownloadResponse
+	79, // 133: proto.API.GetNotebooks:output_type -> proto.Notebooks
+	43, // 134: proto.API.NewNotebook:output_type -> proto.NotebookMetadata
+	43, // 135: proto.API.UpdateNotebook:output_type -> proto.NotebookMetadata
+	43, // 136: proto.API.NewNotebookCell:output_type -> proto.NotebookMetadata
+	80, // 137: proto.API.GetNotebookCell:output_type -> proto.NotebookCell
+	80, // 138: proto.API.UpdateNotebookCell:output_type -> proto.NotebookCell
+	80, // 139: proto.API.RevertNotebookCell:output_type -> proto.NotebookCell
+	19, // 140: proto.API.CancelNotebookCell:output_type -> google.protobuf.Empty
+	19, // 141: proto.API.CreateNotebookDownloadFile:output_type -> google.protobuf.Empty
+	81, // 142: proto.API.UploadNotebookAttachment:output_type -> proto.NotebookFileUploadResponse
+	19, // 143: proto.API.RemoveNotebookAttachment:output_type -> google.protobuf.Empty
+	19, // 144: proto.API.DefineSecret:output_type -> google.protobuf.Empty
+	19, // 145: proto.API.DeleteSecretDefinition:output_type -> google.protobuf.Empty
+	82, // 146: proto.API.GetSecretDefinitions:output_type -> proto.SecretDefinitionList
+	19, // 147: proto.API.AddSecret:output_type -> google.protobuf.Empty
+	19, // 148: proto.API.ModifySecret:output_type -> google.protobuf.Empty
+	47, // 149: proto.API.GetSecret:output_type -> proto.Secret
+	4,  // 150: proto.API.VFSGetBuffer:output_type -> proto.VFSFileBuffer
+	50, // 151: proto.API.Query:output_type -> proto.VQLResponse
+	7,  // 152: proto.API.WatchEvent:output_type -> proto.EventResponse
+	19, // 153: proto.API.PushEvents:output_type -> google.protobuf.Empty
+	19, // 154: proto.API.WriteEvent:output_type -> google.protobuf.Empty
+	83, // 155: proto.API.Scheduler:output_type -> proto.ScheduleResponse
+	84, // 156: proto.API.GetSubject:output_type -> proto.DataResponse
+	84, // 157: proto.API.SetSubject:output_type -> proto.DataResponse
+	19, // 158: proto.API.DeleteSubject:output_type -> google.protobuf.Empty
+	85, // 159: proto.API.ListChildren:output_type -> proto.ListChildrenResponse
+	86, // 160: proto.API.Check:output_type -> proto.HealthCheckResponse
+	81, // [81:161] is the sub-list for method output_type
+	1,  // [1:81] is the sub-list for method input_type
 	1,  // [1:1] is the sub-list for extension type_name
 	1,  // [1:1] is the sub-list for extension extendee
 	0,  // [0:1] is the sub-list for field type_name
diff --git a/api/proto/api.pb.gw.go b/api/proto/api.pb.gw.go
index 888701d4b19..eebfb9e31db 100644
--- a/api/proto/api.pb.gw.go
+++ b/api/proto/api.pb.gw.go
@@ -22,8 +22,8 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
-	proto_7 "www.velocidex.com/golang/velociraptor/artifacts/proto"
-	proto_5 "www.velocidex.com/golang/velociraptor/flows/proto"
+	proto_6 "www.velocidex.com/golang/velociraptor/artifacts/proto"
+	proto_2 "www.velocidex.com/golang/velociraptor/flows/proto"
 )
 
 // Suppress "imported and not used" errors
@@ -1279,7 +1279,7 @@ func local_request_API_SearchFile_0(ctx context.Context, marshaler runtime.Marsh
 }
 
 func request_API_CollectArtifact_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.ArtifactCollectorArgs
+	var protoReq proto_2.ArtifactCollectorArgs
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1296,7 +1296,7 @@ func request_API_CollectArtifact_0(ctx context.Context, marshaler runtime.Marsha
 }
 
 func local_request_API_CollectArtifact_0(ctx context.Context, marshaler runtime.Marshaler, server APIServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.ArtifactCollectorArgs
+	var protoReq proto_2.ArtifactCollectorArgs
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1613,7 +1613,7 @@ var (
 )
 
 func request_API_GetToolInfo_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_7.Tool
+	var protoReq proto_6.Tool
 	var metadata runtime.ServerMetadata
 
 	if err := req.ParseForm(); err != nil {
@@ -1629,7 +1629,7 @@ func request_API_GetToolInfo_0(ctx context.Context, marshaler runtime.Marshaler,
 }
 
 func local_request_API_GetToolInfo_0(ctx context.Context, marshaler runtime.Marshaler, server APIServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_7.Tool
+	var protoReq proto_6.Tool
 	var metadata runtime.ServerMetadata
 
 	if err := req.ParseForm(); err != nil {
@@ -1645,7 +1645,7 @@ func local_request_API_GetToolInfo_0(ctx context.Context, marshaler runtime.Mars
 }
 
 func request_API_SetToolInfo_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_7.Tool
+	var protoReq proto_6.Tool
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1662,7 +1662,7 @@ func request_API_SetToolInfo_0(ctx context.Context, marshaler runtime.Marshaler,
 }
 
 func local_request_API_SetToolInfo_0(ctx context.Context, marshaler runtime.Marshaler, server APIServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_7.Tool
+	var protoReq proto_6.Tool
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1731,7 +1731,7 @@ func local_request_API_GetServerMonitoringState_0(ctx context.Context, marshaler
 }
 
 func request_API_SetServerMonitoringState_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.ArtifactCollectorArgs
+	var protoReq proto_2.ArtifactCollectorArgs
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1748,7 +1748,7 @@ func request_API_SetServerMonitoringState_0(ctx context.Context, marshaler runti
 }
 
 func local_request_API_SetServerMonitoringState_0(ctx context.Context, marshaler runtime.Marshaler, server APIServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.ArtifactCollectorArgs
+	var protoReq proto_2.ArtifactCollectorArgs
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1769,7 +1769,7 @@ var (
 )
 
 func request_API_GetClientMonitoringState_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.GetClientMonitoringStateRequest
+	var protoReq proto_2.GetClientMonitoringStateRequest
 	var metadata runtime.ServerMetadata
 
 	if err := req.ParseForm(); err != nil {
@@ -1785,7 +1785,7 @@ func request_API_GetClientMonitoringState_0(ctx context.Context, marshaler runti
 }
 
 func local_request_API_GetClientMonitoringState_0(ctx context.Context, marshaler runtime.Marshaler, server APIServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.GetClientMonitoringStateRequest
+	var protoReq proto_2.GetClientMonitoringStateRequest
 	var metadata runtime.ServerMetadata
 
 	if err := req.ParseForm(); err != nil {
@@ -1801,7 +1801,7 @@ func local_request_API_GetClientMonitoringState_0(ctx context.Context, marshaler
 }
 
 func request_API_SetClientMonitoringState_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.ClientEventTable
+	var protoReq proto_2.ClientEventTable
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1818,7 +1818,7 @@ func request_API_SetClientMonitoringState_0(ctx context.Context, marshaler runti
 }
 
 func local_request_API_SetClientMonitoringState_0(ctx context.Context, marshaler runtime.Marshaler, server APIServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq proto_5.ClientEventTable
+	var protoReq proto_2.ClientEventTable
 	var metadata runtime.ServerMetadata
 
 	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -2314,6 +2314,40 @@ func local_request_API_DefineSecret_0(ctx context.Context, marshaler runtime.Mar
 
 }
 
+func request_API_DeleteSecretDefinition_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq SecretDefinition
+	var metadata runtime.ServerMetadata
+
+	newReader, berr := utilities.IOReaderFactory(req.Body)
+	if berr != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
+	}
+	if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.DeleteSecretDefinition(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_API_DeleteSecretDefinition_0(ctx context.Context, marshaler runtime.Marshaler, server APIServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq SecretDefinition
+	var metadata runtime.ServerMetadata
+
+	newReader, berr := utilities.IOReaderFactory(req.Body)
+	if berr != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
+	}
+	if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := server.DeleteSecretDefinition(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
 func request_API_GetSecretDefinitions_0(ctx context.Context, marshaler runtime.Marshaler, client APIClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq empty.Empty
 	var metadata runtime.ServerMetadata
@@ -3914,6 +3948,29 @@ func RegisterAPIHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 
 	})
 
+	mux.Handle("POST", pattern_API_DeleteSecretDefinition_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/proto.API/DeleteSecretDefinition", runtime.WithHTTPPathPattern("/api/v1/DeleteSecretDefinition"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_API_DeleteSecretDefinition_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_API_DeleteSecretDefinition_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("GET", pattern_API_GetSecretDefinitions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -5327,6 +5384,26 @@ func RegisterAPIHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 
 	})
 
+	mux.Handle("POST", pattern_API_DeleteSecretDefinition_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/proto.API/DeleteSecretDefinition", runtime.WithHTTPPathPattern("/api/v1/DeleteSecretDefinition"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_API_DeleteSecretDefinition_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_API_DeleteSecretDefinition_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("GET", pattern_API_GetSecretDefinitions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -5539,6 +5616,8 @@ var (
 
 	pattern_API_DefineSecret_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "DefineSecret"}, ""))
 
+	pattern_API_DeleteSecretDefinition_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "DeleteSecretDefinition"}, ""))
+
 	pattern_API_GetSecretDefinitions_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "GetSecretDefinitions"}, ""))
 
 	pattern_API_AddSecret_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "AddSecret"}, ""))
@@ -5677,6 +5756,8 @@ var (
 
 	forward_API_DefineSecret_0 = runtime.ForwardResponseMessage
 
+	forward_API_DeleteSecretDefinition_0 = runtime.ForwardResponseMessage
+
 	forward_API_GetSecretDefinitions_0 = runtime.ForwardResponseMessage
 
 	forward_API_AddSecret_0 = runtime.ForwardResponseMessage
diff --git a/api/proto/api.proto b/api/proto/api.proto
index 534404e83d3..4e01a547ffe 100644
--- a/api/proto/api.proto
+++ b/api/proto/api.proto
@@ -551,6 +551,13 @@ service API {
         };
     }
 
+    rpc DeleteSecretDefinition(SecretDefinition) returns (google.protobuf.Empty) {
+        option (google.api.http) = {
+            post: "/api/v1/DeleteSecretDefinition",
+            body: "*",
+        };
+    }
+
     rpc GetSecretDefinitions(google.protobuf.Empty) returns (SecretDefinitionList) {
         option (google.api.http) = {
             get: "/api/v1/GetSecretDefinitions",
diff --git a/api/proto/api_grpc.pb.go b/api/proto/api_grpc.pb.go
index 79637eacbc8..f8c16b49914 100644
--- a/api/proto/api_grpc.pb.go
+++ b/api/proto/api_grpc.pb.go
@@ -113,6 +113,7 @@ type APIClient interface {
 	RemoveNotebookAttachment(ctx context.Context, in *NotebookFileUploadRequest, opts ...grpc.CallOption) (*empty.Empty, error)
 	// Secret management
 	DefineSecret(ctx context.Context, in *SecretDefinition, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSecretDefinition(ctx context.Context, in *SecretDefinition, opts ...grpc.CallOption) (*empty.Empty, error)
 	GetSecretDefinitions(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*SecretDefinitionList, error)
 	AddSecret(ctx context.Context, in *Secret, opts ...grpc.CallOption) (*empty.Empty, error)
 	ModifySecret(ctx context.Context, in *ModifySecretRequest, opts ...grpc.CallOption) (*empty.Empty, error)
@@ -723,6 +724,15 @@ func (c *aPIClient) DefineSecret(ctx context.Context, in *SecretDefinition, opts
 	return out, nil
 }
 
+func (c *aPIClient) DeleteSecretDefinition(ctx context.Context, in *SecretDefinition, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/proto.API/DeleteSecretDefinition", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *aPIClient) GetSecretDefinitions(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*SecretDefinitionList, error) {
 	out := new(SecretDefinitionList)
 	err := c.cc.Invoke(ctx, "/proto.API/GetSecretDefinitions", in, out, opts...)
@@ -1021,6 +1031,7 @@ type APIServer interface {
 	RemoveNotebookAttachment(context.Context, *NotebookFileUploadRequest) (*empty.Empty, error)
 	// Secret management
 	DefineSecret(context.Context, *SecretDefinition) (*empty.Empty, error)
+	DeleteSecretDefinition(context.Context, *SecretDefinition) (*empty.Empty, error)
 	GetSecretDefinitions(context.Context, *empty.Empty) (*SecretDefinitionList, error)
 	AddSecret(context.Context, *Secret) (*empty.Empty, error)
 	ModifySecret(context.Context, *ModifySecretRequest) (*empty.Empty, error)
@@ -1244,6 +1255,9 @@ func (UnimplementedAPIServer) RemoveNotebookAttachment(context.Context, *Noteboo
 func (UnimplementedAPIServer) DefineSecret(context.Context, *SecretDefinition) (*empty.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DefineSecret not implemented")
 }
+func (UnimplementedAPIServer) DeleteSecretDefinition(context.Context, *SecretDefinition) (*empty.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteSecretDefinition not implemented")
+}
 func (UnimplementedAPIServer) GetSecretDefinitions(context.Context, *empty.Empty) (*SecretDefinitionList, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetSecretDefinitions not implemented")
 }
@@ -2454,6 +2468,24 @@ func _API_DefineSecret_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
+func _API_DeleteSecretDefinition_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SecretDefinition)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(APIServer).DeleteSecretDefinition(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.API/DeleteSecretDefinition",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(APIServer).DeleteSecretDefinition(ctx, req.(*SecretDefinition))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _API_GetSecretDefinitions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(empty.Empty)
 	if err := dec(in); err != nil {
@@ -3001,6 +3033,10 @@ var API_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DefineSecret",
 			Handler:    _API_DefineSecret_Handler,
 		},
+		{
+			MethodName: "DeleteSecretDefinition",
+			Handler:    _API_DeleteSecretDefinition_Handler,
+		},
 		{
 			MethodName: "GetSecretDefinitions",
 			Handler:    _API_GetSecretDefinitions_Handler,
diff --git a/api/secrets.go b/api/secrets.go
index fbcb81a33a0..b90d13b5217 100644
--- a/api/secrets.go
+++ b/api/secrets.go
@@ -74,6 +74,41 @@ func (self *ApiServer) DefineSecret(
 	return &emptypb.Empty{}, Status(self.verbose, err)
 }
 
+func (self *ApiServer) DeleteSecretDefinition(
+	ctx context.Context,
+	in *api_proto.SecretDefinition) (*emptypb.Empty, error) {
+
+	users := services.GetUserManager()
+	user_record, org_config_obj, err := users.GetUserFromContext(ctx)
+	if err != nil {
+		return nil, Status(self.verbose, err)
+	}
+	principal := user_record.Name
+
+	permissions := acls.SERVER_ADMIN
+	perm, err := services.CheckAccess(org_config_obj, principal, permissions)
+	if !perm || err != nil {
+		return nil, PermissionDenied(err,
+			"User is not allowed to manage secrets.")
+	}
+
+	secrets, err := services.GetSecretsService(org_config_obj)
+	if err != nil {
+		return nil, Status(self.verbose, err)
+	}
+
+	err = secrets.DeleteSecretDefinition(ctx, in)
+	if err == nil {
+		services.LogAudit(ctx,
+			org_config_obj, principal, "User Deleted Secret Type",
+			ordereddict.NewDict().
+				Set("principal", principal).
+				Set("type", in.TypeName))
+	}
+
+	return &emptypb.Empty{}, Status(self.verbose, err)
+}
+
 func (self *ApiServer) AddSecret(
 	ctx context.Context,
 	in *api_proto.Secret) (*emptypb.Empty, error) {
diff --git a/docs/references/vql.yaml b/docs/references/vql.yaml
index b3c6c4e7d71..12443a8ebb9 100644
--- a/docs/references/vql.yaml
+++ b/docs/references/vql.yaml
@@ -5563,13 +5563,10 @@
   metadata:
     permissions: MACHINE_STATE
 - name: server_metadata
-  description: Returns client metadata from the datastore. Client metadata is a set
-    of free form key/value data
+  description: |
+    Returns server metadata from the datastore. Server metadata is a
+    set of free form key/value data
   type: Function
-  args:
-  - name: client_id
-    type: string
-    required: true
   category: server
   metadata:
     permissions: SERVER_ADMIN
@@ -7304,4 +7301,3 @@
   category: plugin
   metadata:
     permissions: FILESYSTEM_READ
-
diff --git a/gui/velociraptor/package.json b/gui/velociraptor/package.json
index 5852dffe054..ef69c1a9541 100644
--- a/gui/velociraptor/package.json
+++ b/gui/velociraptor/package.json
@@ -1,6 +1,6 @@
 {
     "name": "velociraptor",
-    "version": "0.7.1",
+    "version": "0.72",
     "private": true,
     "type": "module",
     "dependencies": {
diff --git a/gui/velociraptor/src/components/artifacts/artifacts-upload.jsx b/gui/velociraptor/src/components/artifacts/artifacts-upload.jsx
index 3f3e2383077..a8d48dcc85b 100644
--- a/gui/velociraptor/src/components/artifacts/artifacts-upload.jsx
+++ b/gui/velociraptor/src/components/artifacts/artifacts-upload.jsx
@@ -230,7 +230,7 @@ export default class ArtifactsUpload extends React.Component {
                       <Alert variant="danger">
                         {T("Errors")}
                       </Alert>
-                      <Alert variant="warningXX">
+                      <Alert variant="warning">
                         <dl className="row" >
                           {_.map(this.state.errors, (msg, idx) => {
                               return <React.Fragment key={idx}>
diff --git a/gui/velociraptor/src/components/notebooks/notebook-cell-renderer.jsx b/gui/velociraptor/src/components/notebooks/notebook-cell-renderer.jsx
index e8df4f4c960..91e3be26aea 100644
--- a/gui/velociraptor/src/components/notebooks/notebook-cell-renderer.jsx
+++ b/gui/velociraptor/src/components/notebooks/notebook-cell-renderer.jsx
@@ -27,6 +27,7 @@ import ViewCellLogs from "./logs.jsx";
 import CopyCellToNotebookDialog from './notebook-copy-cell.jsx';
 import FormatTableDialog from './notebook-format-tables.jsx';
 import NotebookUploads from '../notebooks/notebook-uploads.jsx';
+import { formatColumns } from "../core/table.jsx";
 
 import {CancelToken} from 'axios';
 import api from '../core/api-service.jsx';
@@ -100,19 +101,24 @@ class AddCellFromHunt extends React.PureComponent {
               </Modal.Header>
               <Modal.Body>
                 <div className="no-margins selectable">
-                  <BootstrapTable
-                    hover
-                    condensed
-                    keyField="hunt_id"
-                    bootstrap4
-                    headerClasses="alert alert-secondary"
-                    bodyClasses="fixed-table-body"
-                    data={this.state.hunts}
-                    filter={ filterFactory() }
-                    selectRow={ selectRow }
-                  />
-                  { _.isEmpty(this.state.hunts) &&
-                    <div className="no-content">{T("No hunts exist in the system. You can start a new hunt by clicking the New Hunt button above.")}</div>}
+                  { _.isEmpty(this.state.hunts) ?
+                    <div className="no-content">
+                      {T("No hunts exist in the system. You can start a new hunt by clicking the New Hunt button above.")}
+                    </div>
+                    :
+                    <BootstrapTable
+                      hover
+                      condensed
+                      keyField="hunt_id"
+                      bootstrap4
+                      headerClasses="alert alert-secondary"
+                      bodyClasses="fixed-table-body"
+                      data={this.state.hunts}
+                      columns={getHuntColumns()}
+                      filter={ filterFactory() }
+                      selectRow={ selectRow }
+                    />
+                  }
                 </div>
 
               </Modal.Body>
@@ -1068,3 +1074,48 @@ export default class NotebookCellRenderer extends React.Component {
         );
     }
 };
+
+function getHuntColumns() {
+    return formatColumns([
+        {
+            dataField: "state", text: T("State"),
+            formatter: (cell, row) => {
+                let stopped = row.stats && row.stats.stopped;
+                if (stopped || cell === "STOPPED") {
+                    return <div className="hunt-status-icon">
+                             <FontAwesomeIcon icon="stop" /></div>;
+                }
+                if (cell === "RUNNING") {
+                    return <div className="hunt-status-icon">
+                             <FontAwesomeIcon icon="hourglass" /></div>;
+                }
+                if (cell === "PAUSED") {
+                    return <div className="hunt-status-icon">
+                             <FontAwesomeIcon icon="pause" /></div>;
+                }
+                return <div className="hunt-status-icon">
+                         <FontAwesomeIcon icon="exclamation" /></div>;
+            }
+        },
+        { dataField: "hunt_id", text: T("Hunt ID") },
+        {
+            dataField: "hunt_description", text: T("Description"),
+            sort: true, filtered: true, editable: true
+        },
+        {
+            dataField: "create_time", text: T("Created"),
+            type: "timestamp", sort: true
+        },
+        {
+            dataField: "start_time", text: T("Started"),
+            type: "timestamp", sort: true
+        },
+        {
+            dataField: "expires",
+            text: T("Expires"), sort: true,
+            type: "timestamp"
+        },
+        { dataField: "stats.total_clients_scheduled", text: T("Scheduled") },
+        { dataField: "creator", text: T("Creator") },
+    ]);
+}
diff --git a/gui/velociraptor/src/components/secrets/secrets.jsx b/gui/velociraptor/src/components/secrets/secrets.jsx
index 9760c0d73b6..b674f4f403e 100644
--- a/gui/velociraptor/src/components/secrets/secrets.jsx
+++ b/gui/velociraptor/src/components/secrets/secrets.jsx
@@ -17,6 +17,7 @@ import Row from 'react-bootstrap/Row';
 import DictEditor from '../forms/dict.jsx';
 import UserForm from '../utils/users.jsx';
 import Form from 'react-bootstrap/Form';
+import Alert from 'react-bootstrap/Alert';
 
 import "./secrets.css";
 
@@ -36,22 +37,37 @@ class AddSecretTypeDialog extends Component {
     }
 
     addSecretDefinition = () => {
+        // Check the template is ok
+        let template = "";
+        try {
+            template = JSON.parse(this.state.template_json);
+        } catch(e) {
+            this.setState({error: "Secret Template: " + e.toString()});
+            return;
+        };
+
         this.source.cancel();
         this.source = CancelToken.source();
 
         api.post("v1/DefineSecret", {
             type_name: this.state.type_name,
             verifier: this.state.verifier,
+            template: template,
         },  this.source.token).then(response=>{
             if (response.cancel)
                 return;
             this.props.onClose();
+        }).catch(e=>{
+            this.setState({error: "Secret Template: " + e.response.data.message});
         });
     }
 
     state = {
         type_name: "",
         verifier: "",
+        template_json: "{\"Key\":\"Value\"}",
+        error: "",
+
     }
 
     render() {
@@ -76,7 +92,17 @@ class AddSecretTypeDialog extends Component {
                    value={this.state.verifier}
                    setValue={x=>this.setState({verifier:x})}
                  />
+                 <VeloForm
+                   param={{name: T("Template"), description: T("A JSON object which serves as the template for the secret")}}
+                   value={this.state.template_json}
+                   setValue={x=>this.setState({template_json:x})}
+                 />
 
+                {this.state.error &&
+                 <Alert variant="warning">
+                   {this.state.error}
+                 </Alert>
+                }
               </Modal.Body>
               <Modal.Footer>
                 <Button variant="secondary"
@@ -237,6 +263,73 @@ class DeleteSecretDialog extends Component {
     }
 }
 
+class DeleteSecretTypeDialog extends Component {
+    static propTypes = {
+        secret: PropTypes.object,
+        onClose: PropTypes.func.isRequired,
+    }
+
+    componentDidMount = () => {
+        this.source = CancelToken.source();
+    }
+
+    componentWillUnmount = () => {
+        this.source.cancel();
+    }
+
+    deleteSecret = ()=>{
+        this.source.cancel();
+        this.source = CancelToken.source();
+
+        if(!this.props.secret) {
+            return;
+        }
+
+        api.post("v1/DeleteSecretDefinition", {
+            type_name: this.props.secret.type_name,
+        },  this.source.token).then(response=>{
+            if (response.cancel)
+                return;
+
+            this.props.onClose();
+        });
+    }
+
+    state = {
+        secret: {},
+        previous_users: [],
+        new_users: [],
+    }
+
+    render() {
+        return(
+            <Modal show={true}
+                   size="lg"
+                   enforceFocus={true}
+                   dialogClassName="modal-90w"
+                   onHide={this.props.onClose}>
+              <Modal.Header closeButton>
+                <Modal.Title>{T("Delete secret definition")}</Modal.Title>
+              </Modal.Header>
+              <Modal.Body >
+                <h1>{this.props.secret.name }</h1>
+                {T("This secret type will be permanently deleted")}
+              </Modal.Body>
+              <Modal.Footer>
+                <Button variant="secondary"
+                        onClick={this.props.onClose}>
+                  {T("Close")}
+                </Button>
+                <Button variant="primary"
+                        onClick={this.deleteSecret}>
+                  {T("Do it!")}
+                </Button>
+              </Modal.Footer>
+            </Modal>
+        );
+    }
+}
+
 
 class AddSecretDialog extends Component {
     static propTypes = {
@@ -427,6 +520,13 @@ export default class SecretManager extends Component {
         });
     }
 
+    getItemIcon = item=>{
+        if (item.built_in) {
+            return <FontAwesomeIcon icon="house" /> ;
+        }
+        return <FontAwesomeIcon icon="user-edit" /> ;
+    };
+
     render() {
         return (
             <Row className="secret-manager">
@@ -469,6 +569,15 @@ export default class SecretManager extends Component {
                   }}
                 />
               }
+              { this.state.showDeleteSecretTypeDialog &&
+                <DeleteSecretTypeDialog
+                  secret={this.state.current_definition}
+                  onClose={()=>{
+                      this.setState({showDeleteSecretTypeDialog: false});
+                      this.getSecretDefinitions();
+                  }}
+                />
+              }
 
               <Col sm="4">
                 <Container className="selectable user-list">
@@ -477,6 +586,23 @@ export default class SecretManager extends Component {
                       <tr>
                         <th>
                           {T("Secret Types")}
+                          <Button
+                            data-tooltip={T("Delete Secret Type")}
+                            data-position="left"
+                            onClick={()=>this.setState({
+                                showDeleteSecretTypeDialog: true
+                            })}
+                            className="btn-tooltip new-user-btn"
+                            variant="outline-default"
+                            disabled={_.isEmpty(this.state.current_definition) ||
+                                      this.state.current_definition.built_in}
+                            as="button">
+                            <FontAwesomeIcon icon="trash"/>
+                            <span className="sr-only">
+                              {T("Delete Secret Type")}
+                            </span>
+                          </Button>
+
                           <Button
                             data-tooltip={T("Add new type")}
                             data-position="left"
@@ -505,6 +631,9 @@ export default class SecretManager extends Component {
                                            current_secret: {},
                                            current_definition: item});
                                    }}>
+                                     <span className="built-in-icon">
+                                       {this.getItemIcon(item)}
+                                     </span>
                                      {item.type_name}
                                    </td>
                                  </tr>;
@@ -536,7 +665,7 @@ export default class SecretManager extends Component {
                                 {T("Add new secret")}
                               </span>
                             </Button>
-                            { this.state.current_secret.name && <>
+                            { this.state.current_secret && this.state.current_secret.name && <>
                               <Button
                                 data-tooltip={T("Edit secret")}
                                 data-position="left"
@@ -588,7 +717,7 @@ export default class SecretManager extends Component {
                   </Container>
                 </Col>
               }
-              { this.state.current_secret.name &&
+              { this.state.current_secret && this.state.current_secret.name &&
                 <Col sm="3">
                   <Container className="selectable user-list">
                     <Table  bordered hover size="sm">
diff --git a/services/notebook/calculate.go b/services/notebook/calculate.go
index 7a390f4b211..347a12350e7 100644
--- a/services/notebook/calculate.go
+++ b/services/notebook/calculate.go
@@ -106,6 +106,7 @@ func (self *NotebookManager) UpdateNotebookCell(
 		return notebook_cell, err
 	}
 
+	// Read work is done in NotebookWorker.ProcessUpdateRequest
 	response_chan, err := scheduler.Schedule(ctx, services.SchedulerJob{
 		Queue: "Notebook",
 		Job:   json.MustMarshalString(request),
diff --git a/services/notebook/calculate_test.go b/services/notebook/calculate_test.go
index 551927a96d8..5e10c5d9812 100644
--- a/services/notebook/calculate_test.go
+++ b/services/notebook/calculate_test.go
@@ -77,9 +77,9 @@ func (self *NotebookManagerTestSuite) TestNotebookManagerUpdateCell() {
 
 	assert.Equal(self.T(), len(notebook.CellMetadata), 1)
 	assert.Equal(self.T(),
-		notebook.CellMetadata[0].CurrentVersion, "04")
+		notebook.CellMetadata[0].CurrentVersion, "03")
 	assert.Equal(self.T(),
-		notebook.CellMetadata[0].AvailableVersions, []string{"04"})
+		notebook.CellMetadata[0].AvailableVersions, []string{"03"})
 
 	golden.Set("Notebook Metadata", notebook)
 
@@ -106,13 +106,22 @@ func (self *NotebookManagerTestSuite) TestNotebookManagerUpdateCell() {
 
 	// The new cell should have a higher version
 	assert.Equal(self.T(), len(notebook.CellMetadata), 1)
-	assert.Equal(self.T(), cell.CurrentVersion, "06")
+	assert.Equal(self.T(), cell.CurrentVersion, "05")
 
 	// The old version is still there and available. There should be 3
 	// versions all up.
-	assert.Equal(self.T(), cell.AvailableVersions, []string{"04", "05", "06"})
+	assert.Equal(self.T(), cell.AvailableVersions, []string{"03", "04", "05"})
 
+	// The cell that is returned from the UpdateNotebookCell contains
+	// all the data.
 	golden.Set("VQL Cell", cell)
+
+	// The notebook itself should only contain summary cells.
+	new_notebook, err := notebook_manager.GetNotebook(
+		self.Ctx, notebook.NotebookId, services.DO_NOT_INCLUDE_UPLOADS)
+	assert.NoError(self.T(), err)
+	golden.Set("Full Notebook after update", new_notebook)
+
 	goldie.Assert(self.T(), "TestNotebookManagerUpdateCell",
 		json.MustMarshalIndent(golden))
 }
diff --git a/services/notebook/fixtures/TestNotebookManagerUpdateCell.golden b/services/notebook/fixtures/TestNotebookManagerUpdateCell.golden
index 900fc8099a0..b696ddfad9f 100644
--- a/services/notebook/fixtures/TestNotebookManagerUpdateCell.golden
+++ b/services/notebook/fixtures/TestNotebookManagerUpdateCell.golden
@@ -10,13 +10,13 @@
    {
     "cell_id": "NC.02",
     "timestamp": 10,
-    "current_version": "04",
+    "type": "markdown",
+    "current_version": "03",
     "available_versions": [
-     "04"
+     "03"
     ]
    }
-  ],
-  "latest_cell_id": "NC.02"
+  ]
  },
  "Markdown Cell": {
   "input": "# Heading 1\n\nHello world\n",
@@ -28,15 +28,15 @@
   ],
   "timestamp": 10,
   "type": "markdown",
-  "current_version": "05",
+  "current_version": "04",
   "available_versions": [
-   "04",
-   "05"
+   "03",
+   "04"
   ]
  },
  "VQL Cell": {
   "input": "SELECT _value AS X FROM range(end=2)",
-  "output": "\u003cdiv class=\"panel\"\u003e\u003cgrr-csv-viewer base-url=\"'v1/GetTable'\" params='%7B%22notebook_id%22%3A%22N.01%22%2C%22client_id%22%3A%22%22%2C%22cell_id%22%3A%22NC.02-06%22%2C%22table_id%22%3A1%2C%22TableOptions%22%3A%7B%7D%2C%22Version%22%3A10%7D' /\u003e\u003c/div\u003e",
+  "output": "\u003cdiv class=\"panel\"\u003e\u003cgrr-csv-viewer base-url=\"'v1/GetTable'\" params='%7B%22notebook_id%22%3A%22N.01%22%2C%22client_id%22%3A%22%22%2C%22cell_id%22%3A%22NC.02-05%22%2C%22table_id%22%3A1%2C%22TableOptions%22%3A%7B%7D%2C%22Version%22%3A10%7D' /\u003e\u003c/div\u003e",
   "data": "{}",
   "cell_id": "NC.02",
   "messages": [
@@ -44,11 +44,32 @@
   ],
   "timestamp": 10,
   "type": "vql",
-  "current_version": "06",
+  "current_version": "05",
   "available_versions": [
+   "03",
    "04",
-   "05",
-   "06"
+   "05"
+  ]
+ },
+ "Full Notebook after update": {
+  "name": "Test Notebook",
+  "description": "This is a test",
+  "creator": "admin",
+  "created_time": 10,
+  "modified_time": 10,
+  "notebook_id": "N.01",
+  "cell_metadata": [
+   {
+    "cell_id": "NC.02",
+    "timestamp": 10,
+    "type": "vql",
+    "current_version": "05",
+    "available_versions": [
+     "03",
+     "04",
+     "05"
+    ]
+   }
   ]
  }
 }
\ No newline at end of file
diff --git a/services/notebook/initial.go b/services/notebook/initial.go
index edbf40bc98b..e981ff87129 100644
--- a/services/notebook/initial.go
+++ b/services/notebook/initial.go
@@ -20,11 +20,11 @@ func (self *NotebookManager) NewNotebookCell(
 	*api_proto.NotebookMetadata, error) {
 
 	// Calculate the cell first then insert it into the notebook.
-
 	new_version := GetNextVersion("")
 	new_cell_request := &api_proto.NotebookCellRequest{
 		Input:             in.Input,
 		Output:            in.Output,
+		CellId:            NewNotebookCellId(),
 		NotebookId:        in.NotebookId,
 		Version:           new_version,
 		AvailableVersions: []string{new_version},
@@ -36,13 +36,6 @@ func (self *NotebookManager) NewNotebookCell(
 		CurrentlyEditing: true,
 	}
 
-	// Allow the caller to specify the cell id
-	if in.CellId != "" {
-		new_cell_request.CellId = in.CellId
-	} else {
-		new_cell_request.CellId = NewNotebookCellId()
-	}
-
 	// TODO: This is not thread safe!
 	notebook, err := self.Store.GetNotebook(in.NotebookId)
 	if err != nil {
@@ -54,7 +47,8 @@ func (self *NotebookManager) NewNotebookCell(
 		in.Input = "\n\n\n\n\n\n"
 	}
 
-	new_cell, err := self.UpdateNotebookCell(ctx, notebook, username, new_cell_request)
+	new_cell, err := self.UpdateNotebookCell(
+		ctx, notebook, username, new_cell_request)
 	if err != nil {
 		return nil, err
 	}
@@ -268,7 +262,8 @@ func (self *NotebookManager) CreateInitialNotebook(ctx context.Context,
 		}
 
 		cell_req.Sync = true
-		_, err = self.NewNotebookCell(ctx, cell_req, principal)
+		_, err = self.UpdateNotebookCell(
+			ctx, notebook_metadata, principal, cell_req)
 		if err != nil {
 			return err
 		}
diff --git a/services/notebook/storage.go b/services/notebook/storage.go
index b9b5906110d..5bdcd2204fc 100644
--- a/services/notebook/storage.go
+++ b/services/notebook/storage.go
@@ -112,6 +112,24 @@ func (self *NotebookStoreImpl) GetNotebook(notebook_id string) (*api_proto.Noteb
 	notebook := &api_proto.NotebookMetadata{}
 	err = db.GetSubject(self.config_obj, notebook_path_manager.Path(),
 		notebook)
+
+	cell_metadata := ordereddict.NewDict()
+	for _, cell := range notebook.CellMetadata {
+		_, pres := cell_metadata.Get(cell.CellId)
+		if pres {
+			continue
+		}
+
+		cell_metadata.Set(cell.CellId, cell)
+	}
+
+	notebook.CellMetadata = nil
+	for _, k := range cell_metadata.Keys() {
+		v, _ := cell_metadata.Get(k)
+		notebook.CellMetadata = append(notebook.CellMetadata,
+			v.(*api_proto.NotebookCell))
+	}
+
 	return notebook, err
 }
 
@@ -143,7 +161,7 @@ func (self *NotebookStoreImpl) SetNotebookCell(
 	for _, cell_md := range notebook.CellMetadata {
 		if cell_md.CellId == in.CellId {
 			// Replace the cell with the new cell
-			cell_md = proto.Clone(in).(*api_proto.NotebookCell)
+			cell_md = SummarizeCell(in)
 			cell_md.Timestamp = now
 			found = true
 		}
@@ -252,6 +270,23 @@ func (self *NotebookStoreImpl) RemoveNotebookCell(
 
 func (self *NotebookStoreImpl) GetNotebookCell(
 	notebook_id, cell_id, version string) (*api_proto.NotebookCell, error) {
+
+	// If the caller does not specify the version it means they want
+	// the current version.
+	if version == "" {
+		notebook, err := self.GetNotebook(notebook_id)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, cell_md := range notebook.CellMetadata {
+			if cell_md.CellId == cell_id {
+				version = cell_md.CurrentVersion
+				break
+			}
+		}
+	}
+
 	db, err := datastore.GetDB(self.config_obj)
 	if err != nil {
 		return nil, err
diff --git a/services/notebook/utils.go b/services/notebook/utils.go
index c71a334b220..3f14c23c663 100644
--- a/services/notebook/utils.go
+++ b/services/notebook/utils.go
@@ -1,6 +1,7 @@
 package notebook
 
 import (
+	api_proto "www.velocidex.com/golang/velociraptor/api/proto"
 	"www.velocidex.com/golang/velociraptor/utils"
 )
 
@@ -19,3 +20,14 @@ func NewNotebookAttachmentId() string {
 func GetNextVersion(version string) string {
 	return utils.NextId()
 }
+
+// Not all values from the real cell are stored in cell summaries.
+func SummarizeCell(cell_md *api_proto.NotebookCell) *api_proto.NotebookCell {
+	return &api_proto.NotebookCell{
+		CellId:            cell_md.CellId,
+		Timestamp:         cell_md.Timestamp,
+		Type:              cell_md.Type,
+		CurrentVersion:    cell_md.CurrentVersion,
+		AvailableVersions: cell_md.AvailableVersions,
+	}
+}
diff --git a/services/notebook/version_test.go b/services/notebook/version_test.go
index 07ec603ba74..595b01bddd0 100644
--- a/services/notebook/version_test.go
+++ b/services/notebook/version_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/alecthomas/assert"
 	api_proto "www.velocidex.com/golang/velociraptor/api/proto"
-	"www.velocidex.com/golang/velociraptor/json"
 	"www.velocidex.com/golang/velociraptor/services"
 	"www.velocidex.com/golang/velociraptor/utils"
 	"www.velocidex.com/golang/velociraptor/vtesting"
@@ -74,8 +73,6 @@ func (self *NotebookManagerTestSuite) TestUpdateCellVersions() {
 		notebook.NotebookId, cell.CellId, available_versions[1])
 	assert.NoError(self.T(), err)
 
-	json.Dump(reverted_cell)
-
 	// Make sure we got the right version back
 	assert.Equal(self.T(),
 		reverted_cell.Input, inputs[available_versions[1]])
@@ -118,4 +115,21 @@ func (self *NotebookManagerTestSuite) TestUpdateCellVersions() {
 	// But the last version is advanced.
 	assert.Equal(self.T(), cell.AvailableVersions[2],
 		cell.CurrentVersion)
+
+	// Now check we can get the current version using GetNotebookCell()
+	new_cell, err := notebook_manager.GetNotebookCell(self.Ctx,
+		notebook.NotebookId, cell.CellId, "" /* Specify no cell version */)
+
+	// Fetches the current version.
+	assert.NoError(self.T(), err)
+	assert.Equal(self.T(), new_cell.CurrentVersion, cell.CurrentVersion)
+
+	// Now get arbitrary versions
+	new_cell, err = notebook_manager.GetNotebookCell(self.Ctx,
+		notebook.NotebookId, cell.CellId, available_versions[1])
+	assert.NoError(self.T(), err)
+
+	assert.NoError(self.T(), err)
+	assert.Equal(self.T(), new_cell.CurrentVersion, available_versions[1])
+	assert.True(self.T(), available_versions[1] != cell.CurrentVersion)
 }
diff --git a/services/notebook/worker.go b/services/notebook/worker.go
index 5dfdec92d08..43192e26918 100644
--- a/services/notebook/worker.go
+++ b/services/notebook/worker.go
@@ -141,7 +141,8 @@ func (self *NotebookWorker) ProcessUpdateRequest(
 	}
 
 	// The notification is removed either inline or in the background.
-	cancel_notify, remove_notification := notifier.ListenForNotification(in.CellId + in.Version)
+	cancel_notify, remove_notification := notifier.ListenForNotification(
+		in.CellId + in.Version)
 	defer remove_notification()
 
 	// Watcher thread: Wait for cancellation from the GUI or a 10 min timeout.
diff --git a/services/secrets.go b/services/secrets.go
index 4192b7afcc3..23cd5d38c0b 100644
--- a/services/secrets.go
+++ b/services/secrets.go
@@ -74,6 +74,9 @@ type SecretsService interface {
 	// lambda to allow verification of new secrets.
 	DefineSecret(ctx context.Context, definition *api_proto.SecretDefinition) error
 
+	DeleteSecretDefinition(
+		ctx context.Context, definition *api_proto.SecretDefinition) error
+
 	GetSecretDefinitions(ctx context.Context) []*api_proto.SecretDefinition
 
 	// Add a new managed secret. This function applies any verifiers
diff --git a/services/secrets/secrets.go b/services/secrets/secrets.go
index 98acd7282ed..874a7983725 100644
--- a/services/secrets/secrets.go
+++ b/services/secrets/secrets.go
@@ -3,6 +3,7 @@ package secrets
 import (
 	"context"
 	"fmt"
+	"sort"
 	"sync"
 	"time"
 
@@ -120,6 +121,53 @@ func (self *SecretsService) DefineSecret(
 	return self.definitions_lru.Set(definition.TypeName, result)
 }
 
+func (self *SecretsService) DeleteSecretDefinition(
+	ctx context.Context, definition *api_proto.SecretDefinition) error {
+
+	// Get the existing secrets
+	secrets, err := self.getSecretsForDefinition(definition.TypeName)
+	if err != nil {
+		return err
+	}
+
+	secret_path_manager := paths.SecretsPathManager{}
+	db, err := datastore.GetDB(self.config_obj)
+	if err != nil {
+		return err
+	}
+
+	// Delete all secrets
+	for _, name := range secrets {
+		err = db.DeleteSubject(self.config_obj,
+			secret_path_manager.Secret(definition.TypeName, name))
+		if err != nil {
+			continue
+		}
+	}
+
+	self.definitions_lru.Remove(definition.TypeName)
+
+	return db.DeleteSubject(self.config_obj,
+		secret_path_manager.SecretsDefinition(definition.TypeName))
+}
+
+func (self *SecretsService) getSecretsForDefinition(
+	type_name string) (res []string, err error) {
+
+	db, err := datastore.GetDB(self.config_obj)
+	if err != nil {
+		return nil, err
+	}
+
+	children, _ := db.ListChildren(self.config_obj,
+		paths.SecretsPathManager{}.SecretsDefinition(type_name))
+	for _, c := range children {
+		secret_name := c.Base()
+		res = append(res, secret_name)
+	}
+	return res, nil
+}
+
 func (self *SecretsService) getSecretDefinition(
 	ctx context.Context, type_name string) (*SecretDefinition, error) {
 	definition, err := self.definitions_lru.Get(type_name)
@@ -241,21 +289,18 @@ func (self *SecretsService) GetSecretDefinitions(
 		seen[type_name] = true
 
 		definition, err := self.getSecretDefinition(ctx, type_name)
-		if err == nil {
-			definition.SecretNames = nil
-
-			children, _ := db.ListChildren(self.config_obj,
-				paths.SecretsPathManager{}.SecretsDefinition(type_name))
-			for _, c := range children {
-				secret_name := c.Base()
-				definition.SecretNames = append(
-					definition.SecretNames, secret_name)
-			}
-
-			result = append(result, definition.SecretDefinition)
+		if err != nil {
+			continue
 		}
+
+		definition.SecretNames, _ = self.getSecretsForDefinition(type_name)
+		result = append(result, definition.SecretDefinition)
 	}
 
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].TypeName < result[j].TypeName
+	})
+
 	return result
 }
 
diff --git a/services/secrets/secrets_test.go b/services/secrets/secrets_test.go
index 9bfcb6c824b..ddfa163c222 100644
--- a/services/secrets/secrets_test.go
+++ b/services/secrets/secrets_test.go
@@ -99,6 +99,31 @@ func (self *SecretsTestSuite) TestSecretsService() {
 	assert.Error(self.T(), err)
 	assert.Contains(self.T(), err.Error(), `Permission Denied`)
 
+	// Get all known secrets
+	all_secrets := secrets.GetSecretDefinitions(self.Ctx)
+	assert.Equal(self.T(), len(all_secrets), 1)
+	assert.Equal(self.T(), all_secrets[0].SecretNames, []string{"MySecret"})
+
+	// Now remove the secret type
+	err = secrets.DeleteSecretDefinition(self.Ctx, &api_proto.SecretDefinition{
+		TypeName: "MySecretType",
+	})
+	assert.NoError(self.T(), err)
+
+	// No secrets known.
+	all_secrets = secrets.GetSecretDefinitions(self.Ctx)
+	assert.Equal(self.T(), len(all_secrets), 0)
+
+	// Create it again
+	err = secrets.DefineSecret(self.Ctx, &api_proto.SecretDefinition{
+		TypeName: "MySecretType"})
+	assert.NoError(self.T(), err)
+
+	// Try to get the old secret but it should be deleted.
+	assert.Equal(self.T(), len(
+		getData(self.ConfigObj,
+			db, "config/secrets/MySecretType/MySecret").Keys()), 0)
+
 	goldie.Assert(self.T(), "TestSecretsService",
 		json.MustMarshalIndent(golden))
 }
diff --git a/services/users/storage.go b/services/users/storage.go
index 706478d44fe..48501ab0893 100644
--- a/services/users/storage.go
+++ b/services/users/storage.go
@@ -423,11 +423,8 @@ func (self *UserStorageManager) getUserOptions(ctx context.Context, username str
 
 	options := &api_proto.SetGUIOptionsRequest{}
 	err = db.GetSubject(self.config_obj, path_manager.GUIOptions(), options)
-	if errors.Is(err, os.ErrNotExist) {
-		return nil, fmt.Errorf("%w: %v", services.UserNotFoundError, username)
-	}
-
-	if options.Options == "" {
+	if errors.Is(err, os.ErrNotExist) || options.Options == "" {
+		// If the record is not found we need to create one from scratch.
 		options.Options = default_user_options
 	}
 
diff --git a/vql/server/clients/metadata.go b/vql/server/clients/metadata.go
index ded329ca5f1..a8391674802 100644
--- a/vql/server/clients/metadata.go
+++ b/vql/server/clients/metadata.go
@@ -1,3 +1,4 @@
+//go:build server_vql
 // +build server_vql
 
 package clients
@@ -167,7 +168,7 @@ func (self ServerMetadataFunction) Info(
 	return &vfilter.FunctionInfo{
 		Name:     "server_metadata",
 		Doc:      "Returns server metadata from the datastore. Server metadata is a set of free form key/value data",
-		ArgType:  type_map.AddType(scope, &ClientMetadataFunctionArgs{}),
+		ArgType:  type_map.AddType(scope, &ServerMetadataFunctionArgs{}),
 		Metadata: vql.VQLMetadata().Permissions(acls.SERVER_ADMIN).Build(),
 	}
 }
diff --git a/vql/server/flows/results.go b/vql/server/flows/results.go
index dfa80f4bebb..ecdc61e0ea2 100644
--- a/vql/server/flows/results.go
+++ b/vql/server/flows/results.go
@@ -227,28 +227,54 @@ func isArtifactEvent(
 	}
 }
 
-func getResultSetReader(
+func getNotebookResultSetReader(
 	ctx context.Context,
 	config_obj *config_proto.Config,
 	scope vfilter.Scope,
 	arg *SourcePluginArgs) (result_sets.ResultSetReader, error) {
 
+	// Version not specified, we need to fetch the current one.
+	if arg.NotebookCellVersion == "" {
+		notebook_manager, err := services.GetNotebookManager(config_obj)
+		if err != nil {
+			return nil, err
+		}
+
+		cell, err := notebook_manager.GetNotebookCell(ctx, arg.NotebookId,
+			arg.NotebookCellId, arg.NotebookCellVersion)
+		if err != nil {
+			return nil, err
+		}
+
+		arg.NotebookCellVersion = cell.CurrentVersion
+	}
+
+	table := arg.NotebookCellTable
+	if table == 0 {
+		table = 1
+	}
+
 	file_store_factory := file_store.GetFileStore(config_obj)
+	path_manager := paths.NewNotebookPathManager(arg.NotebookId).
+		Cell(arg.NotebookCellId, arg.NotebookCellVersion).
+		QueryStorage(table)
+
+	return result_sets.NewResultSetReader(
+		file_store_factory, path_manager.Path())
+}
+
+func getResultSetReader(
+	ctx context.Context,
+	config_obj *config_proto.Config,
+	scope vfilter.Scope,
+	arg *SourcePluginArgs) (result_sets.ResultSetReader, error) {
 
 	// Is it a notebook?
 	if arg.NotebookId != "" && arg.NotebookCellId != "" {
-		table := arg.NotebookCellTable
-		if table == 0 {
-			table = 1
-		}
-		path_manager := paths.NewNotebookPathManager(arg.NotebookId).
-			Cell(arg.NotebookCellId, arg.NotebookCellVersion).
-			QueryStorage(table)
-
-		return result_sets.NewResultSetReader(
-			file_store_factory, path_manager.Path())
+		return getNotebookResultSetReader(ctx, config_obj, scope, arg)
 	}
 
+	file_store_factory := file_store.GetFileStore(config_obj)
 	if arg.Artifact != "" {
 		if arg.Source != "" {
 			arg.Artifact = arg.Artifact + "/" + arg.Source
diff --git a/vql/server/hunts/hunts.go b/vql/server/hunts/hunts.go
index 1b933a3a32a..fa5ae1f9227 100644
--- a/vql/server/hunts/hunts.go
+++ b/vql/server/hunts/hunts.go
@@ -193,9 +193,8 @@ func (self HuntResultsPlugin) Call(
 					hunt_obj.Artifacts[0])
 			}
 
-			// If the source is not specified find the
-			// first named source from the artifact
-			// definition.
+			// If the source is not specified find the first named
+			// source from the artifact definition.
 			if arg.Source == "" {
 				repo, err := vql_utils.GetRepository(scope)
 				if err == nil {
@@ -255,16 +254,21 @@ func (self HuntResultsPlugin) Call(
 			flow_chan, _, err := hunt_dispatcher.GetFlows(
 				ctx, org_config_obj, options, scope, arg.HuntId, 0)
 			if err != nil {
-				scope.Log("hunt_results: %v", err)
+				// If there are no flows in this hunt - it is not an
+				// error it just means no results.
 				return
 			}
 
 			for flow_details := range flow_chan {
+
+				// Use the indexer for enriching with Fqdn
+				fqdn := ""
 				api_client, err := indexer.FastGetApiClient(ctx,
 					org_config_obj, flow_details.Context.ClientId)
-				if err != nil {
-					scope.Log("hunt_results: %v", err)
-					continue
+				if err == nil {
+					if api_client.OsInfo != nil {
+						fqdn = api_client.OsInfo.Fqdn
+					}
 				}
 
 				artifact_name := arg.Artifact
@@ -296,11 +300,9 @@ func (self HuntResultsPlugin) Call(
 				for row := range reader.Rows(ctx) {
 					row.Set("FlowId", flow_details.Context.SessionId).
 						Set("ClientId", flow_details.Context.ClientId).
-						Set("_OrgId", org_id)
+						Set("_OrgId", org_id).
+						Set("Fqdn", fqdn)
 
-					if api_client.OsInfo != nil {
-						row.Set("Fqdn", api_client.OsInfo.Fqdn)
-					}
 					select {
 					case <-ctx.Done():
 						return
diff --git a/vql/server/notebooks/notebooks_test.go b/vql/server/notebooks/notebooks_test.go
index 0bb226b7341..5c4305017cb 100644
--- a/vql/server/notebooks/notebooks_test.go
+++ b/vql/server/notebooks/notebooks_test.go
@@ -139,7 +139,7 @@ func (self *NotebookTestSuite) TestCreateNotebook() {
 			Set("notebook_id", notebook.NotebookId).
 			Set("input", "# Input field").
 			// Two types of links will be converted: img and a links.
-			Set("output", "Output Field With <img src=\"/notebooks/N.01/attach/NA.05-attachment.txt?org_id=root\">\n\n<a href=\"/notebooks/N.01/attach/NA.05-attachment.txt?org_id=root\">file</a> "))
+			Set("output", "Output Field With <img src=\"/notebooks/N.01/attach/NA.04-attachment.txt?org_id=root\">\n\n<a href=\"/notebooks/N.01/attach/NA.04-attachment.txt?org_id=root\">file</a> "))
 
 	notebook = res_any.(*api_proto.NotebookMetadata)
 	assert.Equal(self.T(), len(notebook.CellMetadata), 2)
@@ -170,13 +170,13 @@ func (self *NotebookTestSuite) TestCreateNotebook() {
 	mem_file_store.Debug()
 
 	upload, _ := mem_file_store.Get(
-		"/notebooks/N.01/NC.02-06/uploads/data/file.txt")
+		"/notebooks/N.01/NC.02-05/uploads/data/file.txt")
 	assert.Contains(self.T(), string(upload), `hello`)
 
 	// Attachments are global to the whole notebook and are not
 	// versioned.
 	attachment, _ := mem_file_store.Get(
-		"/notebooks/N.01/attach/NA.05-attachment.txt")
+		"/notebooks/N.01/attach/NA.04-attachment.txt")
 	assert.Equal(self.T(), string(attachment), "Hello world")
 
 	// Export the notebook to html.
@@ -227,7 +227,7 @@ func (self *NotebookTestSuite) TestCreateNotebook() {
 	assert.Contains(self.T(), data[0], "hello")
 
 	// Attachments are also exported.
-	data, _ = files.GetStrings("N.01/attach/NA.05-attachment.txt")
+	data, _ = files.GetStrings("N.01/attach/NA.04-attachment.txt")
 	assert.Contains(self.T(), data[0], "Hello world")
 
 	// Now export the notebook to html