diff --git a/go.mod b/go.mod
index 0d7f846e..2bf447f3 100644
--- a/go.mod
+++ b/go.mod
@@ -15,9 +15,8 @@ require (
 )
 
 require (
-	golang.org/x/net v0.25.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
 )
 
 replace (
diff --git a/go.sum b/go.sum
index ee306694..565c98d6 100644
--- a/go.sum
+++ b/go.sum
@@ -866,8 +866,9 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -1056,6 +1057,9 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1113,8 +1117,10 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1161,8 +1167,11 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 h1:TyKJRhyo17yWxOMCTHKWrc5rddHORMlnZ/j57umaUd8=
 golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -1173,8 +1182,10 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
 golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -1192,9 +1203,11 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1263,6 +1276,8 @@ golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1506,8 +1521,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 h1:DujSIu+2tC9Ht0aPNA7jgj23Iq8Ewi5sgkQ++wdvonE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d h1:k3zyW3BYYR30e8v3x0bTDdE9vpYFjZHK+HcyqkrppWk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
 google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
 google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
@@ -1530,8 +1545,8 @@ google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
diff --git a/rpc/cloudagent/compute/galleryimage/moc_cloudagent_galleryimage.proto b/rpc/cloudagent/compute/galleryimage/moc_cloudagent_galleryimage.proto
index 6368be54..293eac1e 100644
--- a/rpc/cloudagent/compute/galleryimage/moc_cloudagent_galleryimage.proto
+++ b/rpc/cloudagent/compute/galleryimage/moc_cloudagent_galleryimage.proto
@@ -65,6 +65,7 @@ message GalleryImage {
 	ImageSource sourceType = 13;
 	HyperVGeneration hyperVGeneration = 14;
 	CloudInitDataSource cloudInitDataSource = 15;
+	bool disableHighAvailability = 16;
 }
 
 service GalleryImageAgent {
diff --git a/rpc/cloudagent/compute/moc_cloudagent_galleryimage.pb.go b/rpc/cloudagent/compute/moc_cloudagent_galleryimage.pb.go
index b8dcaa65..66a49336 100644
--- a/rpc/cloudagent/compute/moc_cloudagent_galleryimage.pb.go
+++ b/rpc/cloudagent/compute/moc_cloudagent_galleryimage.pb.go
@@ -412,14 +412,15 @@ type GalleryImage struct {
 	Offer         string         `protobuf:"bytes,9,opt,name=offer,proto3" json:"offer,omitempty"`
 	ContainerName string         `protobuf:"bytes,10,opt,name=containerName,proto3" json:"containerName,omitempty"`
 	// Source of the GalleryImage from where we can copy the image from.
-	SourcePath           string                     `protobuf:"bytes,11,opt,name=sourcePath,proto3" json:"sourcePath,omitempty"`
-	Tags                 *common.Tags               `protobuf:"bytes,12,opt,name=tags,proto3" json:"tags,omitempty"`
-	SourceType           common.ImageSource         `protobuf:"varint,13,opt,name=sourceType,proto3,enum=moc.ImageSource" json:"sourceType,omitempty"`
-	HyperVGeneration     common.HyperVGeneration    `protobuf:"varint,14,opt,name=hyperVGeneration,proto3,enum=moc.HyperVGeneration" json:"hyperVGeneration,omitempty"`
-	CloudInitDataSource  common.CloudInitDataSource `protobuf:"varint,15,opt,name=cloudInitDataSource,proto3,enum=moc.CloudInitDataSource" json:"cloudInitDataSource,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     []byte                     `json:"-"`
-	XXX_sizecache        int32                      `json:"-"`
+	SourcePath              string                     `protobuf:"bytes,11,opt,name=sourcePath,proto3" json:"sourcePath,omitempty"`
+	Tags                    *common.Tags               `protobuf:"bytes,12,opt,name=tags,proto3" json:"tags,omitempty"`
+	SourceType              common.ImageSource         `protobuf:"varint,13,opt,name=sourceType,proto3,enum=moc.ImageSource" json:"sourceType,omitempty"`
+	HyperVGeneration        common.HyperVGeneration    `protobuf:"varint,14,opt,name=hyperVGeneration,proto3,enum=moc.HyperVGeneration" json:"hyperVGeneration,omitempty"`
+	CloudInitDataSource     common.CloudInitDataSource `protobuf:"varint,15,opt,name=cloudInitDataSource,proto3,enum=moc.CloudInitDataSource" json:"cloudInitDataSource,omitempty"`
+	DisableHighAvailability bool                       `protobuf:"varint,16,opt,name=disableHighAvailability,proto3" json:"disableHighAvailability,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                   `json:"-"`
+	XXX_unrecognized        []byte                     `json:"-"`
+	XXX_sizecache           int32                      `json:"-"`
 }
 
 func (m *GalleryImage) Reset()         { *m = GalleryImage{} }
@@ -552,6 +553,13 @@ func (m *GalleryImage) GetCloudInitDataSource() common.CloudInitDataSource {
 	return common.CloudInitDataSource_NoCloud
 }
 
+func (m *GalleryImage) GetDisableHighAvailability() bool {
+	if m != nil {
+		return m.DisableHighAvailability
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterEnum("moc.cloudagent.compute.GalleryImageOSType", GalleryImageOSType_name, GalleryImageOSType_value)
 	proto.RegisterType((*GalleryImageRequest)(nil), "moc.cloudagent.compute.GalleryImageRequest")
@@ -567,57 +575,59 @@ func init() {
 func init() { proto.RegisterFile("moc_cloudagent_galleryimage.proto", fileDescriptor_4b5fad170433da5e) }
 
 var fileDescriptor_4b5fad170433da5e = []byte{
-	// 796 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xc1, 0x92, 0xdb, 0x44,
-	0x10, 0x8d, 0xbc, 0x5e, 0x3b, 0x6e, 0xad, 0x8d, 0x99, 0x35, 0xa0, 0x32, 0x81, 0x32, 0x62, 0x8b,
-	0x72, 0x05, 0x4a, 0x0a, 0x86, 0x03, 0x1c, 0x77, 0xb3, 0x90, 0x38, 0xb8, 0xec, 0xd4, 0x38, 0xce,
-	0x52, 0x5c, 0x52, 0x63, 0x79, 0x2c, 0xab, 0x22, 0x69, 0xc4, 0xcc, 0x28, 0xd4, 0xee, 0x17, 0xf0,
-	0x07, 0xfc, 0x04, 0x57, 0xfe, 0x82, 0x2b, 0xff, 0x43, 0xa9, 0x25, 0xaf, 0x25, 0x7b, 0x0f, 0x7b,
-	0xc8, 0xc9, 0x9a, 0x37, 0xfd, 0x5e, 0x77, 0xbf, 0x6e, 0x0f, 0x7c, 0x11, 0x09, 0xef, 0x8d, 0x17,
-	0x8a, 0x74, 0xc5, 0x7c, 0x1e, 0xeb, 0x37, 0x3e, 0x0b, 0x43, 0x2e, 0xaf, 0x83, 0x88, 0xf9, 0xdc,
-	0x49, 0xa4, 0xd0, 0x82, 0x7c, 0x1c, 0x09, 0xcf, 0xd9, 0x85, 0x38, 0x9e, 0x88, 0x92, 0x54, 0xf3,
-	0xfe, 0xe7, 0xbe, 0x10, 0x7e, 0xc8, 0x5d, 0x8c, 0x5a, 0xa6, 0x6b, 0xf7, 0x0f, 0xc9, 0x92, 0x84,
-	0x4b, 0x95, 0xf3, 0xfa, 0x9f, 0xa0, 0xb4, 0x88, 0x22, 0x11, 0x17, 0x3f, 0xf9, 0x85, 0xfd, 0x97,
-	0x01, 0xa7, 0xcf, 0xf2, 0x3c, 0xe3, 0x2c, 0x0f, 0xe5, 0xbf, 0xa7, 0x5c, 0x69, 0xf2, 0x02, 0xda,
-	0x65, 0x58, 0x59, 0xc6, 0xe0, 0x68, 0x68, 0x8e, 0xce, 0x9c, 0xbb, 0x0b, 0x70, 0x2a, 0x1a, 0x55,
-	0x2a, 0xf9, 0x1e, 0xda, 0xb3, 0x84, 0x4b, 0xa6, 0x03, 0x11, 0xbf, 0xba, 0x4e, 0xb8, 0x55, 0x1b,
-	0x18, 0xc3, 0xce, 0xa8, 0x83, 0x5a, 0xb7, 0x37, 0xb4, 0x1a, 0x64, 0xff, 0x6d, 0x40, 0xaf, 0x5a,
-	0x99, 0x4a, 0x44, 0xac, 0xf8, 0x7b, 0x2d, 0x6d, 0x04, 0x0d, 0xca, 0x55, 0x1a, 0x6a, 0xac, 0xc9,
-	0x1c, 0xf5, 0x9d, 0xdc, 0x48, 0x67, 0x6b, 0xa4, 0x73, 0x21, 0x44, 0xf8, 0x9a, 0x85, 0x29, 0xa7,
-	0x45, 0x24, 0xe9, 0xc1, 0xf1, 0x4f, 0x52, 0x0a, 0x69, 0x1d, 0x0d, 0x8c, 0x61, 0x8b, 0xe6, 0x07,
-	0xfb, 0x5f, 0x03, 0xc8, 0xfc, 0xe7, 0x39, 0xea, 0xbe, 0x94, 0x22, 0xe1, 0x52, 0x07, 0x5c, 0x91,
-	0x01, 0x98, 0x1e, 0xd3, 0x2c, 0x14, 0xfe, 0x94, 0x45, 0xdc, 0x32, 0x90, 0x52, 0x86, 0x48, 0x1f,
-	0x1e, 0xb2, 0x74, 0x15, 0xf0, 0xd8, 0xcb, 0x8d, 0x69, 0xd1, 0xdb, 0x33, 0xb1, 0xa0, 0xf9, 0x8e,
-	0x4b, 0x15, 0x88, 0xb8, 0x48, 0xb6, 0x3d, 0x66, 0xba, 0x92, 0x87, 0x9c, 0x29, 0x8e, 0xba, 0xf5,
-	0x5c, 0xb7, 0x04, 0x91, 0xaf, 0xa0, 0xb3, 0xe2, 0x4a, 0x07, 0x31, 0x5a, 0x7a, 0x19, 0x48, 0xeb,
-	0x18, 0x83, 0xf6, 0xd0, 0xac, 0x9d, 0x84, 0x49, 0xad, 0xac, 0xc6, 0xc0, 0x18, 0xb6, 0x69, 0x7e,
-	0xb0, 0x9f, 0x40, 0x6f, 0x22, 0x3c, 0x16, 0xee, 0xf7, 0x63, 0x41, 0x3d, 0x61, 0x7a, 0x93, 0x37,
-	0x72, 0x51, 0xff, 0xf3, 0x1f, 0xcb, 0xa0, 0x88, 0xd8, 0x3f, 0x40, 0xef, 0x69, 0x28, 0x62, 0x7e,
-	0x97, 0x03, 0x19, 0x3e, 0x17, 0xa9, 0xf4, 0x76, 0x0e, 0xec, 0x20, 0xdb, 0x85, 0xd3, 0xe7, 0x5a,
-	0x27, 0x87, 0xa9, 0x9a, 0x1b, 0xad, 0x93, 0x05, 0x9d, 0x14, 0xa4, 0xed, 0xd1, 0x5e, 0xc0, 0xa7,
-	0xe7, 0x37, 0xa9, 0xe4, 0xe5, 0x59, 0x96, 0x88, 0x8f, 0xa0, 0xa1, 0x98, 0x5a, 0xd0, 0x71, 0xa5,
-	0xca, 0x02, 0x2b, 0x7b, 0x5a, 0xab, 0x78, 0x6a, 0xff, 0x57, 0x87, 0x93, 0xb2, 0x24, 0x21, 0x50,
-	0x8f, 0x77, 0x53, 0xc3, 0x6f, 0xd2, 0x81, 0x5a, 0xb0, 0x2a, 0x98, 0xb5, 0x60, 0x45, 0x26, 0x60,
-	0xe2, 0x1f, 0x74, 0x36, 0xc7, 0xd5, 0x3e, 0xc2, 0xd5, 0x7e, 0x7c, 0x9f, 0x5d, 0xcc, 0x19, 0xb4,
-	0x4c, 0xbf, 0xb5, 0xb7, 0xbe, 0x6f, 0x2f, 0xf9, 0x12, 0x1a, 0x4a, 0x33, 0x9d, 0x2a, 0x1c, 0xa3,
-	0x39, 0x32, 0x31, 0xc5, 0x1c, 0x21, 0x5a, 0x5c, 0x11, 0x1b, 0x4e, 0x42, 0xe1, 0xe1, 0x68, 0x71,
-	0x2d, 0x1a, 0x58, 0x66, 0x05, 0x23, 0x8f, 0xa0, 0x95, 0xa4, 0xcb, 0x30, 0x50, 0x1b, 0x2e, 0xad,
-	0x26, 0x06, 0xec, 0x00, 0xd2, 0x85, 0x23, 0xf5, 0x36, 0xb5, 0x1e, 0x22, 0x9e, 0x7d, 0x66, 0xfb,
-	0x21, 0xd6, 0x6b, 0x2e, 0xad, 0x56, 0xbe, 0xee, 0x78, 0x20, 0x67, 0xd0, 0xf6, 0x44, 0xac, 0x59,
-	0x10, 0x73, 0x89, 0xa9, 0x00, 0x6f, 0xab, 0x20, 0x39, 0x03, 0x50, 0x38, 0xe3, 0x97, 0x59, 0x53,
-	0x66, 0xa9, 0xa9, 0x12, 0x4e, 0x3e, 0x83, 0xba, 0x66, 0xbe, 0xb2, 0x4e, 0xb0, 0xb1, 0x16, 0x36,
-	0xf6, 0x8a, 0xf9, 0x8a, 0x22, 0x4c, 0x9e, 0x6c, 0x45, 0xd0, 0xe0, 0x36, 0x1a, 0xdc, 0xc5, 0x20,
-	0xb4, 0x31, 0x5f, 0x22, 0x5a, 0x8a, 0x21, 0xe7, 0xd0, 0xdd, 0x5c, 0x27, 0x5c, 0xbe, 0x7e, 0xc6,
-	0xe3, 0xe2, 0x49, 0xb1, 0x3a, 0xc8, 0xfb, 0x08, 0x79, 0xcf, 0xf7, 0x2e, 0xe9, 0x41, 0x38, 0x79,
-	0x01, 0xa7, 0x38, 0xbe, 0x71, 0x1c, 0xe8, 0x4b, 0xa6, 0x59, 0xb1, 0xbd, 0x1f, 0xa0, 0x8a, 0x85,
-	0x2a, 0x4f, 0x0f, 0xef, 0xe9, 0x5d, 0xa4, 0xc7, 0x3f, 0x02, 0x39, 0x9c, 0x3b, 0x31, 0xa1, 0xb9,
-	0x98, 0xfe, 0x32, 0x9d, 0x5d, 0x4d, 0xbb, 0x0f, 0x48, 0x0b, 0x8e, 0x27, 0xe3, 0xe9, 0xe2, 0xd7,
-	0xae, 0x91, 0xe1, 0x57, 0xe3, 0xe9, 0xe5, 0xec, 0x6a, 0xde, 0xad, 0x8d, 0x6e, 0xe0, 0xc3, 0x32,
-	0xf5, 0x3c, 0x5b, 0x26, 0xc2, 0xa1, 0x31, 0x8e, 0xdf, 0x89, 0xb7, 0x9c, 0x7c, 0x7d, 0xaf, 0x37,
-	0x2f, 0x7f, 0xd2, 0xfb, 0xdf, 0xdc, 0x2f, 0x38, 0x7f, 0x65, 0xed, 0x07, 0x17, 0xdf, 0xfe, 0xe6,
-	0xfa, 0x81, 0xde, 0xa4, 0xcb, 0x2c, 0xd0, 0x8d, 0x02, 0x4f, 0x0a, 0x25, 0xd6, 0xda, 0x8d, 0x84,
-	0xe7, 0xca, 0xc4, 0x73, 0x77, 0x4a, 0x6e, 0xa1, 0xb4, 0x6c, 0xe0, 0xb3, 0xf9, 0xdd, 0xff, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0x60, 0x7a, 0x88, 0x53, 0xca, 0x06, 0x00, 0x00,
+	// 826 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xc1, 0x72, 0xe3, 0x44,
+	0x10, 0x5d, 0x39, 0x8e, 0x13, 0xb7, 0x63, 0x63, 0x26, 0x81, 0x55, 0x99, 0x85, 0x32, 0x22, 0x45,
+	0xb9, 0x16, 0xca, 0x5a, 0x0c, 0x87, 0xe5, 0x98, 0x6c, 0x60, 0xe3, 0x25, 0xe5, 0x6c, 0x8d, 0xd7,
+	0x1b, 0x8a, 0xcb, 0xd6, 0x58, 0xee, 0xc8, 0x53, 0x2b, 0x69, 0xc4, 0xcc, 0x28, 0x54, 0xf2, 0x05,
+	0xdc, 0x38, 0xf2, 0x13, 0x5c, 0xf9, 0x0b, 0x3e, 0x8a, 0x52, 0x4b, 0x89, 0xe5, 0x24, 0x54, 0xe5,
+	0xc0, 0x29, 0x9a, 0xd7, 0xfd, 0xde, 0x74, 0xbf, 0xee, 0x8c, 0xe1, 0xf3, 0x58, 0x05, 0xef, 0x82,
+	0x48, 0x65, 0x0b, 0x11, 0x62, 0x62, 0xdf, 0x85, 0x22, 0x8a, 0x50, 0x5f, 0xca, 0x58, 0x84, 0x38,
+	0x4c, 0xb5, 0xb2, 0x8a, 0x7d, 0x1c, 0xab, 0x60, 0xb8, 0x4a, 0x19, 0x06, 0x2a, 0x4e, 0x33, 0x8b,
+	0xbd, 0xcf, 0x42, 0xa5, 0xc2, 0x08, 0x7d, 0xca, 0x9a, 0x67, 0xe7, 0xfe, 0x6f, 0x5a, 0xa4, 0x29,
+	0x6a, 0x53, 0xf0, 0x7a, 0x8f, 0x49, 0x5a, 0xc5, 0xb1, 0x4a, 0xca, 0x3f, 0x45, 0xc0, 0xfb, 0xd3,
+	0x81, 0xdd, 0x97, 0xc5, 0x3d, 0xe3, 0xfc, 0x1e, 0x8e, 0xbf, 0x66, 0x68, 0x2c, 0x7b, 0x05, 0xed,
+	0x2a, 0x6c, 0x5c, 0xa7, 0xbf, 0x31, 0x68, 0x8d, 0xf6, 0x87, 0xf7, 0x17, 0x30, 0x5c, 0xd3, 0x58,
+	0xa7, 0xb2, 0xef, 0xa0, 0x7d, 0x9a, 0xa2, 0x16, 0x56, 0xaa, 0xe4, 0xcd, 0x65, 0x8a, 0x6e, 0xad,
+	0xef, 0x0c, 0x3a, 0xa3, 0x0e, 0x69, 0xdd, 0x44, 0xf8, 0x7a, 0x92, 0xf7, 0x97, 0x03, 0x7b, 0xeb,
+	0x95, 0x99, 0x54, 0x25, 0x06, 0xff, 0xd7, 0xd2, 0x46, 0xd0, 0xe0, 0x68, 0xb2, 0xc8, 0x52, 0x4d,
+	0xad, 0x51, 0x6f, 0x58, 0x18, 0x39, 0xbc, 0x36, 0x72, 0x78, 0xa8, 0x54, 0xf4, 0x56, 0x44, 0x19,
+	0xf2, 0x32, 0x93, 0xed, 0xc1, 0xe6, 0x0f, 0x5a, 0x2b, 0xed, 0x6e, 0xf4, 0x9d, 0x41, 0x93, 0x17,
+	0x07, 0xef, 0x1f, 0x07, 0xd8, 0xf4, 0xc7, 0x29, 0xe9, 0xbe, 0xd6, 0x2a, 0x45, 0x6d, 0x25, 0x1a,
+	0xd6, 0x87, 0x56, 0x20, 0xac, 0x88, 0x54, 0x38, 0x11, 0x31, 0xba, 0x0e, 0x51, 0xaa, 0x10, 0xeb,
+	0xc1, 0xb6, 0xc8, 0x16, 0x12, 0x93, 0xa0, 0x30, 0xa6, 0xc9, 0x6f, 0xce, 0xcc, 0x85, 0xad, 0x0b,
+	0xd4, 0x46, 0xaa, 0xa4, 0xbc, 0xec, 0xfa, 0x98, 0xeb, 0x6a, 0x8c, 0x50, 0x18, 0x24, 0xdd, 0x7a,
+	0xa1, 0x5b, 0x81, 0xd8, 0x97, 0xd0, 0x59, 0xa0, 0xb1, 0x32, 0x21, 0x4b, 0x8f, 0xa4, 0x76, 0x37,
+	0x29, 0xe9, 0x16, 0x9a, 0xb7, 0x93, 0x0a, 0x6d, 0x8d, 0xdb, 0xe8, 0x3b, 0x83, 0x36, 0x2f, 0x0e,
+	0xde, 0x33, 0xd8, 0x3b, 0x51, 0x81, 0x88, 0x6e, 0xf7, 0xe3, 0x42, 0x3d, 0x15, 0x76, 0x59, 0x34,
+	0x72, 0x58, 0xff, 0xfd, 0x6f, 0xd7, 0xe1, 0x84, 0x78, 0xcf, 0x61, 0xef, 0x45, 0xa4, 0x12, 0xbc,
+	0xcf, 0x81, 0x1c, 0x9f, 0xaa, 0x4c, 0x07, 0x2b, 0x07, 0x56, 0x90, 0xe7, 0xc3, 0xee, 0xb1, 0xb5,
+	0xe9, 0xdd, 0xab, 0xb6, 0x96, 0xd6, 0xa6, 0x33, 0x7e, 0x52, 0x92, 0xae, 0x8f, 0xde, 0x0c, 0x3e,
+	0x39, 0xb8, 0xca, 0x34, 0x56, 0x67, 0x59, 0x21, 0x3e, 0x81, 0x86, 0x11, 0x66, 0xc6, 0xc7, 0x6b,
+	0x55, 0x96, 0x58, 0xd5, 0xd3, 0xda, 0x9a, 0xa7, 0xde, 0x1f, 0x9b, 0xb0, 0x53, 0x95, 0x64, 0x0c,
+	0xea, 0xc9, 0x6a, 0x6a, 0xf4, 0xcd, 0x3a, 0x50, 0x93, 0x8b, 0x92, 0x59, 0x93, 0x0b, 0x76, 0x02,
+	0x2d, 0xfa, 0x07, 0x3d, 0x9d, 0xd2, 0x6a, 0x6f, 0xd0, 0x6a, 0x3f, 0x7d, 0xc8, 0x2e, 0x16, 0x0c,
+	0x5e, 0xa5, 0xdf, 0xd8, 0x5b, 0xbf, 0x6d, 0x2f, 0xfb, 0x02, 0x1a, 0xc6, 0x0a, 0x9b, 0x19, 0x1a,
+	0x63, 0x6b, 0xd4, 0xa2, 0x2b, 0xa6, 0x04, 0xf1, 0x32, 0xc4, 0x3c, 0xd8, 0x89, 0x54, 0x40, 0xa3,
+	0xa5, 0xb5, 0x68, 0x50, 0x99, 0x6b, 0x18, 0x7b, 0x02, 0xcd, 0x34, 0x9b, 0x47, 0xd2, 0x2c, 0x51,
+	0xbb, 0x5b, 0x94, 0xb0, 0x02, 0x58, 0x17, 0x36, 0xcc, 0xfb, 0xcc, 0xdd, 0x26, 0x3c, 0xff, 0xcc,
+	0xf7, 0x43, 0x9d, 0x9f, 0xa3, 0x76, 0x9b, 0xc5, 0xba, 0xd3, 0x81, 0xed, 0x43, 0x3b, 0x50, 0x89,
+	0x15, 0x32, 0x41, 0x4d, 0x57, 0x01, 0x45, 0xd7, 0x41, 0xb6, 0x0f, 0x60, 0x68, 0xc6, 0xaf, 0xf3,
+	0xa6, 0x5a, 0x95, 0xa6, 0x2a, 0x38, 0xfb, 0x14, 0xea, 0x56, 0x84, 0xc6, 0xdd, 0xa1, 0xc6, 0x9a,
+	0xd4, 0xd8, 0x1b, 0x11, 0x1a, 0x4e, 0x30, 0x7b, 0x76, 0x2d, 0x42, 0x06, 0xb7, 0xc9, 0xe0, 0x2e,
+	0x25, 0x91, 0x8d, 0xc5, 0x12, 0xf1, 0x4a, 0x0e, 0x3b, 0x80, 0xee, 0xf2, 0x32, 0x45, 0xfd, 0xf6,
+	0x25, 0x26, 0xe5, 0x93, 0xe2, 0x76, 0x88, 0xf7, 0x11, 0xf1, 0x8e, 0x6f, 0x05, 0xf9, 0x9d, 0x74,
+	0xf6, 0x0a, 0x76, 0x69, 0x7c, 0xe3, 0x44, 0xda, 0x23, 0x61, 0x45, 0xb9, 0xbd, 0x1f, 0x90, 0x8a,
+	0x4b, 0x2a, 0x2f, 0xee, 0xc6, 0xf9, 0x7d, 0x24, 0xf6, 0x1c, 0x1e, 0x2f, 0xa4, 0x11, 0xf3, 0x08,
+	0x8f, 0x65, 0xb8, 0x3c, 0xb8, 0x10, 0x32, 0x12, 0x73, 0x19, 0x49, 0x7b, 0xe9, 0x76, 0xfb, 0xce,
+	0x60, 0x9b, 0xff, 0x57, 0xf8, 0xe9, 0xf7, 0xc0, 0xee, 0x6e, 0x0c, 0x6b, 0xc1, 0xd6, 0x6c, 0xf2,
+	0xd3, 0xe4, 0xf4, 0x6c, 0xd2, 0x7d, 0xc4, 0x9a, 0xb0, 0x79, 0x32, 0x9e, 0xcc, 0x7e, 0xee, 0x3a,
+	0x39, 0x7e, 0x36, 0x9e, 0x1c, 0x9d, 0x9e, 0x4d, 0xbb, 0xb5, 0xd1, 0x15, 0x7c, 0x58, 0xa5, 0x1e,
+	0xe4, 0x6b, 0xc8, 0x10, 0x1a, 0xe3, 0xe4, 0x42, 0xbd, 0x47, 0xf6, 0xd5, 0x83, 0x5e, 0xcb, 0xe2,
+	0xc7, 0xa0, 0xf7, 0xf5, 0xc3, 0x92, 0x8b, 0xf7, 0xd9, 0x7b, 0x74, 0xf8, 0xcd, 0x2f, 0x7e, 0x28,
+	0xed, 0x32, 0x9b, 0xe7, 0x89, 0x7e, 0x2c, 0x03, 0xad, 0x8c, 0x3a, 0xb7, 0x7e, 0xac, 0x02, 0x5f,
+	0xa7, 0x81, 0xbf, 0x52, 0xf2, 0x4b, 0xa5, 0x79, 0x83, 0x1e, 0xdc, 0x6f, 0xff, 0x0d, 0x00, 0x00,
+	0xff, 0xff, 0x03, 0xc4, 0x05, 0xd3, 0x04, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/rpc/cloudagent/storage/container/moc_cloudagent_container.proto b/rpc/cloudagent/storage/container/moc_cloudagent_container.proto
index 55b8d6d6..710b5a2a 100644
--- a/rpc/cloudagent/storage/container/moc_cloudagent_container.proto
+++ b/rpc/cloudagent/storage/container/moc_cloudagent_container.proto
@@ -37,6 +37,7 @@ message Container {
 	StorageContainerInfo info = 7;
 	Tags tags = 8;
 	bool isolated = 9;
+	bool disableHighAvailability = 10;
 }
 
 service ContainerAgent {
diff --git a/rpc/cloudagent/storage/moc_cloudagent_container.pb.go b/rpc/cloudagent/storage/moc_cloudagent_container.pb.go
index e64e4523..151f6b13 100644
--- a/rpc/cloudagent/storage/moc_cloudagent_container.pb.go
+++ b/rpc/cloudagent/storage/moc_cloudagent_container.pb.go
@@ -163,17 +163,18 @@ func (m *ContainerResponse) GetError() string {
 }
 
 type Container struct {
-	Name                 string                       `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Id                   string                       `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
-	Path                 string                       `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
-	Status               *common.Status               `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"`
-	LocationName         string                       `protobuf:"bytes,6,opt,name=locationName,proto3" json:"locationName,omitempty"`
-	Info                 *common.StorageContainerInfo `protobuf:"bytes,7,opt,name=info,proto3" json:"info,omitempty"`
-	Tags                 *common.Tags                 `protobuf:"bytes,8,opt,name=tags,proto3" json:"tags,omitempty"`
-	Isolated             bool                         `protobuf:"varint,9,opt,name=isolated,proto3" json:"isolated,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     []byte                       `json:"-"`
-	XXX_sizecache        int32                        `json:"-"`
+	Name                    string                       `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Id                      string                       `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	Path                    string                       `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
+	Status                  *common.Status               `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"`
+	LocationName            string                       `protobuf:"bytes,6,opt,name=locationName,proto3" json:"locationName,omitempty"`
+	Info                    *common.StorageContainerInfo `protobuf:"bytes,7,opt,name=info,proto3" json:"info,omitempty"`
+	Tags                    *common.Tags                 `protobuf:"bytes,8,opt,name=tags,proto3" json:"tags,omitempty"`
+	Isolated                bool                         `protobuf:"varint,9,opt,name=isolated,proto3" json:"isolated,omitempty"`
+	DisableHighAvailability bool                         `protobuf:"varint,10,opt,name=disableHighAvailability,proto3" json:"disableHighAvailability,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                     `json:"-"`
+	XXX_unrecognized        []byte                       `json:"-"`
+	XXX_sizecache           int32                        `json:"-"`
 }
 
 func (m *Container) Reset()         { *m = Container{} }
@@ -257,6 +258,13 @@ func (m *Container) GetIsolated() bool {
 	return false
 }
 
+func (m *Container) GetDisableHighAvailability() bool {
+	if m != nil {
+		return m.DisableHighAvailability
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterEnum("moc.cloudagent.storage.ContainerType", ContainerType_name, ContainerType_value)
 	proto.RegisterType((*ContainerRequest)(nil), "moc.cloudagent.storage.ContainerRequest")
@@ -267,39 +275,41 @@ func init() {
 func init() { proto.RegisterFile("moc_cloudagent_container.proto", fileDescriptor_736e2a9bece4cac4) }
 
 var fileDescriptor_736e2a9bece4cac4 = []byte{
-	// 508 bytes of a gzipped FileDescriptorProto
+	// 534 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0xad, 0x13, 0x37, 0x6d, 0x26, 0x34, 0x32, 0x2b, 0x04, 0x4b, 0x04, 0x55, 0x08, 0x97, 0x80,
-	0x84, 0x2d, 0x02, 0x1f, 0x40, 0x52, 0x38, 0x54, 0x88, 0x54, 0xda, 0x94, 0x22, 0x71, 0x89, 0x36,
-	0xce, 0xc6, 0xb5, 0xb0, 0x3d, 0xee, 0xee, 0x1a, 0xc4, 0x1f, 0x20, 0xf1, 0x13, 0xfc, 0x04, 0x7f,
-	0xc7, 0x01, 0x79, 0xec, 0x3a, 0xa9, 0x84, 0x04, 0x07, 0x4e, 0xde, 0x7d, 0xef, 0xcd, 0xdb, 0xe7,
-	0x99, 0x81, 0xe3, 0x14, 0xc3, 0x65, 0x98, 0x60, 0xb1, 0x96, 0x91, 0xca, 0xec, 0x32, 0xc4, 0xcc,
-	0xca, 0x38, 0x53, 0xda, 0xcf, 0x35, 0x5a, 0x64, 0x77, 0x53, 0x0c, 0xfd, 0x2d, 0xef, 0x1b, 0x8b,
-	0x5a, 0x46, 0x6a, 0x70, 0x1c, 0x21, 0x46, 0x89, 0x0a, 0x48, 0xb5, 0x2a, 0x36, 0xc1, 0x17, 0x2d,
-	0xf3, 0x5c, 0x69, 0x53, 0xd5, 0x0d, 0xee, 0x91, 0x2f, 0xa6, 0x29, 0x66, 0xf5, 0xa7, 0x26, 0x1e,
-	0xec, 0x10, 0xb5, 0x59, 0x9c, 0x6d, 0xb0, 0x62, 0x47, 0xdf, 0x1d, 0xf0, 0x4e, 0xae, 0x23, 0x08,
-	0x75, 0x55, 0x28, 0x63, 0xd9, 0x14, 0xa0, 0xc1, 0x0c, 0x77, 0x86, 0xed, 0x71, 0x6f, 0xf2, 0xc8,
-	0xff, 0x73, 0x30, 0x7f, 0x5b, 0xbd, 0x53, 0xc4, 0x5e, 0xc2, 0xd1, 0x59, 0xae, 0xb4, 0xb4, 0x31,
-	0x66, 0xe7, 0x5f, 0x73, 0xc5, 0x5b, 0x43, 0x67, 0xdc, 0x9f, 0xf4, 0xc9, 0xa5, 0x61, 0xc4, 0x4d,
-	0xd1, 0xe8, 0x87, 0x03, 0xb7, 0x77, 0xd2, 0x98, 0x1c, 0x33, 0xa3, 0xfe, 0x47, 0x9c, 0x09, 0x74,
-	0x84, 0x32, 0x45, 0x62, 0x29, 0x47, 0x6f, 0x32, 0xf0, 0xab, 0x76, 0xfa, 0xd7, 0xed, 0xf4, 0x67,
-	0x88, 0xc9, 0x85, 0x4c, 0x0a, 0x25, 0x6a, 0x25, 0xbb, 0x03, 0xfb, 0x6f, 0xb4, 0x46, 0xcd, 0xdb,
-	0x43, 0x67, 0xdc, 0x15, 0xd5, 0x65, 0xf4, 0xcb, 0x81, 0x6e, 0x63, 0xcc, 0x18, 0xb8, 0x99, 0x4c,
-	0x15, 0x77, 0x48, 0x42, 0x67, 0xd6, 0x87, 0x56, 0xbc, 0xa6, 0x77, 0xba, 0xa2, 0x15, 0xaf, 0x19,
-	0x07, 0x37, 0x97, 0xf6, 0x92, 0xbb, 0x25, 0x32, 0x73, 0xbf, 0xfd, 0xe4, 0x8e, 0x20, 0x84, 0x3d,
-	0x86, 0x8e, 0xb1, 0xd2, 0x16, 0x86, 0xef, 0x53, 0xaa, 0x1e, 0xfd, 0xd4, 0x82, 0x20, 0x51, 0x53,
-	0x6c, 0x04, 0xb7, 0x12, 0x0c, 0xa9, 0x47, 0xf3, 0xf2, 0xa9, 0x0e, 0x19, 0xdf, 0xc0, 0xd8, 0x33,
-	0x70, 0xcb, 0x99, 0xf2, 0x03, 0xb2, 0xb9, 0x5f, 0xdb, 0x50, 0x43, 0x9a, 0xac, 0xa7, 0xd9, 0x06,
-	0x05, 0xc9, 0xd8, 0x43, 0x70, 0xad, 0x8c, 0x0c, 0x3f, 0x24, 0x79, 0x97, 0xe4, 0xe7, 0x32, 0x32,
-	0x82, 0x60, 0x36, 0x80, 0xc3, 0xd8, 0x60, 0x22, 0xad, 0x5a, 0xf3, 0xee, 0xd0, 0x19, 0x1f, 0x8a,
-	0xe6, 0xfe, 0xf4, 0x15, 0x1c, 0x35, 0x8e, 0xe5, 0xc8, 0x58, 0x0f, 0x0e, 0xde, 0xcf, 0xdf, 0xce,
-	0xcf, 0x3e, 0xcc, 0xbd, 0x3d, 0x76, 0x00, 0xed, 0xc5, 0x74, 0xee, 0x39, 0xe5, 0xe1, 0x64, 0x71,
-	0xe1, 0xb5, 0x08, 0x79, 0x37, 0xf3, 0xda, 0xe5, 0xe1, 0xf5, 0x74, 0xe1, 0xb9, 0x93, 0x2b, 0xe8,
-	0x37, 0x0e, 0xd3, 0x72, 0x74, 0x6c, 0x09, 0x9d, 0xd3, 0xec, 0x33, 0x7e, 0x52, 0x6c, 0xfc, 0xf7,
-	0xa9, 0x56, 0x2b, 0x3a, 0x78, 0xf2, 0x0f, 0xca, 0x6a, 0x7d, 0x46, 0x7b, 0xb3, 0xe7, 0x1f, 0x83,
-	0x28, 0xb6, 0x97, 0xc5, 0xca, 0x0f, 0x31, 0x0d, 0xd2, 0x38, 0xd4, 0x68, 0x70, 0x63, 0x83, 0x14,
-	0xc3, 0x40, 0xe7, 0x61, 0xb0, 0xb5, 0x09, 0x6a, 0x9b, 0x55, 0x87, 0x16, 0xe3, 0xc5, 0xef, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xda, 0x7b, 0xa6, 0x3e, 0xaf, 0x03, 0x00, 0x00,
+	0x10, 0xad, 0x13, 0x37, 0x6d, 0x26, 0x34, 0x32, 0x2b, 0x44, 0x97, 0x08, 0xaa, 0x10, 0x2e, 0x01,
+	0x09, 0x5b, 0x04, 0x0e, 0x1c, 0x49, 0x0a, 0x12, 0x15, 0x22, 0x95, 0x9c, 0x52, 0x24, 0x2e, 0xd1,
+	0xc6, 0xd9, 0x38, 0x2b, 0x6c, 0x8f, 0xeb, 0x5d, 0x17, 0xf5, 0x0f, 0x90, 0xf8, 0x09, 0x7e, 0x02,
+	0xbe, 0x0f, 0x79, 0xec, 0x3a, 0xa9, 0x04, 0x82, 0x03, 0x27, 0xef, 0xbe, 0xf7, 0xe6, 0xed, 0xf3,
+	0xcc, 0xc0, 0x51, 0x8c, 0xc1, 0x3c, 0x88, 0x30, 0x5f, 0x8a, 0x50, 0x26, 0x66, 0x1e, 0x60, 0x62,
+	0x84, 0x4a, 0x64, 0xe6, 0xa6, 0x19, 0x1a, 0x64, 0x77, 0x63, 0x0c, 0xdc, 0x0d, 0xef, 0x6a, 0x83,
+	0x99, 0x08, 0x65, 0xef, 0x28, 0x44, 0x0c, 0x23, 0xe9, 0x91, 0x6a, 0x91, 0xaf, 0xbc, 0x2f, 0x99,
+	0x48, 0x53, 0x99, 0xe9, 0xb2, 0xae, 0x77, 0x48, 0xbe, 0x18, 0xc7, 0x98, 0x54, 0x9f, 0x8a, 0xb8,
+	0xbf, 0x45, 0x54, 0x66, 0x2a, 0x59, 0x61, 0xc9, 0x0e, 0xbe, 0x59, 0xe0, 0x1c, 0x5f, 0x47, 0xf0,
+	0xe5, 0x45, 0x2e, 0xb5, 0x61, 0x63, 0x80, 0x1a, 0xd3, 0xdc, 0xea, 0x37, 0x87, 0x9d, 0xd1, 0x43,
+	0xf7, 0xf7, 0xc1, 0xdc, 0x4d, 0xf5, 0x56, 0x11, 0x7b, 0x01, 0x07, 0xa7, 0xa9, 0xcc, 0x84, 0x51,
+	0x98, 0x9c, 0x5d, 0xa5, 0x92, 0x37, 0xfa, 0xd6, 0xb0, 0x3b, 0xea, 0x92, 0x4b, 0xcd, 0xf8, 0x37,
+	0x45, 0x83, 0xef, 0x16, 0xdc, 0xde, 0x4a, 0xa3, 0x53, 0x4c, 0xb4, 0xfc, 0x1f, 0x71, 0x46, 0xd0,
+	0xf2, 0xa5, 0xce, 0x23, 0x43, 0x39, 0x3a, 0xa3, 0x9e, 0x5b, 0xb6, 0xd3, 0xbd, 0x6e, 0xa7, 0x3b,
+	0x41, 0x8c, 0xce, 0x45, 0x94, 0x4b, 0xbf, 0x52, 0xb2, 0x3b, 0xb0, 0xfb, 0x26, 0xcb, 0x30, 0xe3,
+	0xcd, 0xbe, 0x35, 0x6c, 0xfb, 0xe5, 0x65, 0xf0, 0xb3, 0x01, 0xed, 0xda, 0x98, 0x31, 0xb0, 0x13,
+	0x11, 0x4b, 0x6e, 0x91, 0x84, 0xce, 0xac, 0x0b, 0x0d, 0xb5, 0xa4, 0x77, 0xda, 0x7e, 0x43, 0x2d,
+	0x19, 0x07, 0x3b, 0x15, 0x66, 0xcd, 0xed, 0x02, 0x99, 0xd8, 0x5f, 0x7f, 0x70, 0xcb, 0x27, 0x84,
+	0x3d, 0x82, 0x96, 0x36, 0xc2, 0xe4, 0x9a, 0xef, 0x52, 0xaa, 0x0e, 0xfd, 0xd4, 0x8c, 0x20, 0xbf,
+	0xa2, 0xd8, 0x00, 0x6e, 0x45, 0x18, 0x50, 0x8f, 0xa6, 0xc5, 0x53, 0x2d, 0x32, 0xbe, 0x81, 0xb1,
+	0xa7, 0x60, 0x17, 0x33, 0xe5, 0x7b, 0x64, 0x73, 0xaf, 0xb2, 0xa1, 0x86, 0xd4, 0x59, 0x4f, 0x92,
+	0x15, 0xfa, 0x24, 0x63, 0x0f, 0xc0, 0x36, 0x22, 0xd4, 0x7c, 0x9f, 0xe4, 0x6d, 0x92, 0x9f, 0x89,
+	0x50, 0xfb, 0x04, 0xb3, 0x1e, 0xec, 0x2b, 0x8d, 0x91, 0x30, 0x72, 0xc9, 0xdb, 0x7d, 0x6b, 0xb8,
+	0xef, 0xd7, 0x77, 0xf6, 0x12, 0x0e, 0x97, 0x4a, 0x8b, 0x45, 0x24, 0xdf, 0xaa, 0x70, 0x3d, 0xbe,
+	0x14, 0x2a, 0x12, 0x0b, 0x15, 0x29, 0x73, 0xc5, 0x81, 0xa4, 0x7f, 0xa2, 0x9f, 0xbc, 0x82, 0x83,
+	0x3a, 0x4b, 0x31, 0x6c, 0xd6, 0x81, 0xbd, 0x0f, 0xd3, 0x77, 0xd3, 0xd3, 0x8f, 0x53, 0x67, 0x87,
+	0xed, 0x41, 0x73, 0x36, 0x9e, 0x3a, 0x56, 0x71, 0x38, 0x9e, 0x9d, 0x3b, 0x0d, 0x42, 0xde, 0x4f,
+	0x9c, 0x66, 0x71, 0x78, 0x3d, 0x9e, 0x39, 0xf6, 0xe8, 0x02, 0xba, 0xb5, 0xc3, 0xb8, 0x18, 0x3a,
+	0x9b, 0x43, 0xeb, 0x24, 0xb9, 0xc4, 0xcf, 0x92, 0x0d, 0xff, 0xbe, 0x0f, 0xe5, 0x72, 0xf7, 0x1e,
+	0xff, 0x83, 0xb2, 0x5c, 0xbc, 0xc1, 0xce, 0xe4, 0xd9, 0x27, 0x2f, 0x54, 0x66, 0x9d, 0x2f, 0xdc,
+	0x00, 0x63, 0x2f, 0x56, 0x41, 0x86, 0x1a, 0x57, 0xc6, 0x8b, 0x31, 0xf0, 0xb2, 0x34, 0xf0, 0x36,
+	0x36, 0x5e, 0x65, 0xb3, 0x68, 0xd1, 0x4a, 0x3d, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x7d,
+	0xe8, 0xc6, 0xe9, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/rpc/cloudagent/storage/moc_cloudagent_virtualharddisk.pb.go b/rpc/cloudagent/storage/moc_cloudagent_virtualharddisk.pb.go
index 2eb1ea8f..3fe0c989 100644
--- a/rpc/cloudagent/storage/moc_cloudagent_virtualharddisk.pb.go
+++ b/rpc/cloudagent/storage/moc_cloudagent_virtualharddisk.pb.go
@@ -152,6 +152,7 @@ type VirtualHardDisk struct {
 	DiskFileFormat             common.DiskFileFormat      `protobuf:"varint,21,opt,name=diskFileFormat,proto3,enum=moc.DiskFileFormat" json:"diskFileFormat,omitempty"`
 	CloudInitDataSource        common.CloudInitDataSource `protobuf:"varint,22,opt,name=cloudInitDataSource,proto3,enum=moc.CloudInitDataSource" json:"cloudInitDataSource,omitempty"`
 	Tags                       *common.Tags               `protobuf:"bytes,23,opt,name=tags,proto3" json:"tags,omitempty"`
+	DisableHighAvailability    bool                       `protobuf:"varint,24,opt,name=disableHighAvailability,proto3" json:"disableHighAvailability,omitempty"`
 	XXX_NoUnkeyedLiteral       struct{}                   `json:"-"`
 	XXX_unrecognized           []byte                     `json:"-"`
 	XXX_sizecache              int32                      `json:"-"`
@@ -343,6 +344,13 @@ func (m *VirtualHardDisk) GetTags() *common.Tags {
 	return nil
 }
 
+func (m *VirtualHardDisk) GetDisableHighAvailability() bool {
+	if m != nil {
+		return m.DisableHighAvailability
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterType((*VirtualHardDiskRequest)(nil), "moc.cloudagent.storage.VirtualHardDiskRequest")
 	proto.RegisterType((*VirtualHardDiskResponse)(nil), "moc.cloudagent.storage.VirtualHardDiskResponse")
@@ -354,52 +362,54 @@ func init() {
 }
 
 var fileDescriptor_e3ff93a45373b349 = []byte{
-	// 719 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xdb, 0x38,
-	0x10, 0xc6, 0x57, 0x89, 0xe3, 0xc4, 0xe3, 0xc4, 0xf1, 0xd2, 0xf9, 0x43, 0x18, 0xbb, 0x81, 0xe1,
-	0x0d, 0x76, 0x8d, 0x3d, 0x48, 0xbb, 0x6e, 0x6f, 0x05, 0x0a, 0x24, 0x4d, 0xd3, 0xa4, 0x87, 0x14,
-	0x50, 0x02, 0x1f, 0x7a, 0x09, 0x68, 0x8a, 0x91, 0x09, 0x4b, 0xa2, 0x4a, 0x52, 0x29, 0xdc, 0x6b,
-	0x2f, 0x7d, 0x8f, 0x3e, 0x42, 0x51, 0xa0, 0x8f, 0x57, 0x68, 0x64, 0xc7, 0xb5, 0x6c, 0x14, 0xb9,
-	0xf4, 0x64, 0xeb, 0xfb, 0x7e, 0xf3, 0x69, 0x34, 0xd2, 0x10, 0x8e, 0x63, 0xc5, 0x6f, 0x79, 0xa4,
-	0xb2, 0x80, 0x85, 0x22, 0xb1, 0xb7, 0xf7, 0x52, 0xdb, 0x8c, 0x45, 0x23, 0xa6, 0x83, 0x40, 0x9a,
-	0xb1, 0x9b, 0x6a, 0x65, 0x15, 0x39, 0x88, 0x15, 0x77, 0xe7, 0x94, 0x6b, 0xac, 0xd2, 0x2c, 0x14,
-	0xed, 0xa3, 0x50, 0xa9, 0x30, 0x12, 0x1e, 0x52, 0xc3, 0xec, 0xce, 0x7b, 0xaf, 0x59, 0x9a, 0x0a,
-	0x6d, 0x8a, 0xba, 0xf6, 0x21, 0xa6, 0xab, 0x38, 0x56, 0xc9, 0xf4, 0xa7, 0x30, 0xba, 0x9f, 0x1d,
-	0x38, 0x18, 0x14, 0xb7, 0xba, 0x60, 0x3a, 0x38, 0x93, 0x66, 0xec, 0x8b, 0x77, 0x99, 0x30, 0x96,
-	0x5c, 0x43, 0xb3, 0xe4, 0x18, 0xea, 0x74, 0xd6, 0x7b, 0xf5, 0xfe, 0x3f, 0xee, 0xea, 0x36, 0xdc,
-	0x72, 0xd2, 0x52, 0x00, 0x79, 0x0a, 0x3b, 0x6f, 0x52, 0xa1, 0x99, 0x95, 0x2a, 0xb9, 0x99, 0xa4,
-	0x82, 0xae, 0x75, 0x9c, 0x5e, 0xa3, 0xdf, 0xc0, 0xc4, 0x07, 0xc7, 0x5f, 0x84, 0xba, 0xdf, 0x1c,
-	0x38, 0x5c, 0xea, 0xd2, 0xa4, 0x2a, 0x31, 0xe2, 0xd7, 0xb4, 0xd9, 0x87, 0xaa, 0x2f, 0x4c, 0x16,
-	0x59, 0xec, 0xaf, 0xde, 0x6f, 0xbb, 0xc5, 0x80, 0xdd, 0xd9, 0x80, 0xdd, 0x53, 0xa5, 0xa2, 0x01,
-	0x8b, 0x32, 0xe1, 0x4f, 0x49, 0xb2, 0x07, 0x1b, 0x2f, 0xb5, 0x56, 0x9a, 0xae, 0x77, 0x9c, 0x5e,
-	0xcd, 0x2f, 0x2e, 0xba, 0x5f, 0x36, 0x61, 0xb7, 0x14, 0x4f, 0x08, 0x54, 0x12, 0x16, 0x0b, 0xea,
-	0x20, 0x88, 0xff, 0x49, 0x03, 0xd6, 0x64, 0x80, 0x77, 0xab, 0xf9, 0x6b, 0x32, 0x20, 0xc7, 0xb0,
-	0xc3, 0x55, 0x62, 0x99, 0x4c, 0x84, 0xbe, 0xca, 0xe1, 0x22, 0x75, 0x51, 0x24, 0x14, 0x2a, 0x29,
-	0xb3, 0x23, 0x5a, 0xc9, 0xcd, 0xd3, 0xca, 0xa7, 0xaf, 0xd4, 0xf1, 0x51, 0x21, 0x7f, 0x41, 0xd5,
-	0x58, 0x66, 0x33, 0x43, 0x37, 0xf0, 0x09, 0xea, 0x38, 0x8c, 0x6b, 0x94, 0xfc, 0xa9, 0x95, 0x37,
-	0x62, 0xe4, 0x07, 0x41, 0xab, 0x1d, 0xa7, 0xb7, 0xee, 0xe3, 0x7f, 0x42, 0x61, 0x33, 0x98, 0x24,
-	0x2c, 0x96, 0x9c, 0x6e, 0x76, 0x9c, 0xde, 0x96, 0x3f, 0xbb, 0x24, 0x7f, 0x43, 0x63, 0x18, 0x29,
-	0x3e, 0xce, 0xb1, 0xe1, 0xc4, 0x0a, 0x43, 0xb7, 0x3a, 0x4e, 0x6f, 0xc3, 0x2f, 0xa9, 0xc4, 0x05,
-	0x12, 0xa9, 0x50, 0x72, 0x16, 0x19, 0xc1, 0xad, 0xd2, 0x05, 0x5b, 0x43, 0x76, 0x85, 0x43, 0xfe,
-	0x83, 0x56, 0x3a, 0x9a, 0x98, 0x72, 0x01, 0x60, 0xc1, 0x2a, 0x8b, 0xfc, 0x0b, 0xcd, 0x7c, 0x0e,
-	0x5a, 0x45, 0x91, 0xd0, 0x49, 0x16, 0x0f, 0x85, 0xa6, 0x75, 0x7c, 0x86, 0x25, 0x3d, 0xef, 0x66,
-	0xae, 0x45, 0x8a, 0xe3, 0x57, 0x45, 0xb7, 0x91, 0x5e, 0xe1, 0x90, 0x23, 0x80, 0x7c, 0xe1, 0xa6,
-	0xa9, 0x3b, 0xc8, 0xfd, 0xa0, 0xe4, 0x79, 0xd3, 0xdd, 0x8c, 0x19, 0x1f, 0xc9, 0x44, 0xe0, 0xdb,
-	0x69, 0xe0, 0xdb, 0x59, 0xe1, 0x90, 0x36, 0x6c, 0x19, 0x6e, 0x24, 0xbe, 0xa6, 0x5d, 0xa4, 0x1e,
-	0xae, 0xc9, 0x73, 0x68, 0x33, 0x6b, 0x19, 0x1f, 0x89, 0x60, 0xb0, 0x9c, 0xd9, 0x44, 0xfa, 0x27,
-	0x44, 0x3e, 0x87, 0x99, 0x7b, 0xa5, 0x82, 0xa2, 0xea, 0x77, 0xac, 0x5a, 0xd2, 0xc9, 0x1f, 0x50,
-	0x0b, 0xb5, 0xca, 0x52, 0x84, 0x08, 0x42, 0x73, 0x81, 0x74, 0x61, 0x7b, 0x36, 0x01, 0x04, 0x5a,
-	0x08, 0x2c, 0x68, 0xe4, 0x04, 0x9a, 0xa3, 0x49, 0x2a, 0xf4, 0xe0, 0x95, 0x48, 0xa6, 0xdb, 0x49,
-	0xf7, 0x70, 0x7d, 0xf7, 0xf1, 0xe3, 0xba, 0x28, 0x99, 0xfe, 0x12, 0x4e, 0x9e, 0x41, 0x23, 0x1f,
-	0xe5, 0xb9, 0x8c, 0xc4, 0xb9, 0xd2, 0x31, 0xb3, 0x74, 0x1f, 0x03, 0x5a, 0x18, 0x70, 0xb6, 0x60,
-	0xf9, 0x25, 0x94, 0xbc, 0x86, 0x16, 0x2e, 0xf3, 0x65, 0x22, 0xed, 0x19, 0xb3, 0xec, 0x5a, 0x65,
-	0x9a, 0x0b, 0x7a, 0x80, 0x09, 0x14, 0x13, 0x5e, 0x2c, 0xfb, 0xfe, 0xaa, 0x22, 0xf2, 0x27, 0x54,
-	0x2c, 0x0b, 0x0d, 0x3d, 0xc4, 0xe5, 0xa8, 0x61, 0xf1, 0x0d, 0x0b, 0x8d, 0x8f, 0x72, 0xff, 0xa3,
-	0x03, 0x7b, 0xa5, 0xad, 0x3d, 0xc9, 0x8f, 0x10, 0x32, 0x86, 0xea, 0x65, 0x72, 0xaf, 0xc6, 0x82,
-	0xb8, 0x8f, 0x3d, 0x5d, 0x8a, 0xe3, 0xb4, 0xed, 0x3d, 0x9a, 0x2f, 0x0e, 0xb6, 0xee, 0x6f, 0xa7,
-	0xff, 0xbf, 0xf5, 0x42, 0x69, 0x47, 0xd9, 0xd0, 0xe5, 0x2a, 0xf6, 0x62, 0xc9, 0xb5, 0x32, 0xea,
-	0xce, 0x7a, 0xb1, 0xe2, 0x9e, 0x4e, 0xb9, 0x37, 0x0f, 0xf3, 0xa6, 0x61, 0xc3, 0x2a, 0x1e, 0x50,
-	0x4f, 0xbe, 0x07, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x0c, 0xd5, 0x92, 0x4f, 0x06, 0x00, 0x00,
+	// 746 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x41, 0x6f, 0xe3, 0x44,
+	0x14, 0xc7, 0x71, 0x9b, 0xa6, 0xcd, 0xcb, 0x36, 0x1b, 0x26, 0xdd, 0x66, 0x14, 0xc1, 0x2a, 0x0a,
+	0x2b, 0x88, 0x38, 0xd8, 0x10, 0x38, 0x20, 0x21, 0x21, 0xb5, 0x94, 0xa5, 0xcb, 0x61, 0x91, 0xdc,
+	0x2a, 0x07, 0x2e, 0xd5, 0x78, 0x3c, 0xb5, 0x47, 0x19, 0x7b, 0xcc, 0xcc, 0xb8, 0x28, 0x5c, 0xb9,
+	0xf0, 0x3d, 0xf8, 0x0c, 0x48, 0x7c, 0x29, 0xbe, 0x03, 0xf2, 0x73, 0xd2, 0x10, 0x27, 0xa0, 0x5e,
+	0xf6, 0x94, 0xf8, 0xff, 0xff, 0xbd, 0xbf, 0x9f, 0x9f, 0xfd, 0x06, 0x5e, 0x65, 0x9a, 0xdf, 0x71,
+	0xa5, 0xcb, 0x98, 0x25, 0x22, 0x77, 0x77, 0x0f, 0xd2, 0xb8, 0x92, 0xa9, 0x94, 0x99, 0x38, 0x96,
+	0x76, 0xe1, 0x17, 0x46, 0x3b, 0x4d, 0xce, 0x33, 0xcd, 0xfd, 0x0d, 0xe5, 0x5b, 0xa7, 0x0d, 0x4b,
+	0xc4, 0xe8, 0x65, 0xa2, 0x75, 0xa2, 0x44, 0x80, 0x54, 0x54, 0xde, 0x07, 0xbf, 0x18, 0x56, 0x14,
+	0xc2, 0xd8, 0xba, 0x6e, 0x34, 0xc4, 0x74, 0x9d, 0x65, 0x3a, 0x5f, 0xfd, 0xd4, 0xc6, 0xe4, 0x0f,
+	0x0f, 0xce, 0xe7, 0xf5, 0xad, 0xae, 0x99, 0x89, 0xaf, 0xa4, 0x5d, 0x84, 0xe2, 0xe7, 0x52, 0x58,
+	0x47, 0x6e, 0xa0, 0xdf, 0x70, 0x2c, 0xf5, 0xc6, 0x87, 0xd3, 0xee, 0xec, 0x13, 0x7f, 0x7f, 0x1b,
+	0x7e, 0x33, 0x69, 0x27, 0x80, 0x7c, 0x09, 0xa7, 0x3f, 0x16, 0xc2, 0x30, 0x27, 0x75, 0x7e, 0xbb,
+	0x2c, 0x04, 0x3d, 0x18, 0x7b, 0xd3, 0xde, 0xac, 0x87, 0x89, 0x8f, 0x4e, 0xb8, 0x0d, 0x4d, 0xfe,
+	0xf2, 0x60, 0xb8, 0xd3, 0xa5, 0x2d, 0x74, 0x6e, 0xc5, 0xbb, 0x69, 0x73, 0x06, 0xed, 0x50, 0xd8,
+	0x52, 0x39, 0xec, 0xaf, 0x3b, 0x1b, 0xf9, 0xf5, 0x80, 0xfd, 0xf5, 0x80, 0xfd, 0x4b, 0xad, 0xd5,
+	0x9c, 0xa9, 0x52, 0x84, 0x2b, 0x92, 0x9c, 0xc1, 0xd1, 0x77, 0xc6, 0x68, 0x43, 0x0f, 0xc7, 0xde,
+	0xb4, 0x13, 0xd6, 0x17, 0x93, 0xbf, 0x8f, 0xe1, 0x79, 0x23, 0x9e, 0x10, 0x68, 0xe5, 0x2c, 0x13,
+	0xd4, 0x43, 0x10, 0xff, 0x93, 0x1e, 0x1c, 0xc8, 0x18, 0xef, 0xd6, 0x09, 0x0f, 0x64, 0x4c, 0x5e,
+	0xc1, 0x29, 0xd7, 0xb9, 0x63, 0x32, 0x17, 0xe6, 0x6d, 0x05, 0xd7, 0xa9, 0xdb, 0x22, 0xa1, 0xd0,
+	0x2a, 0x98, 0x4b, 0x69, 0xab, 0x32, 0x2f, 0x5b, 0xbf, 0xff, 0x49, 0xbd, 0x10, 0x15, 0xf2, 0x11,
+	0xb4, 0xad, 0x63, 0xae, 0xb4, 0xf4, 0x08, 0x9f, 0xa0, 0x8b, 0xc3, 0xb8, 0x41, 0x29, 0x5c, 0x59,
+	0x55, 0x23, 0x56, 0xfe, 0x2a, 0x68, 0x7b, 0xec, 0x4d, 0x0f, 0x43, 0xfc, 0x4f, 0x28, 0x1c, 0xc7,
+	0xcb, 0x9c, 0x65, 0x92, 0xd3, 0xe3, 0xb1, 0x37, 0x3d, 0x09, 0xd7, 0x97, 0xe4, 0x63, 0xe8, 0x45,
+	0x4a, 0xf3, 0x45, 0x85, 0x45, 0x4b, 0x27, 0x2c, 0x3d, 0x19, 0x7b, 0xd3, 0xa3, 0xb0, 0xa1, 0x12,
+	0x1f, 0x88, 0xd2, 0x89, 0xe4, 0x4c, 0x59, 0xc1, 0x9d, 0x36, 0x35, 0xdb, 0x41, 0x76, 0x8f, 0x43,
+	0x3e, 0x83, 0x41, 0x91, 0x2e, 0x6d, 0xb3, 0x00, 0xb0, 0x60, 0x9f, 0x45, 0x3e, 0x85, 0x7e, 0x35,
+	0x07, 0xa3, 0x95, 0x12, 0x26, 0x2f, 0xb3, 0x48, 0x18, 0xda, 0xc5, 0x67, 0xd8, 0xd1, 0xab, 0x6e,
+	0x36, 0x9a, 0xd2, 0x1c, 0xbf, 0x2a, 0xfa, 0x0c, 0xe9, 0x3d, 0x0e, 0x79, 0x09, 0x50, 0x2d, 0xdc,
+	0x2a, 0xf5, 0x14, 0xb9, 0x7f, 0x29, 0x55, 0xde, 0x6a, 0x37, 0x33, 0xc6, 0x53, 0x99, 0x0b, 0x7c,
+	0x3b, 0x3d, 0x7c, 0x3b, 0x7b, 0x1c, 0x32, 0x82, 0x13, 0xcb, 0xad, 0xc4, 0xd7, 0xf4, 0x1c, 0xa9,
+	0xc7, 0x6b, 0xf2, 0x0d, 0x8c, 0x98, 0x73, 0x8c, 0xa7, 0x22, 0x9e, 0xef, 0x66, 0xf6, 0x91, 0xfe,
+	0x1f, 0xa2, 0x9a, 0xc3, 0xda, 0x7d, 0xab, 0xe3, 0xba, 0xea, 0x7d, 0xac, 0xda, 0xd1, 0xc9, 0x07,
+	0xd0, 0x49, 0x8c, 0x2e, 0x0b, 0x84, 0x08, 0x42, 0x1b, 0x81, 0x4c, 0xe0, 0xd9, 0x7a, 0x02, 0x08,
+	0x0c, 0x10, 0xd8, 0xd2, 0xc8, 0x05, 0xf4, 0xd3, 0x65, 0x21, 0xcc, 0xfc, 0x7b, 0x91, 0xaf, 0xb6,
+	0x93, 0x9e, 0xe1, 0xfa, 0xbe, 0xc0, 0x8f, 0xeb, 0xba, 0x61, 0x86, 0x3b, 0x38, 0xf9, 0x1a, 0x7a,
+	0xd5, 0x28, 0x5f, 0x4b, 0x25, 0x5e, 0x6b, 0x93, 0x31, 0x47, 0x5f, 0x60, 0xc0, 0x00, 0x03, 0xae,
+	0xb6, 0xac, 0xb0, 0x81, 0x92, 0x1f, 0x60, 0x80, 0xcb, 0xfc, 0x26, 0x97, 0xee, 0x8a, 0x39, 0x76,
+	0xa3, 0x4b, 0xc3, 0x05, 0x3d, 0xc7, 0x04, 0x8a, 0x09, 0xdf, 0xee, 0xfa, 0xe1, 0xbe, 0x22, 0xf2,
+	0x21, 0xb4, 0x1c, 0x4b, 0x2c, 0x1d, 0xe2, 0x72, 0x74, 0xb0, 0xf8, 0x96, 0x25, 0x36, 0x44, 0x99,
+	0x7c, 0x05, 0xc3, 0x58, 0x5a, 0x16, 0x29, 0x71, 0x2d, 0x93, 0xf4, 0xe2, 0x81, 0x49, 0xc5, 0x22,
+	0xa9, 0xa4, 0x5b, 0x52, 0x8a, 0x4b, 0xf1, 0x5f, 0xf6, 0xec, 0x37, 0x0f, 0xce, 0x1a, 0xfb, 0x7e,
+	0x51, 0x1d, 0x3e, 0x64, 0x01, 0xed, 0x37, 0xf9, 0x83, 0x5e, 0x08, 0xe2, 0x3f, 0xf5, 0x5c, 0xaa,
+	0x0f, 0xe2, 0x51, 0xf0, 0x64, 0xbe, 0x3e, 0x12, 0x27, 0xef, 0x5d, 0x7e, 0xfe, 0x53, 0x90, 0x48,
+	0x97, 0x96, 0x91, 0xcf, 0x75, 0x16, 0x64, 0x92, 0x1b, 0x6d, 0xf5, 0xbd, 0x0b, 0x32, 0xcd, 0x03,
+	0x53, 0xf0, 0x60, 0x13, 0x16, 0xac, 0xc2, 0xa2, 0x36, 0x1e, 0x6d, 0x5f, 0xfc, 0x13, 0x00, 0x00,
+	0xff, 0xff, 0xbb, 0x09, 0x6f, 0xda, 0x89, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/rpc/cloudagent/storage/virtualharddisk/moc_cloudagent_virtualharddisk.proto b/rpc/cloudagent/storage/virtualharddisk/moc_cloudagent_virtualharddisk.proto
index 10b533f4..d07534f4 100644
--- a/rpc/cloudagent/storage/virtualharddisk/moc_cloudagent_virtualharddisk.proto
+++ b/rpc/cloudagent/storage/virtualharddisk/moc_cloudagent_virtualharddisk.proto
@@ -45,6 +45,7 @@ message VirtualHardDisk {
 	DiskFileFormat diskFileFormat = 21;
 	CloudInitDataSource cloudInitDataSource = 22;
 	Tags tags = 23;
+	bool disableHighAvailability = 24;
 }
 
 service VirtualHardDiskAgent {
diff --git a/rpc/nodeagent/storage/container/moc_nodeagent_container.proto b/rpc/nodeagent/storage/container/moc_nodeagent_container.proto
index 095db69a..bcca9fb7 100644
--- a/rpc/nodeagent/storage/container/moc_nodeagent_container.proto
+++ b/rpc/nodeagent/storage/container/moc_nodeagent_container.proto
@@ -38,6 +38,7 @@ message Container {
 	Entity entity = 6;
 	Tags tags = 7;
 	StorageContainerInfo info = 8;
+	bool disableHighAvailability = 9;
 }
 
 service ContainerAgent {
diff --git a/rpc/nodeagent/storage/moc_nodeagent_container.pb.go b/rpc/nodeagent/storage/moc_nodeagent_container.pb.go
index 0fdb2dac..71cc82b2 100644
--- a/rpc/nodeagent/storage/moc_nodeagent_container.pb.go
+++ b/rpc/nodeagent/storage/moc_nodeagent_container.pb.go
@@ -164,16 +164,17 @@ func (m *ContainerResponse) GetError() string {
 }
 
 type Container struct {
-	Name                 string                       `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Id                   string                       `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
-	Path                 string                       `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
-	Status               *common.Status               `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"`
-	Entity               *common.Entity               `protobuf:"bytes,6,opt,name=entity,proto3" json:"entity,omitempty"`
-	Tags                 *common.Tags                 `protobuf:"bytes,7,opt,name=tags,proto3" json:"tags,omitempty"`
-	Info                 *common.StorageContainerInfo `protobuf:"bytes,8,opt,name=info,proto3" json:"info,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
-	XXX_unrecognized     []byte                       `json:"-"`
-	XXX_sizecache        int32                        `json:"-"`
+	Name                    string                       `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Id                      string                       `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	Path                    string                       `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
+	Status                  *common.Status               `protobuf:"bytes,5,opt,name=status,proto3" json:"status,omitempty"`
+	Entity                  *common.Entity               `protobuf:"bytes,6,opt,name=entity,proto3" json:"entity,omitempty"`
+	Tags                    *common.Tags                 `protobuf:"bytes,7,opt,name=tags,proto3" json:"tags,omitempty"`
+	Info                    *common.StorageContainerInfo `protobuf:"bytes,8,opt,name=info,proto3" json:"info,omitempty"`
+	DisableHighAvailability bool                         `protobuf:"varint,9,opt,name=disableHighAvailability,proto3" json:"disableHighAvailability,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                     `json:"-"`
+	XXX_unrecognized        []byte                       `json:"-"`
+	XXX_sizecache           int32                        `json:"-"`
 }
 
 func (m *Container) Reset()         { *m = Container{} }
@@ -250,6 +251,13 @@ func (m *Container) GetInfo() *common.StorageContainerInfo {
 	return nil
 }
 
+func (m *Container) GetDisableHighAvailability() bool {
+	if m != nil {
+		return m.DisableHighAvailability
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterEnum("moc.nodeagent.storage.ContainerType", ContainerType_name, ContainerType_value)
 	proto.RegisterType((*ContainerRequest)(nil), "moc.nodeagent.storage.ContainerRequest")
@@ -260,41 +268,43 @@ func init() {
 func init() { proto.RegisterFile("moc_nodeagent_container.proto", fileDescriptor_ec66452e75cca9cc) }
 
 var fileDescriptor_ec66452e75cca9cc = []byte{
-	// 540 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xed, 0x8e, 0xd2, 0x40,
-	0x14, 0xdd, 0x42, 0x17, 0xe4, 0x92, 0x25, 0xdd, 0x89, 0x1f, 0x15, 0xc5, 0x10, 0xfc, 0x21, 0x31,
-	0xb1, 0x35, 0xe8, 0x03, 0x2c, 0x20, 0x89, 0x1b, 0x23, 0x9b, 0x0c, 0xeb, 0x9a, 0x98, 0x98, 0xcd,
-	0x50, 0x86, 0xd2, 0x2c, 0x9d, 0x5b, 0x67, 0xa6, 0x1a, 0xde, 0xc0, 0xf8, 0x12, 0x3e, 0x85, 0x3f,
-	0x7c, 0x1c, 0xdf, 0xc4, 0x74, 0xda, 0xed, 0xd6, 0x8f, 0x64, 0xff, 0xec, 0x2f, 0x86, 0x73, 0xce,
-	0x3d, 0x73, 0xe6, 0xde, 0x5b, 0xe8, 0xc5, 0x18, 0x9c, 0x0b, 0x5c, 0x71, 0x16, 0x72, 0xa1, 0xcf,
-	0x03, 0x14, 0x9a, 0x45, 0x82, 0x4b, 0x2f, 0x91, 0xa8, 0x91, 0xdc, 0x89, 0x31, 0xf0, 0x4a, 0xda,
-	0x53, 0x1a, 0x25, 0x0b, 0x79, 0xf7, 0x51, 0x88, 0x18, 0x6e, 0xb9, 0x6f, 0x44, 0xcb, 0x74, 0xed,
-	0x7f, 0x91, 0x2c, 0x49, 0xb8, 0x54, 0x79, 0x59, 0xf7, 0x5e, 0xe6, 0x1a, 0x60, 0x1c, 0xa3, 0x28,
-	0x7e, 0x0a, 0xe2, 0xc1, 0xdf, 0x85, 0x3c, 0x4e, 0xf4, 0xae, 0x20, 0x7b, 0x95, 0x2a, 0x81, 0x3a,
-	0x5a, 0x47, 0x01, 0xd3, 0x51, 0x59, 0xfb, 0xb0, 0x42, 0x17, 0x41, 0x22, 0xb1, 0xc6, 0x9c, 0x1d,
-	0x7c, 0xb3, 0xc0, 0x99, 0x5e, 0xa6, 0xa7, 0xfc, 0x53, 0xca, 0x95, 0x26, 0x47, 0x00, 0x25, 0xa6,
-	0x5c, 0xab, 0x5f, 0x1f, 0xb6, 0x47, 0x7d, 0xef, 0xbf, 0x6f, 0xf2, 0xae, 0x8a, 0x2b, 0x35, 0xe4,
-	0x25, 0x1c, 0x9c, 0x24, 0x5c, 0x9a, 0x1c, 0xa7, 0xbb, 0x84, 0xbb, 0xb5, 0xbe, 0x35, 0xec, 0x8c,
-	0x3a, 0xc6, 0xa4, 0x64, 0xe8, 0x9f, 0xa2, 0xc1, 0x77, 0x0b, 0x0e, 0x2b, 0x61, 0x54, 0x82, 0x42,
-	0xf1, 0x1b, 0x48, 0x33, 0x82, 0x06, 0xe5, 0x2a, 0xdd, 0x6a, 0x13, 0xa3, 0x3d, 0xea, 0x7a, 0x79,
-	0x3f, 0xbd, 0xcb, 0x7e, 0x7a, 0x13, 0xc4, 0xed, 0x19, 0xdb, 0xa6, 0x9c, 0x16, 0x4a, 0x72, 0x1b,
-	0xf6, 0x67, 0x52, 0xa2, 0x74, 0xeb, 0x7d, 0x6b, 0xd8, 0xa2, 0xf9, 0x9f, 0xc1, 0x2f, 0x0b, 0x5a,
-	0xa5, 0x31, 0x21, 0x60, 0x0b, 0x16, 0x73, 0xd7, 0x32, 0x12, 0x73, 0x26, 0x1d, 0xa8, 0x45, 0x2b,
-	0x73, 0x4f, 0x8b, 0xd6, 0xa2, 0x15, 0x71, 0xc1, 0x4e, 0x98, 0xde, 0xb8, 0x76, 0x86, 0x4c, 0xec,
-	0xaf, 0x3f, 0x5c, 0x8b, 0x1a, 0x84, 0x3c, 0x86, 0x86, 0xd2, 0x4c, 0xa7, 0xca, 0xdd, 0x37, 0xa9,
-	0xda, 0xe6, 0x4d, 0x0b, 0x03, 0xd1, 0x82, 0xca, 0x44, 0x5c, 0xe8, 0x48, 0xef, 0xdc, 0x46, 0x45,
-	0x34, 0x33, 0x10, 0x2d, 0x28, 0xd2, 0x03, 0x5b, 0xb3, 0x50, 0xb9, 0x4d, 0x23, 0x69, 0x19, 0xc9,
-	0x29, 0x0b, 0x15, 0x35, 0x30, 0x79, 0x06, 0x76, 0x36, 0x71, 0xf7, 0x96, 0xa1, 0xef, 0x17, 0xd7,
-	0x98, 0x86, 0x95, 0x6f, 0x39, 0x16, 0x6b, 0xa4, 0x46, 0xf6, 0xf4, 0x08, 0x0e, 0x4a, 0x38, 0x1b,
-	0x0b, 0x69, 0x43, 0xf3, 0xdd, 0xfc, 0xcd, 0xfc, 0xe4, 0xfd, 0xdc, 0xd9, 0x23, 0x4d, 0xa8, 0x2f,
-	0xc6, 0x73, 0xc7, 0xca, 0x0e, 0xd3, 0xc5, 0x99, 0x53, 0x33, 0xc8, 0xdb, 0x89, 0x53, 0xcf, 0x0e,
-	0xaf, 0xc6, 0x0b, 0xc7, 0x1e, 0xfd, 0xb4, 0xa0, 0x53, 0x5a, 0x8c, 0xb3, 0x01, 0x91, 0x8f, 0xd0,
-	0x38, 0x16, 0x9f, 0xf1, 0x82, 0x93, 0x27, 0xd7, 0x8e, 0x2e, 0xdf, 0xc2, 0xee, 0xf0, 0x7a, 0x61,
-	0xbe, 0x21, 0x83, 0x3d, 0xf2, 0x1a, 0x0e, 0xa7, 0x1b, 0x1e, 0x5c, 0xcc, 0x2b, 0xfb, 0x4f, 0xee,
-	0xfe, 0x33, 0xe6, 0x59, 0xf6, 0xd9, 0x74, 0xf3, 0x0e, 0x54, 0xa5, 0x57, 0x4e, 0x93, 0xe7, 0x1f,
-	0xbc, 0x30, 0xd2, 0x9b, 0x74, 0xe9, 0x05, 0x18, 0xfb, 0x71, 0x14, 0x48, 0x54, 0xb8, 0xd6, 0x7e,
-	0x8c, 0x81, 0x2f, 0x93, 0xc0, 0x2f, 0xf3, 0xf8, 0x45, 0x9e, 0x65, 0xc3, 0xd8, 0xbf, 0xf8, 0x1d,
-	0x00, 0x00, 0xff, 0xff, 0xc3, 0xef, 0xb2, 0x6b, 0x14, 0x04, 0x00, 0x00,
+	// 570 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xdf, 0x6e, 0xd3, 0x3e,
+	0x18, 0x5d, 0xda, 0xac, 0x5d, 0x5d, 0xad, 0xca, 0xac, 0xdf, 0x8f, 0x85, 0x42, 0x51, 0x55, 0x2e,
+	0xa8, 0x90, 0x48, 0x50, 0xe1, 0x82, 0xcb, 0xb5, 0xa5, 0xd2, 0x26, 0x44, 0x27, 0xb9, 0x63, 0x48,
+	0x48, 0x68, 0x72, 0x53, 0x37, 0xb5, 0x96, 0xf8, 0x0b, 0xb6, 0x33, 0xd4, 0x37, 0x40, 0xbc, 0x02,
+	0x17, 0x3c, 0x05, 0x17, 0xbc, 0x1d, 0x8a, 0x93, 0x65, 0xe1, 0x9f, 0x76, 0xc3, 0x55, 0x9c, 0x73,
+	0xce, 0x77, 0x7c, 0xfc, 0x7d, 0x36, 0xea, 0xc5, 0x10, 0x5c, 0x08, 0x58, 0x31, 0x1a, 0x32, 0xa1,
+	0x2f, 0x02, 0x10, 0x9a, 0x72, 0xc1, 0xa4, 0x97, 0x48, 0xd0, 0x80, 0xff, 0x8f, 0x21, 0xf0, 0x4a,
+	0xda, 0x53, 0x1a, 0x24, 0x0d, 0x59, 0xf7, 0x41, 0x08, 0x10, 0x46, 0xcc, 0x37, 0xa2, 0x65, 0xba,
+	0xf6, 0x3f, 0x4a, 0x9a, 0x24, 0x4c, 0xaa, 0xbc, 0xac, 0x7b, 0x98, 0xb9, 0x06, 0x10, 0xc7, 0x20,
+	0x8a, 0x4f, 0x41, 0xdc, 0xfb, 0xb5, 0x90, 0xc5, 0x89, 0xde, 0x16, 0x64, 0xaf, 0x52, 0x25, 0x40,
+	0xf3, 0x35, 0x0f, 0xa8, 0xe6, 0x65, 0xed, 0xfd, 0x0a, 0x5d, 0x04, 0xe1, 0x62, 0x0d, 0x39, 0x3b,
+	0xf8, 0x6c, 0x21, 0x67, 0x7a, 0x9d, 0x9e, 0xb0, 0x0f, 0x29, 0x53, 0x1a, 0x1f, 0x21, 0x54, 0x62,
+	0xca, 0xb5, 0xfa, 0xf5, 0x61, 0x7b, 0xd4, 0xf7, 0xfe, 0x78, 0x26, 0xef, 0xa6, 0xb8, 0x52, 0x83,
+	0x9f, 0xa3, 0xfd, 0xd3, 0x84, 0x49, 0x93, 0xe3, 0x6c, 0x9b, 0x30, 0xb7, 0xd6, 0xb7, 0x86, 0x9d,
+	0x51, 0xc7, 0x98, 0x94, 0x0c, 0xf9, 0x59, 0x34, 0xf8, 0x6a, 0xa1, 0x83, 0x4a, 0x18, 0x95, 0x80,
+	0x50, 0xec, 0x1f, 0xa4, 0x19, 0xa1, 0x06, 0x61, 0x2a, 0x8d, 0xb4, 0x89, 0xd1, 0x1e, 0x75, 0xbd,
+	0xbc, 0x9f, 0xde, 0x75, 0x3f, 0xbd, 0x09, 0x40, 0x74, 0x4e, 0xa3, 0x94, 0x91, 0x42, 0x89, 0xff,
+	0x43, 0xbb, 0x33, 0x29, 0x41, 0xba, 0xf5, 0xbe, 0x35, 0x6c, 0x91, 0xfc, 0x67, 0xf0, 0xa5, 0x86,
+	0x5a, 0xa5, 0x31, 0xc6, 0xc8, 0x16, 0x34, 0x66, 0xae, 0x65, 0x24, 0x66, 0x8d, 0x3b, 0xa8, 0xc6,
+	0x57, 0x66, 0x9f, 0x16, 0xa9, 0xf1, 0x15, 0x76, 0x91, 0x9d, 0x50, 0xbd, 0x71, 0xed, 0x0c, 0x99,
+	0xd8, 0x9f, 0xbe, 0xb9, 0x16, 0x31, 0x08, 0x7e, 0x88, 0x1a, 0x4a, 0x53, 0x9d, 0x2a, 0x77, 0xd7,
+	0xa4, 0x6a, 0x9b, 0x33, 0x2d, 0x0c, 0x44, 0x0a, 0x2a, 0x13, 0x31, 0xa1, 0xb9, 0xde, 0xba, 0x8d,
+	0x8a, 0x68, 0x66, 0x20, 0x52, 0x50, 0xb8, 0x87, 0x6c, 0x4d, 0x43, 0xe5, 0x36, 0x8d, 0xa4, 0x65,
+	0x24, 0x67, 0x34, 0x54, 0xc4, 0xc0, 0xf8, 0x09, 0xb2, 0xb3, 0x89, 0xbb, 0x7b, 0x86, 0xbe, 0x5b,
+	0x6c, 0x63, 0x1a, 0x56, 0x9e, 0xe5, 0x44, 0xac, 0x81, 0x18, 0x19, 0x7e, 0x81, 0x0e, 0x57, 0x5c,
+	0xd1, 0x65, 0xc4, 0x8e, 0x79, 0xb8, 0x19, 0x5f, 0x51, 0x1e, 0xd1, 0x25, 0x8f, 0xb2, 0x0c, 0xad,
+	0xbe, 0x35, 0xdc, 0x23, 0x7f, 0xa3, 0x1f, 0x1f, 0xa1, 0xfd, 0xd2, 0x30, 0x1b, 0x28, 0x6e, 0xa3,
+	0xe6, 0x9b, 0xf9, 0xab, 0xf9, 0xe9, 0xdb, 0xb9, 0xb3, 0x83, 0x9b, 0xa8, 0xbe, 0x18, 0xcf, 0x1d,
+	0x2b, 0x5b, 0x4c, 0x17, 0xe7, 0x4e, 0xcd, 0x20, 0xaf, 0x27, 0x4e, 0x3d, 0x5b, 0xbc, 0x1c, 0x2f,
+	0x1c, 0x7b, 0xf4, 0xdd, 0x42, 0x9d, 0xd2, 0x62, 0x9c, 0x8d, 0x16, 0xbf, 0x47, 0x8d, 0x13, 0x71,
+	0x05, 0x97, 0x0c, 0x3f, 0xba, 0x75, 0xe8, 0xf9, 0xfd, 0xed, 0x0e, 0x6f, 0x17, 0xe6, 0x77, 0x6b,
+	0xb0, 0x83, 0x8f, 0xd1, 0xc1, 0x74, 0xc3, 0x82, 0xcb, 0x79, 0xe5, 0xe5, 0xe0, 0x3b, 0xbf, 0x5d,
+	0x90, 0x59, 0xf6, 0xe0, 0xba, 0x79, 0xef, 0xaa, 0xd2, 0x1b, 0xa7, 0xc9, 0xd3, 0x77, 0x5e, 0xc8,
+	0xf5, 0x26, 0x5d, 0x7a, 0x01, 0xc4, 0x7e, 0xcc, 0x03, 0x09, 0x0a, 0xd6, 0xda, 0x8f, 0x21, 0xf0,
+	0x65, 0x12, 0xf8, 0x65, 0x1e, 0xbf, 0xc8, 0xb3, 0x6c, 0x18, 0xfb, 0x67, 0x3f, 0x02, 0x00, 0x00,
+	0xff, 0xff, 0x7a, 0x81, 0x7a, 0xc1, 0x4e, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/rpc/nodeagent/storage/moc_nodeagent_virtualharddisk.pb.go b/rpc/nodeagent/storage/moc_nodeagent_virtualharddisk.pb.go
index f4389147..9b5bba36 100644
--- a/rpc/nodeagent/storage/moc_nodeagent_virtualharddisk.pb.go
+++ b/rpc/nodeagent/storage/moc_nodeagent_virtualharddisk.pb.go
@@ -55,6 +55,7 @@ func (VirtualHardDiskType) EnumDescriptor() ([]byte, []int) {
 type VirtualHardDiskRequest struct {
 	VirtualHardDiskSystems []*VirtualHardDisk `protobuf:"bytes,1,rep,name=VirtualHardDiskSystems,proto3" json:"VirtualHardDiskSystems,omitempty"`
 	OperationType          common.Operation   `protobuf:"varint,2,opt,name=OperationType,proto3,enum=moc.Operation" json:"OperationType,omitempty"`
+	NumOfRetries           uint32             `protobuf:"varint,3,opt,name=NumOfRetries,proto3" json:"NumOfRetries,omitempty"`
 	XXX_NoUnkeyedLiteral   struct{}           `json:"-"`
 	XXX_unrecognized       []byte             `json:"-"`
 	XXX_sizecache          int32              `json:"-"`
@@ -99,6 +100,13 @@ func (m *VirtualHardDiskRequest) GetOperationType() common.Operation {
 	return common.Operation_GET
 }
 
+func (m *VirtualHardDiskRequest) GetNumOfRetries() uint32 {
+	if m != nil {
+		return m.NumOfRetries
+	}
+	return 0
+}
+
 type VirtualHardDiskResponse struct {
 	VirtualHardDiskSystems []*VirtualHardDisk  `protobuf:"bytes,1,rep,name=VirtualHardDiskSystems,proto3" json:"VirtualHardDiskSystems,omitempty"`
 	Result                 *wrappers.BoolValue `protobuf:"bytes,2,opt,name=Result,proto3" json:"Result,omitempty"`
@@ -403,28 +411,29 @@ type VirtualHardDisk struct {
 	Source string `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"`
 	Path   string `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"`
 	// Storage container name to hold this vhd
-	ContainerName        string                     `protobuf:"bytes,5,opt,name=containerName,proto3" json:"containerName,omitempty"`
-	Status               *common.Status             `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"`
-	Size                 int64                      `protobuf:"varint,7,opt,name=size,proto3" json:"size,omitempty"`
-	Dynamic              bool                       `protobuf:"varint,8,opt,name=dynamic,proto3" json:"dynamic,omitempty"`
-	Blocksizebytes       int32                      `protobuf:"varint,9,opt,name=blocksizebytes,proto3" json:"blocksizebytes,omitempty"`
-	Logicalsectorbytes   int32                      `protobuf:"varint,10,opt,name=logicalsectorbytes,proto3" json:"logicalsectorbytes,omitempty"`
-	Physicalsectorbytes  int32                      `protobuf:"varint,11,opt,name=physicalsectorbytes,proto3" json:"physicalsectorbytes,omitempty"`
-	Controllernumber     int64                      `protobuf:"varint,12,opt,name=controllernumber,proto3" json:"controllernumber,omitempty"`
-	Controllerlocation   int64                      `protobuf:"varint,13,opt,name=controllerlocation,proto3" json:"controllerlocation,omitempty"`
-	Disknumber           int64                      `protobuf:"varint,14,opt,name=disknumber,proto3" json:"disknumber,omitempty"`
-	VirtualmachineName   string                     `protobuf:"bytes,15,opt,name=virtualmachineName,proto3" json:"virtualmachineName,omitempty"`
-	Scsipath             string                     `protobuf:"bytes,16,opt,name=scsipath,proto3" json:"scsipath,omitempty"`
-	Virtualharddisktype  VirtualHardDiskType        `protobuf:"varint,17,opt,name=virtualharddisktype,proto3,enum=moc.nodeagent.storage.VirtualHardDiskType" json:"virtualharddisktype,omitempty"`
-	Entity               *common.Entity             `protobuf:"bytes,18,opt,name=entity,proto3" json:"entity,omitempty"`
-	Tags                 *common.Tags               `protobuf:"bytes,19,opt,name=tags,proto3" json:"tags,omitempty"`
-	SourceType           common.ImageSource         `protobuf:"varint,20,opt,name=sourceType,proto3,enum=moc.ImageSource" json:"sourceType,omitempty"`
-	HyperVGeneration     common.HyperVGeneration    `protobuf:"varint,21,opt,name=hyperVGeneration,proto3,enum=moc.HyperVGeneration" json:"hyperVGeneration,omitempty"`
-	CloudInitDataSource  common.CloudInitDataSource `protobuf:"varint,22,opt,name=cloudInitDataSource,proto3,enum=moc.CloudInitDataSource" json:"cloudInitDataSource,omitempty"`
-	DiskFileFormat       common.DiskFileFormat      `protobuf:"varint,23,opt,name=diskFileFormat,proto3,enum=moc.DiskFileFormat" json:"diskFileFormat,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     []byte                     `json:"-"`
-	XXX_sizecache        int32                      `json:"-"`
+	ContainerName           string                     `protobuf:"bytes,5,opt,name=containerName,proto3" json:"containerName,omitempty"`
+	Status                  *common.Status             `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"`
+	Size                    int64                      `protobuf:"varint,7,opt,name=size,proto3" json:"size,omitempty"`
+	Dynamic                 bool                       `protobuf:"varint,8,opt,name=dynamic,proto3" json:"dynamic,omitempty"`
+	Blocksizebytes          int32                      `protobuf:"varint,9,opt,name=blocksizebytes,proto3" json:"blocksizebytes,omitempty"`
+	Logicalsectorbytes      int32                      `protobuf:"varint,10,opt,name=logicalsectorbytes,proto3" json:"logicalsectorbytes,omitempty"`
+	Physicalsectorbytes     int32                      `protobuf:"varint,11,opt,name=physicalsectorbytes,proto3" json:"physicalsectorbytes,omitempty"`
+	Controllernumber        int64                      `protobuf:"varint,12,opt,name=controllernumber,proto3" json:"controllernumber,omitempty"`
+	Controllerlocation      int64                      `protobuf:"varint,13,opt,name=controllerlocation,proto3" json:"controllerlocation,omitempty"`
+	Disknumber              int64                      `protobuf:"varint,14,opt,name=disknumber,proto3" json:"disknumber,omitempty"`
+	VirtualmachineName      string                     `protobuf:"bytes,15,opt,name=virtualmachineName,proto3" json:"virtualmachineName,omitempty"`
+	Scsipath                string                     `protobuf:"bytes,16,opt,name=scsipath,proto3" json:"scsipath,omitempty"`
+	Virtualharddisktype     VirtualHardDiskType        `protobuf:"varint,17,opt,name=virtualharddisktype,proto3,enum=moc.nodeagent.storage.VirtualHardDiskType" json:"virtualharddisktype,omitempty"`
+	Entity                  *common.Entity             `protobuf:"bytes,18,opt,name=entity,proto3" json:"entity,omitempty"`
+	Tags                    *common.Tags               `protobuf:"bytes,19,opt,name=tags,proto3" json:"tags,omitempty"`
+	SourceType              common.ImageSource         `protobuf:"varint,20,opt,name=sourceType,proto3,enum=moc.ImageSource" json:"sourceType,omitempty"`
+	HyperVGeneration        common.HyperVGeneration    `protobuf:"varint,21,opt,name=hyperVGeneration,proto3,enum=moc.HyperVGeneration" json:"hyperVGeneration,omitempty"`
+	CloudInitDataSource     common.CloudInitDataSource `protobuf:"varint,22,opt,name=cloudInitDataSource,proto3,enum=moc.CloudInitDataSource" json:"cloudInitDataSource,omitempty"`
+	DiskFileFormat          common.DiskFileFormat      `protobuf:"varint,23,opt,name=diskFileFormat,proto3,enum=moc.DiskFileFormat" json:"diskFileFormat,omitempty"`
+	DisableHighAvailability bool                       `protobuf:"varint,24,opt,name=disableHighAvailability,proto3" json:"disableHighAvailability,omitempty"`
+	XXX_NoUnkeyedLiteral    struct{}                   `json:"-"`
+	XXX_unrecognized        []byte                     `json:"-"`
+	XXX_sizecache           int32                      `json:"-"`
 }
 
 func (m *VirtualHardDisk) Reset()         { *m = VirtualHardDisk{} }
@@ -613,6 +622,13 @@ func (m *VirtualHardDisk) GetDiskFileFormat() common.DiskFileFormat {
 	return common.DiskFileFormat_DiskFileFormatVHDX
 }
 
+func (m *VirtualHardDisk) GetDisableHighAvailability() bool {
+	if m != nil {
+		return m.DisableHighAvailability
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterEnum("moc.nodeagent.storage.VirtualHardDiskType", VirtualHardDiskType_name, VirtualHardDiskType_value)
 	proto.RegisterType((*VirtualHardDiskRequest)(nil), "moc.nodeagent.storage.VirtualHardDiskRequest")
@@ -630,70 +646,72 @@ func init() {
 }
 
 var fileDescriptor_c1f33a566472b7b7 = []byte{
-	// 1000 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdf, 0x4e, 0x23, 0xb7,
-	0x17, 0xde, 0x81, 0x10, 0x96, 0x93, 0x1f, 0x59, 0xd6, 0x61, 0x61, 0x7e, 0xd9, 0x3f, 0x8a, 0xb2,
-	0xd5, 0x2a, 0x42, 0xea, 0x04, 0xa5, 0xbd, 0xa8, 0xd4, 0xab, 0x40, 0x60, 0x49, 0x17, 0xed, 0x56,
-	0x0e, 0x70, 0x51, 0x55, 0x45, 0x8e, 0x63, 0x12, 0x8b, 0x99, 0xf1, 0xd4, 0xf6, 0x50, 0x65, 0x9f,
-	0xa0, 0x4f, 0xd3, 0xbb, 0x3e, 0x41, 0x2f, 0xdb, 0x07, 0xe8, 0xe3, 0x54, 0x3e, 0x33, 0x84, 0x64,
-	0x92, 0x4a, 0xdc, 0xf4, 0x2a, 0xf1, 0xf7, 0x7d, 0xe7, 0xf3, 0xf1, 0xb1, 0x7d, 0x3c, 0xf0, 0x36,
-	0x52, 0xfc, 0x3a, 0x56, 0x23, 0xc1, 0xc6, 0x22, 0xb6, 0xd7, 0x77, 0x52, 0xdb, 0x94, 0x85, 0x13,
-	0xa6, 0x47, 0x23, 0x69, 0x6e, 0x83, 0x44, 0x2b, 0xab, 0xc8, 0x8b, 0x48, 0xf1, 0x60, 0x26, 0x0a,
-	0x8c, 0x55, 0x9a, 0x8d, 0x45, 0xfd, 0xcd, 0x58, 0xa9, 0x71, 0x28, 0xda, 0x28, 0x1a, 0xa6, 0x37,
-	0xed, 0x5f, 0x34, 0x4b, 0x12, 0xa1, 0x4d, 0x16, 0x56, 0xdf, 0x77, 0xde, 0x5c, 0x45, 0x91, 0x8a,
-	0xf3, 0x9f, 0x9c, 0x78, 0x3d, 0x47, 0xc4, 0xca, 0xca, 0x1b, 0xc9, 0x99, 0x95, 0x33, 0xfa, 0x65,
-	0xd1, 0x57, 0x44, 0x89, 0x9d, 0x66, 0x64, 0xf3, 0x37, 0x0f, 0xf6, 0xae, 0xb2, 0x2c, 0xcf, 0x98,
-	0x1e, 0xf5, 0xa4, 0xb9, 0xa5, 0xe2, 0xe7, 0x54, 0x18, 0x4b, 0x7e, 0x5a, 0x62, 0x06, 0x53, 0x63,
-	0x45, 0x64, 0x7c, 0xaf, 0xb1, 0xde, 0xaa, 0x74, 0xde, 0x05, 0x2b, 0xd7, 0x11, 0x14, 0xed, 0xfe,
-	0xc5, 0x85, 0x7c, 0x0d, 0xdb, 0x9f, 0x12, 0xa1, 0x31, 0xd5, 0x8b, 0x69, 0x22, 0xfc, 0xb5, 0x86,
-	0xd7, 0xaa, 0x76, 0xaa, 0x68, 0x3b, 0x63, 0xe8, 0xa2, 0xa8, 0xf9, 0x87, 0x07, 0xfb, 0x4b, 0x09,
-	0x9b, 0x44, 0xc5, 0x46, 0xfc, 0xe7, 0x19, 0x77, 0xa0, 0x4c, 0x85, 0x49, 0x43, 0x8b, 0xa9, 0x56,
-	0x3a, 0xf5, 0x20, 0x2b, 0x6d, 0x70, 0x5f, 0xda, 0xe0, 0x48, 0xa9, 0xf0, 0x8a, 0x85, 0xa9, 0xa0,
-	0xb9, 0x92, 0xec, 0xc2, 0xc6, 0x89, 0xd6, 0x4a, 0xfb, 0xeb, 0x0d, 0xaf, 0xb5, 0x45, 0xb3, 0x41,
-	0xf3, 0x2f, 0x0f, 0xc8, 0xe0, 0x74, 0xd0, 0x8f, 0xd8, 0x58, 0x7c, 0xaf, 0x55, 0x22, 0xb4, 0x95,
-	0xc2, 0x90, 0x06, 0x54, 0x38, 0xb3, 0x2c, 0x54, 0xe3, 0x8f, 0x2c, 0x12, 0xbe, 0x87, 0x21, 0xf3,
-	0x10, 0xa9, 0xc3, 0x53, 0x96, 0x8e, 0xa4, 0x88, 0x79, 0x56, 0xaf, 0x2d, 0x3a, 0x1b, 0x13, 0x1f,
-	0x36, 0xef, 0x84, 0x36, 0x52, 0xc5, 0xf9, 0x64, 0xf7, 0x43, 0xe7, 0xab, 0x45, 0x28, 0x98, 0x11,
-	0xe8, 0x5b, 0xca, 0x7c, 0xe7, 0x20, 0x97, 0x66, 0xc2, 0xb4, 0x35, 0xfe, 0x46, 0xc3, 0x6b, 0x6d,
-	0xd3, 0x6c, 0x40, 0xde, 0x41, 0x75, 0x24, 0x8c, 0x95, 0x31, 0xd6, 0xbf, 0x27, 0xb5, 0x5f, 0xc6,
-	0xd0, 0x02, 0xda, 0x3c, 0x84, 0xdd, 0x73, 0xc5, 0x59, 0x58, 0x5c, 0x8f, 0x0f, 0xa5, 0x84, 0xd9,
-	0x49, 0xb6, 0x90, 0xa3, 0xd2, 0xaf, 0xbf, 0xfb, 0x1e, 0x45, 0xa4, 0xf9, 0x0d, 0xec, 0x1e, 0x87,
-	0x2a, 0x16, 0xab, 0x2a, 0xe0, 0xf0, 0x81, 0x4a, 0x35, 0x7f, 0xa8, 0xc0, 0x03, 0xd4, 0x6c, 0x43,
-	0xed, 0xcc, 0xda, 0x64, 0x79, 0xaa, 0xcd, 0x89, 0xb5, 0xc9, 0x25, 0x3d, 0xcf, 0x83, 0xee, 0x87,
-	0xcd, 0x4b, 0x78, 0xd9, 0xfd, 0x9c, 0x6a, 0xf1, 0x9e, 0x85, 0xa1, 0xd0, 0xd3, 0x62, 0xe0, 0x2b,
-	0x28, 0x1b, 0x66, 0x2e, 0x69, 0x7f, 0x21, 0xcb, 0x1c, 0x9b, 0xaf, 0xe9, 0xda, 0x42, 0x4d, 0x9b,
-	0x7f, 0x6f, 0xc2, 0xb3, 0xc2, 0x39, 0x21, 0x04, 0x4a, 0xf1, 0xc3, 0xc6, 0xe1, 0x7f, 0x52, 0x85,
-	0x35, 0x39, 0xca, 0x83, 0xd7, 0xe4, 0x08, 0xe7, 0xcb, 0x16, 0xb7, 0xbe, 0x30, 0x1f, 0x62, 0xb3,
-	0x8a, 0x95, 0x8a, 0x15, 0x23, 0x5f, 0xc0, 0x36, 0x57, 0xb1, 0x65, 0x32, 0x16, 0x1a, 0x77, 0x71,
-	0x03, 0x2d, 0x17, 0x41, 0xf2, 0x16, 0xca, 0xc6, 0x32, 0x9b, 0x1a, 0xdc, 0xa9, 0x4a, 0xa7, 0x82,
-	0x47, 0x7e, 0x80, 0x10, 0xcd, 0x29, 0x97, 0xa6, 0x91, 0x9f, 0x85, 0xbf, 0xd9, 0xf0, 0x5a, 0xeb,
-	0x14, 0xff, 0xbb, 0x85, 0x8e, 0xa6, 0x31, 0x8b, 0x24, 0xf7, 0x9f, 0x36, 0xbc, 0xd6, 0x53, 0x7a,
-	0x3f, 0x74, 0x87, 0x60, 0x18, 0x2a, 0x7e, 0xeb, 0x64, 0xc3, 0xa9, 0x15, 0xc6, 0xdf, 0x6a, 0x78,
-	0xad, 0x0d, 0x5a, 0x40, 0x49, 0x00, 0x24, 0x54, 0x63, 0xc9, 0x59, 0x68, 0x04, 0xb7, 0x4a, 0x67,
-	0x5a, 0x40, 0xed, 0x0a, 0x86, 0x1c, 0x42, 0x2d, 0x99, 0x4c, 0x4d, 0x31, 0xa0, 0x82, 0x01, 0xab,
-	0x28, 0x72, 0x00, 0x3b, 0x6e, 0xb5, 0x5a, 0xb9, 0x8d, 0x8c, 0xd3, 0x68, 0x28, 0xb4, 0xff, 0x3f,
-	0x5c, 0xc3, 0x12, 0xee, 0xb2, 0x79, 0xc0, 0x42, 0x95, 0x75, 0x44, 0x7f, 0x1b, 0xd5, 0x2b, 0x18,
-	0xf2, 0x06, 0xc0, 0xb5, 0xe8, 0xdc, 0xb5, 0x8a, 0xba, 0x39, 0xc4, 0xf9, 0xe5, 0xdd, 0x3c, 0x62,
-	0x7c, 0x22, 0xe3, 0xec, 0x26, 0x3d, 0xc3, 0x3d, 0x58, 0xc1, 0xb8, 0x8b, 0x6a, 0xb8, 0x91, 0xb8,
-	0x99, 0x3b, 0xd9, 0x45, 0xbd, 0x1f, 0x93, 0x1f, 0xa1, 0x56, 0x78, 0x19, 0xac, 0xeb, 0x7f, 0xcf,
-	0xb1, 0xff, 0x1d, 0x3c, 0xae, 0x49, 0xb9, 0x66, 0x48, 0x57, 0xd9, 0xb8, 0x23, 0x20, 0x62, 0x2b,
-	0xed, 0xd4, 0x27, 0x73, 0x47, 0xe0, 0x04, 0x21, 0x9a, 0x53, 0xe4, 0x35, 0x94, 0x2c, 0x1b, 0x1b,
-	0xbf, 0x86, 0x92, 0x2d, 0x94, 0x5c, 0xb0, 0xb1, 0xa1, 0x08, 0x93, 0x43, 0x80, 0xec, 0x40, 0x62,
-	0x63, 0xde, 0xc5, 0xc4, 0x76, 0x50, 0x84, 0xd7, 0x27, 0xbb, 0x8a, 0x74, 0x4e, 0x43, 0xba, 0xb0,
-	0x33, 0x99, 0x26, 0x42, 0x5f, 0xbd, 0x17, 0x71, 0xde, 0xaf, 0xfd, 0x17, 0x18, 0xf7, 0x02, 0xe3,
-	0xce, 0x0a, 0x24, 0x5d, 0x92, 0x93, 0xef, 0xa0, 0xc6, 0x43, 0x95, 0x8e, 0xfa, 0xb1, 0xb4, 0x3d,
-	0x66, 0x59, 0xde, 0x03, 0xf6, 0xd0, 0xc5, 0x47, 0x97, 0xe3, 0x65, 0x9e, 0xae, 0x0a, 0x22, 0xdf,
-	0x42, 0xd5, 0x15, 0xe4, 0x54, 0x86, 0xe2, 0x54, 0xe9, 0x88, 0x59, 0x7f, 0x1f, 0x6d, 0x6a, 0x68,
-	0xd3, 0x5b, 0xa0, 0x68, 0x41, 0x7a, 0xf0, 0x01, 0x6a, 0x2b, 0xaa, 0x4d, 0xf6, 0x80, 0x7c, 0x1a,
-	0x5c, 0x5f, 0xf5, 0xe9, 0xc5, 0x65, 0xf7, 0xfc, 0xac, 0x4b, 0x7b, 0xbd, 0xfe, 0xe0, 0xc3, 0xce,
-	0x13, 0xf2, 0x0a, 0xfc, 0x5e, 0xf7, 0xa2, 0xeb, 0x46, 0x4b, 0xac, 0xd7, 0xf9, 0xd3, 0x83, 0xdd,
-	0x82, 0x5b, 0xd7, 0x6d, 0x2c, 0x91, 0x50, 0xee, 0xc7, 0x77, 0xea, 0x56, 0x90, 0x2f, 0x1f, 0xf9,
-	0x2e, 0x65, 0x0f, 0x73, 0x3d, 0x78, 0xac, 0x3c, 0x7b, 0x16, 0x9b, 0x4f, 0xc8, 0x19, 0x3c, 0x3f,
-	0x9e, 0x08, 0x7e, 0xfb, 0x71, 0xee, 0xeb, 0x80, 0xec, 0x2d, 0xbd, 0x5e, 0x27, 0xee, 0xc3, 0xa0,
-	0xfe, 0x7f, 0xb4, 0x9f, 0x97, 0x3e, 0x38, 0x1d, 0x1d, 0xfe, 0x10, 0x8c, 0xa5, 0x9d, 0xa4, 0xc3,
-	0x80, 0xab, 0xa8, 0x1d, 0x49, 0xae, 0x95, 0x51, 0x37, 0xb6, 0x1d, 0x29, 0xde, 0xd6, 0x09, 0x6f,
-	0xcf, 0xb2, 0x6a, 0xe7, 0x59, 0x0d, 0xcb, 0x68, 0xff, 0xd5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0xd0, 0x17, 0x92, 0x64, 0x1b, 0x09, 0x00, 0x00,
+	// 1039 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x4e, 0x23, 0x37,
+	0x14, 0xde, 0x81, 0x10, 0xe0, 0x64, 0xc9, 0xb2, 0x0e, 0x3f, 0xd3, 0xec, 0x8f, 0xa2, 0x6c, 0xb5,
+	0x8a, 0x90, 0x3a, 0x41, 0x69, 0x2f, 0x56, 0xea, 0x55, 0x20, 0xb0, 0x49, 0x17, 0x41, 0xe5, 0x00,
+	0x17, 0x55, 0x55, 0xe4, 0x4c, 0x4c, 0x62, 0x31, 0x33, 0x9e, 0xda, 0x1e, 0xaa, 0xec, 0x13, 0xf4,
+	0xba, 0xef, 0xd2, 0x27, 0xe8, 0x65, 0x7b, 0xd5, 0x27, 0xaa, 0x7c, 0x66, 0x08, 0xc9, 0x24, 0x2b,
+	0x71, 0xd3, 0x2b, 0xf0, 0xf7, 0x7d, 0xe7, 0x9b, 0x73, 0x8e, 0xed, 0xe3, 0xc0, 0xbb, 0x50, 0xfa,
+	0x37, 0x91, 0x1c, 0x72, 0x36, 0xe2, 0x91, 0xb9, 0xb9, 0x17, 0xca, 0x24, 0x2c, 0x18, 0x33, 0x35,
+	0x1c, 0x0a, 0x7d, 0xe7, 0xc5, 0x4a, 0x1a, 0x49, 0x76, 0x43, 0xe9, 0x7b, 0x53, 0x91, 0xa7, 0x8d,
+	0x54, 0x6c, 0xc4, 0xab, 0x6f, 0x47, 0x52, 0x8e, 0x02, 0xde, 0x44, 0xd1, 0x20, 0xb9, 0x6d, 0xfe,
+	0xa6, 0x58, 0x1c, 0x73, 0xa5, 0xd3, 0xb0, 0xea, 0xbe, 0xf5, 0xf6, 0x65, 0x18, 0xca, 0x28, 0xfb,
+	0x93, 0x11, 0x6f, 0x66, 0x88, 0x48, 0x1a, 0x71, 0x2b, 0x7c, 0x66, 0xc4, 0x94, 0x7e, 0x95, 0xf7,
+	0xe5, 0x61, 0x6c, 0x26, 0x29, 0x59, 0xff, 0xd7, 0x81, 0xbd, 0xeb, 0x34, 0xcb, 0x2e, 0x53, 0xc3,
+	0x8e, 0xd0, 0x77, 0x94, 0xff, 0x9a, 0x70, 0x6d, 0xc8, 0x2f, 0x0b, 0x4c, 0x7f, 0xa2, 0x0d, 0x0f,
+	0xb5, 0xeb, 0xd4, 0x56, 0x1b, 0xa5, 0xd6, 0x7b, 0x6f, 0x69, 0x1d, 0x5e, 0xde, 0xee, 0x0b, 0x2e,
+	0xe4, 0x3b, 0xd8, 0xba, 0x88, 0xb9, 0xc2, 0x54, 0x2f, 0x27, 0x31, 0x77, 0x57, 0x6a, 0x4e, 0xa3,
+	0xdc, 0x2a, 0xa3, 0xed, 0x94, 0xa1, 0xf3, 0x22, 0x52, 0x87, 0xe7, 0xe7, 0x49, 0x78, 0x71, 0x4b,
+	0xb9, 0x51, 0x82, 0x6b, 0x77, 0xb5, 0xe6, 0x34, 0xb6, 0xe8, 0x1c, 0x56, 0xff, 0xcb, 0x81, 0xfd,
+	0x85, 0xa2, 0x74, 0x2c, 0x23, 0xcd, 0xff, 0xf7, 0xaa, 0x5a, 0x50, 0xa4, 0x5c, 0x27, 0x81, 0xc1,
+	0x72, 0x4a, 0xad, 0xaa, 0x97, 0xb6, 0xdf, 0x7b, 0x68, 0xbf, 0x77, 0x24, 0x65, 0x70, 0xcd, 0x82,
+	0x84, 0xd3, 0x4c, 0x49, 0x76, 0x60, 0xed, 0x44, 0x29, 0xa9, 0xb0, 0x98, 0x4d, 0x9a, 0x2e, 0xea,
+	0xff, 0x38, 0x40, 0xfa, 0xa7, 0xfd, 0x5e, 0xc8, 0x46, 0xfc, 0x47, 0x25, 0x63, 0xae, 0x8c, 0xe0,
+	0x9a, 0xd4, 0xa0, 0xe4, 0x33, 0xc3, 0x02, 0x39, 0x3a, 0x67, 0x21, 0x77, 0x1d, 0x0c, 0x99, 0x85,
+	0x48, 0x15, 0x36, 0x58, 0x32, 0x14, 0x3c, 0xf2, 0xd3, 0x9e, 0x6e, 0xd2, 0xe9, 0x9a, 0xb8, 0xb0,
+	0x7e, 0xcf, 0x95, 0x16, 0x32, 0xca, 0x3e, 0xf6, 0xb0, 0xb4, 0xbe, 0x8a, 0x07, 0x9c, 0x69, 0x8e,
+	0xbe, 0x85, 0xd4, 0x77, 0x06, 0xb2, 0x69, 0xc6, 0x4c, 0x19, 0xed, 0xae, 0x61, 0xcf, 0xd3, 0x05,
+	0x79, 0x0f, 0xe5, 0x21, 0xd7, 0x46, 0x44, 0xb8, 0x47, 0x1d, 0xa1, 0xdc, 0x22, 0x86, 0xe6, 0xd0,
+	0xfa, 0x21, 0xec, 0x9c, 0x49, 0x9f, 0x05, 0xf9, 0x7a, 0x5c, 0x28, 0xc4, 0xcc, 0x8c, 0xd3, 0x42,
+	0x8e, 0x0a, 0xbf, 0xff, 0xe9, 0x3a, 0x14, 0x91, 0xfa, 0x07, 0xd8, 0x39, 0x0e, 0x64, 0xc4, 0x97,
+	0x75, 0xc0, 0xe2, 0x7d, 0x99, 0x28, 0xff, 0xb1, 0x03, 0x8f, 0x50, 0xbd, 0x09, 0x95, 0xae, 0x31,
+	0xf1, 0xe2, 0xa7, 0xd6, 0xc7, 0xc6, 0xc4, 0x57, 0xf4, 0x2c, 0x0b, 0x7a, 0x58, 0xd6, 0xaf, 0xe0,
+	0x55, 0xfb, 0x73, 0xa2, 0xf8, 0x47, 0x16, 0x04, 0x5c, 0x4d, 0xf2, 0x81, 0xaf, 0xa1, 0xa8, 0x99,
+	0xbe, 0xa2, 0xbd, 0xb9, 0x2c, 0x33, 0x6c, 0xb6, 0xa7, 0x2b, 0x73, 0x3d, 0xad, 0xff, 0xb1, 0x01,
+	0x2f, 0x72, 0xe7, 0x84, 0x10, 0x28, 0x44, 0x8f, 0x1b, 0x87, 0xff, 0x93, 0x32, 0xac, 0x88, 0x61,
+	0x16, 0xbc, 0x22, 0x86, 0xf8, 0xbd, 0xb4, 0xb8, 0xd5, 0xb9, 0xef, 0x21, 0x36, 0xed, 0x58, 0x21,
+	0xdf, 0x31, 0xf2, 0x35, 0x6c, 0xf9, 0x32, 0x32, 0x4c, 0x44, 0x5c, 0xe1, 0x2e, 0xae, 0xa1, 0xe5,
+	0x3c, 0x48, 0xde, 0x41, 0x51, 0x1b, 0x66, 0x12, 0x8d, 0x3b, 0x55, 0x6a, 0x95, 0xf0, 0xc8, 0xf7,
+	0x11, 0xa2, 0x19, 0x65, 0xd3, 0xd4, 0xe2, 0x33, 0x77, 0xd7, 0x6b, 0x4e, 0x63, 0x95, 0xe2, 0xff,
+	0xb6, 0xd0, 0xe1, 0x24, 0x62, 0xa1, 0xf0, 0xdd, 0x8d, 0x9a, 0xd3, 0xd8, 0xa0, 0x0f, 0x4b, 0x7b,
+	0x08, 0x06, 0x81, 0xf4, 0xef, 0xac, 0x6c, 0x30, 0x31, 0x5c, 0xbb, 0x9b, 0x35, 0xa7, 0xb1, 0x46,
+	0x73, 0x28, 0xf1, 0x80, 0x04, 0x72, 0x24, 0x7c, 0x16, 0x68, 0xee, 0x1b, 0xa9, 0x52, 0x2d, 0xa0,
+	0x76, 0x09, 0x43, 0x0e, 0xa1, 0x12, 0x8f, 0x27, 0x3a, 0x1f, 0x50, 0xc2, 0x80, 0x65, 0x14, 0x39,
+	0x80, 0x6d, 0x5b, 0xad, 0x92, 0x76, 0x23, 0xa3, 0x24, 0x1c, 0x70, 0xe5, 0x3e, 0xc7, 0x1a, 0x16,
+	0x70, 0x9b, 0xcd, 0x23, 0x16, 0xc8, 0x74, 0x6a, 0xba, 0x5b, 0xa8, 0x5e, 0xc2, 0x90, 0xb7, 0x00,
+	0x76, 0x8c, 0x67, 0xae, 0x65, 0xd4, 0xcd, 0x20, 0xd6, 0x2f, 0x9b, 0xf8, 0x21, 0xf3, 0xc7, 0x22,
+	0x4a, 0x6f, 0xd2, 0x0b, 0xdc, 0x83, 0x25, 0x8c, 0xbd, 0xa8, 0xda, 0xd7, 0x02, 0x37, 0x73, 0x3b,
+	0xbd, 0xa8, 0x0f, 0x6b, 0xf2, 0x33, 0x54, 0x72, 0xaf, 0x87, 0xb1, 0x33, 0xf2, 0x25, 0xce, 0xc8,
+	0x83, 0xa7, 0x0d, 0x29, 0x3b, 0x30, 0xe9, 0x32, 0x1b, 0x7b, 0x04, 0x78, 0x64, 0x84, 0x99, 0xb8,
+	0x64, 0xe6, 0x08, 0x9c, 0x20, 0x44, 0x33, 0x8a, 0xbc, 0x81, 0x82, 0x61, 0x23, 0xed, 0x56, 0x50,
+	0xb2, 0x89, 0x92, 0x4b, 0x36, 0xd2, 0x14, 0x61, 0x72, 0x08, 0x90, 0x1e, 0x48, 0x1c, 0xde, 0x3b,
+	0x98, 0xd8, 0x36, 0x8a, 0xf0, 0xfa, 0xa4, 0x57, 0x91, 0xce, 0x68, 0x48, 0x1b, 0xb6, 0xc7, 0x93,
+	0x98, 0xab, 0xeb, 0x8f, 0x3c, 0xca, 0x66, 0xba, 0xbb, 0x8b, 0x71, 0xbb, 0x18, 0xd7, 0xcd, 0x91,
+	0x74, 0x41, 0x4e, 0x7e, 0x80, 0x8a, 0x1f, 0xc8, 0x64, 0xd8, 0x8b, 0x84, 0xe9, 0x30, 0xc3, 0xb2,
+	0x19, 0xb0, 0x87, 0x2e, 0x2e, 0xba, 0x1c, 0x2f, 0xf2, 0x74, 0x59, 0x10, 0xf9, 0x1e, 0xca, 0xb6,
+	0x21, 0xa7, 0x22, 0xe0, 0xa7, 0x52, 0x85, 0xcc, 0xb8, 0xfb, 0x68, 0x53, 0x41, 0x9b, 0xce, 0x1c,
+	0x45, 0x73, 0x52, 0xf2, 0x01, 0xf6, 0x87, 0x42, 0xb3, 0x41, 0xc0, 0xbb, 0x62, 0x34, 0x6e, 0xdf,
+	0x33, 0x11, 0xb0, 0x81, 0x08, 0x6c, 0x4b, 0x5d, 0xbc, 0x1b, 0x5f, 0xa2, 0x0f, 0x3e, 0x41, 0x65,
+	0xc9, 0x3e, 0x91, 0x3d, 0x20, 0x17, 0xfd, 0x9b, 0xeb, 0x1e, 0xbd, 0xbc, 0x6a, 0x9f, 0x75, 0xdb,
+	0xb4, 0xd3, 0xe9, 0xf5, 0x3f, 0x6d, 0x3f, 0x23, 0xaf, 0xc1, 0xed, 0xb4, 0x2f, 0xdb, 0x76, 0xb5,
+	0xc0, 0x3a, 0xad, 0xbf, 0x1d, 0xd8, 0xc9, 0xb9, 0xb5, 0xed, 0x91, 0x20, 0x02, 0x8a, 0xbd, 0xe8,
+	0x5e, 0xde, 0x71, 0xf2, 0xcd, 0x13, 0x5f, 0xb4, 0xf4, 0xd9, 0xaf, 0x7a, 0x4f, 0x95, 0xa7, 0x0f,
+	0x6a, 0xfd, 0x19, 0xe9, 0xc2, 0xcb, 0xe3, 0x31, 0xf7, 0xef, 0xce, 0x67, 0x7e, 0x7b, 0x90, 0xbd,
+	0x85, 0x77, 0xef, 0xc4, 0xfe, 0xec, 0xa8, 0x7e, 0x85, 0xf6, 0xb3, 0xd2, 0x47, 0xa7, 0xa3, 0xc3,
+	0x9f, 0xbc, 0x91, 0x30, 0xe3, 0x64, 0xe0, 0xf9, 0x32, 0x6c, 0x86, 0xc2, 0x57, 0x52, 0xcb, 0x5b,
+	0xd3, 0x0c, 0xa5, 0xdf, 0x54, 0xb1, 0xdf, 0x9c, 0x66, 0xd5, 0xcc, 0xb2, 0x1a, 0x14, 0xd1, 0xfe,
+	0xdb, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x54, 0x1b, 0x2a, 0xa7, 0x79, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/rpc/nodeagent/storage/virtualharddisk/moc_nodeagent_virtualharddisk.proto b/rpc/nodeagent/storage/virtualharddisk/moc_nodeagent_virtualharddisk.proto
index e1289d7a..4f610b9d 100644
--- a/rpc/nodeagent/storage/virtualharddisk/moc_nodeagent_virtualharddisk.proto
+++ b/rpc/nodeagent/storage/virtualharddisk/moc_nodeagent_virtualharddisk.proto
@@ -18,6 +18,7 @@ enum VirtualHardDiskType {
 message VirtualHardDiskRequest {
 	repeated VirtualHardDisk VirtualHardDiskSystems = 1;
 	Operation OperationType = 2;
+	uint32 NumOfRetries = 3;
 }
 
 message VirtualHardDiskResponse {
@@ -77,6 +78,7 @@ message VirtualHardDisk {
 	HyperVGeneration hyperVGeneration = 21; 
 	CloudInitDataSource cloudInitDataSource = 22;
 	DiskFileFormat diskFileFormat = 23;
+	bool disableHighAvailability = 24;
 }
 
 service VirtualHardDiskAgent {