diff --git a/deploy/rp-production-nsg.json b/deploy/rp-production-nsg.json
index 0f6460396..b3650a0f5 100644
--- a/deploy/rp-production-nsg.json
+++ b/deploy/rp-production-nsg.json
@@ -33,9 +33,9 @@
             "apiVersion": "2019-07-01"
         },
         {
+            "type": "Microsoft.ManagedIdentity/userAssignedIdentities",
             "name": "rp-identity",
             "location": "[resourceGroup().location]",
-            "type": "Microsoft.ManagedIdentity/userAssignedIdentities",
             "apiVersion": "2018-11-30"
         }
     ],
diff --git a/pkg/deploy/bindata.go b/pkg/deploy/bindata.go
index 31d0eda70..8ff3376a7 100644
--- a/pkg/deploy/bindata.go
+++ b/pkg/deploy/bindata.go
@@ -184,7 +184,7 @@ func rpDevelopmentJson() (*asset, error) {
 	return a, nil
 }
 
-var _rpProductionNsgJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x54\x4d\x6f\xda\x40\x10\xbd\xf3\x2b\xac\x6d\x25\x43\x85\xbf\x48\xaa\xb6\xdc\x38\x55\x1c\x52\xa1\x24\xea\x25\x42\xd5\x76\x3d\x90\x6d\xed\x9d\xd5\xec\x38\x29\x8d\xf8\xef\x95\x8d\x01\x63\x17\x08\x52\x4f\x5d\x1f\xbc\x9a\x79\x6f\x66\xde\xec\xee\xbc\xf4\x3c\xcf\xf3\xc4\x5b\xa7\x1e\x21\x97\x62\xec\x89\x47\x66\xeb\xc6\x51\xb4\xb1\x84\xb9\x34\x72\x09\x39\x18\x0e\xe5\xef\x82\x20\x54\x98\xd7\x3e\x17\x8d\xe2\xe4\x7d\x10\x27\x41\x9c\x44\x29\xd8\x0c\x57\x25\xee\x1e\x72\x9b\x49\x86\xf0\x87\x43\xf3\x46\x0c\x37\x19\x14\x1a\x06\xc3\x5f\x81\x9c\x46\x53\x26\x4a\xc2\xb8\xfc\xb6\x00\x02\x87\x05\x29\x70\x62\xec\x3d\x54\xa6\x72\xbd\xec\x76\x15\xc8\x12\x5a\x20\xd6\x15\xea\xd0\x57\xf9\x1d\xa8\x82\x34\xaf\x6e\x8b\xac\x15\xa8\xb9\xba\xc4\xd7\x26\x68\x63\x19\x15\x66\xa5\x98\x7b\x65\x6b\x21\x47\xe1\x1b\x79\x33\x24\xbe\x95\x66\x09\x25\xeb\xdd\x39\x4e\x0a\x8e\xb5\x91\xac\xd1\x1c\x10\xaf\xaf\xaf\x5e\x97\x6e\x92\xa6\x04\xce\xcd\x08\x16\xfa\xd7\xa5\x29\x2f\x27\x4b\xa5\xc0\x95\xad\x13\x93\x2c\xc3\xe7\x73\x70\x4b\x1a\xcb\xe3\x12\x63\x2f\x19\xc5\xe7\x0a\xd3\x04\x8a\xeb\xcb\x33\x35\xdf\xb1\x30\xa9\x38\x4a\x59\x1f\x8f\x26\x8c\xcc\xab\x2e\x92\xfd\xa6\xcd\xdf\x43\xac\x3b\xd6\x79\xef\x44\xf8\x46\xc8\xc0\xb8\x65\x4b\xb7\xe0\x95\xad\xbc\x37\x5a\x11\x3a\x5c\x70\xf8\x05\xf8\x19\xe9\x67\x64\x36\xff\xbb\xfa\xde\x7e\x26\x2c\xac\x6b\xd3\x33\x54\x72\x2b\xfc\x61\xfb\x4e\x2a\x68\x7f\x10\x6e\x9d\xf3\x36\x4b\x5a\xdd\x78\x6d\xa3\x38\xf9\x14\xc4\x1f\x82\x38\xd9\x0b\x6e\x88\x38\xf9\xce\x4e\x88\xb5\xf0\x5f\xe8\x6d\x28\xd2\x29\x18\x2e\xef\xe4\x3f\x29\xaa\xdb\x89\x9b\x6a\xa0\xa6\xd3\x3a\x4d\x54\x38\xa0\x89\x73\x7a\x69\x76\xc6\xb2\xed\xe7\xc4\x7d\x0c\x92\x24\xb8\x8a\x1b\xe2\xaa\xdd\xbc\x9e\xa6\x58\xb0\x2d\xf8\x70\x88\x09\xb2\x77\x40\x4f\x5a\xc1\x8c\xb4\x51\xda\xca\x6c\x9a\x76\xc6\xdc\xae\x64\xc7\xa4\x4d\xe7\x68\x9f\x64\x56\x40\xdd\x83\x05\x10\x18\x05\xfd\x6d\x37\xa6\x69\xdf\xbf\x54\xa8\x3f\xf4\xfc\x46\xd7\xfd\xc1\xd0\xf3\xf7\xf2\xfc\x41\x68\xf7\xb5\xce\xdb\x6a\xd7\xbd\x75\xef\x4f\x00\x00\x00\xff\xff\x5b\xd1\xed\x61\xc2\x06\x00\x00")
+var _rpProductionNsgJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x54\x4d\x6f\xda\x40\x10\xbd\xf3\x2b\xac\x6d\x25\x43\x85\xbf\x48\xaa\xb6\xdc\x38\x55\x1c\x52\xa1\x24\xea\x25\x42\xd5\x76\x3d\x90\x6d\xed\x9d\xd5\xec\x38\x29\x8d\xf8\xef\x95\x8d\x01\x63\x17\x08\x87\x5e\xba\x3e\x78\x35\xf3\xde\xcc\xbc\xd9\xdd\x79\xe9\x79\x9e\xe7\x89\xb7\x4e\x3d\x42\x2e\xc5\xd8\x13\x8f\xcc\xd6\x8d\xa3\x68\x63\x09\x73\x69\xe4\x12\x72\x30\x1c\xca\xdf\x05\x41\xa8\x30\xaf\x7d\x2e\x1a\xc5\xc9\xfb\x20\x4e\x82\x38\x89\x52\xb0\x19\xae\x4a\xdc\x3d\xe4\x36\x93\x0c\xe1\x0f\x87\xe6\x8d\x18\x6e\x32\x28\x34\x0c\x86\xbf\x02\x39\x8d\xa6\x4c\x94\x84\x71\xf9\x6d\x01\x04\x0e\x0b\x52\xe0\xc4\xd8\x7b\xa8\x4c\xe5\x7a\xd9\xed\x2a\x90\x25\xb4\x40\xac\x2b\xd4\xa1\xaf\xf2\x3b\x50\x05\x69\x5e\xdd\x16\x59\x2b\x50\x73\x75\x89\xaf\x4d\xd0\xc6\x32\x2a\xcc\x4a\x31\xf7\xca\xd6\x42\x8e\xc2\x37\xf2\x66\x48\x7c\x2b\xcd\x12\x4a\xd6\xbb\x73\x9c\x14\x1c\x6b\x23\x59\xa3\x39\x20\x5e\x5f\x5f\xbd\x2e\xdd\x24\x4d\x09\x9c\x9b\x11\x2c\xf4\xaf\x4b\x53\x5e\x4e\x96\x4a\x81\x2b\x5b\x27\x26\x59\x86\xcf\xe7\xe0\x96\x34\x96\xc7\x25\xc6\x5e\x32\x8a\xcf\x15\xa6\x09\x14\xd7\x97\x67\x6a\xbe\x63\x61\x52\x71\x94\xb2\x3e\x1e\x4d\x18\x99\x57\x5d\x24\xfb\x4d\x9b\xbf\x87\x58\x77\xac\xf3\xde\x89\xf0\x8d\x90\x81\x71\xcb\x96\x6e\xc1\x2b\x5b\x79\x6f\xb4\x22\x74\xb8\xe0\xf0\x0b\xf0\x33\xd2\xcf\xc8\x6c\xfe\x77\xf5\xbd\xfd\x4c\x58\x58\xd7\xa6\x67\xa8\xe4\x56\xf8\xc3\xf6\x9d\x54\xd0\xfe\x20\xdc\x3a\xe7\x6d\x96\xb4\xba\xf1\xda\x46\x71\xf2\x29\x88\x3f\x04\x71\xb2\x17\xdc\x10\x71\xf2\x9d\x9d\x10\x6b\xe1\xbf\xd0\xdb\x2d\xf8\xa6\x9a\x7b\xe9\x34\x05\xc3\x9a\x57\x51\xe1\x80\x26\xce\xe9\xa5\xd9\x19\xcb\xee\x1c\xef\x8c\xae\x99\xff\x48\xdc\xc7\x20\x49\x82\xab\xb8\x21\xae\xda\xcd\xeb\x69\x8a\x05\xdb\x82\x0f\x87\x98\x20\x7b\x07\xf4\xa4\x15\xcc\x48\x1b\xa5\xad\xcc\xa6\x69\x67\xcc\xed\x7a\xe1\x98\xb4\xe9\x1c\xed\x93\xcc\x0a\xa8\x6b\x5f\x00\x81\x51\xd0\xdf\xaa\x98\xa6\x7d\xff\xd2\x0e\xfa\x43\xcf\x6f\x74\xcb\x1f\x0c\x3d\x7f\x2f\xcf\x1f\x84\x76\x5f\xeb\xbc\xad\x76\xdd\x5b\xf7\xfe\x04\x00\x00\xff\xff\xe5\x22\xa0\x27\xc2\x06\x00\x00")
 
 func rpProductionNsgJsonBytes() ([]byte, error) {
 	return bindataRead(
diff --git a/pkg/deploy/generator/resources.go b/pkg/deploy/generator/resources.go
index 144d358ec..d9845715b 100644
--- a/pkg/deploy/generator/resources.go
+++ b/pkg/deploy/generator/resources.go
@@ -23,9 +23,9 @@ import (
 func (g *generator) managedIdentity() *arm.Resource {
 	return &arm.Resource{
 		Resource: &mgmtmsi.Identity{
+			Type:     "Microsoft.ManagedIdentity/userAssignedIdentities",
 			Name:     to.StringPtr("rp-identity"),
 			Location: to.StringPtr("[resourceGroup().location]"),
-			Type:     "Microsoft.ManagedIdentity/userAssignedIdentities",
 		},
 		APIVersion: apiVersions["msi"],
 	}