diff --git a/src/AzureIoTHub.Portal.Infrastructure/AzureIoTHub.Portal.Infrastructure.csproj b/src/AzureIoTHub.Portal.Infrastructure/AzureIoTHub.Portal.Infrastructure.csproj
index b6e39fc6a..7a690e7d6 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/AzureIoTHub.Portal.Infrastructure.csproj
+++ b/src/AzureIoTHub.Portal.Infrastructure/AzureIoTHub.Portal.Infrastructure.csproj
@@ -32,66 +32,19 @@
     <None Remove="RouterConfigFiles\US_902_928_FSB_8.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="RouterConfigFiles\AS_923_925_1.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AS_923_925_2.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AS_923_925_3.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_1.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_2.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_3.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_4.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_5.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_6.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_7.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="RouterConfigFiles\AU_915_928_FSB_8.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Resources\default-template-icon.png" />
+    <EmbeddedResource Include="RouterConfigFiles\AS_923_925_1.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AS_923_925_2.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AS_923_925_3.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_1.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_2.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_3.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_4.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_5.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_6.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_7.json" />
+    <EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_8.json" />
     <EmbeddedResource Include="RouterConfigFiles\CN_470_510_RP1.json" />
     <EmbeddedResource Include="RouterConfigFiles\CN_470_510_RP2.json" />
     <EmbeddedResource Include="RouterConfigFiles\EU_863_870.json" />
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_1.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_1.json
index 53e07d389..fdf9624a7 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_1.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_1.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AS923",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AS923",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 923500000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 924300000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 500000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": 200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 923500000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 924300000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 500000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": 200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_2.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_2.json
index cdda0f493..181b0813c 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_2.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_2.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AS923",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AS923",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 921700000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 922500000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": 200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 921700000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 922500000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": 200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_3.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_3.json
index a139dd419..4e8f4f0c5 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_3.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_3.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AS923",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AS923",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 916900000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 917700000
-        },
-        "chan_FSK": {
-          "enable": false,
-          "radio": 1,
-          "if": 500000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": 200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 916900000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 917700000
+      },
+      "chan_FSK": {
+        "enable": false,
+        "radio": 1,
+        "if": 500000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": 200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_1.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_1.json
index 1cd81fa81..380b478c4 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_1.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_1.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 915500000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 916300000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 915500000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 916300000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_2.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_2.json
index 49272693c..7d68250f6 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_2.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_2.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 917100000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 917900000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 917100000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 917900000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_3.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_3.json
index 43280c37c..22fed409a 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_3.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_3.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 918700000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 919500000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 918700000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 919500000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_4.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_4.json
index d8f891c2e..ec72f5759 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_4.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_4.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 920300000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 921100000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 920300000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 921100000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_5.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_5.json
index 037a717f9..7903a2398 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_5.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_5.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 921900000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 922700000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 921900000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 922700000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_6.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_6.json
index d1aa70038..c437fb647 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_6.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_6.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 923500000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 924300000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 923500000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 924300000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_7.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_7.json
index d0f9dfbd7..c17b75a13 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_7.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_7.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 925100000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 925900000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 925100000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 925900000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }
diff --git a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_8.json b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_8.json
index 6e5269afe..56e709e5c 100644
--- a/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_8.json
+++ b/src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AU_915_928_FSB_8.json
@@ -1,128 +1,116 @@
 {
-  "routerConfig": {
-    "NetID": [
-      1
+  "NetID": [
+    1
+  ],
+  "JoinEui": [],
+  "region": "AU915",
+  "hwspec": "sx1301/1",
+  "freq_range": [
+    915000000,
+    928000000
+  ],
+  "DRs": [
+    [
+      12,
+      125,
+      0
     ],
-    "JoinEui": [],
-    "region": "AU915",
-    "hwspec": "sx1301/1",
-    "freq_range": [
-      915000000,
-      928000000
+    [
+      11,
+      125,
+      0
     ],
-    "DRs": [
-      [
-        12,
-        125,
-        0
-      ],
-      [
-        11,
-        125,
-        0
-      ],
-      [
-        10,
-        125,
-        0
-      ],
-      [
-        9,
-        125,
-        0
-      ],
-      [
-        8,
-        125,
-        0
-      ],
-      [
-        7,
-        125,
-        0
-      ],
-      [
-        7,
-        250,
-        0
-      ]
+    [
+      10,
+      125,
+      0
     ],
-    "sx1301_conf": [
-      {
-        "radio_0": {
-          "enable": true,
-          "freq": 926700000
-        },
-        "radio_1": {
-          "enable": true,
-          "freq": 927500000
-        },
-        "chan_FSK": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_Lora_std": {
-          "enable": true,
-          "radio": 1,
-          "if": -200000,
-          "bandwidth": 250000,
-          "spread_factor": 7
-        },
-        "chan_multiSF_0": {
-          "enable": true,
-          "radio": 1,
-          "if": -300000
-        },
-        "chan_multiSF_1": {
-          "enable": true,
-          "radio": 1,
-          "if": -100000
-        },
-        "chan_multiSF_2": {
-          "enable": true,
-          "radio": 1,
-          "if": 100000
-        },
-        "chan_multiSF_3": {
-          "enable": true,
-          "radio": 1,
-          "if": 300000
-        },
-        "chan_multiSF_4": {
-          "enable": true,
-          "radio": 0,
-          "if": -300000
-        },
-        "chan_multiSF_5": {
-          "enable": true,
-          "radio": 0,
-          "if": -100000
-        },
-        "chan_multiSF_6": {
-          "enable": true,
-          "radio": 0,
-          "if": 100000
-        },
-        "chan_multiSF_7": {
-          "enable": true,
-          "radio": 0,
-          "if": 300000
-        }
-      }
+    [
+      9,
+      125,
+      0
+    ],
+    [
+      8,
+      125,
+      0
     ],
-    "nocca": true,
-    "nodc": true,
-    "nodwell": true,
-    "desiredTxParams": {
-      "downlinkDwellLimit": true,
-      "uplinkDwellLimit": true,
-      "eirp": 5
+    [
+      7,
+      125,
+      0
+    ],
+    [
+      7,
+      250,
+      0
+    ]
+  ],
+  "sx1301_conf": [
+    {
+      "radio_0": {
+        "enable": true,
+        "freq": 926700000
+      },
+      "radio_1": {
+        "enable": true,
+        "freq": 927500000
+      },
+      "chan_FSK": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_Lora_std": {
+        "enable": true,
+        "radio": 1,
+        "if": -200000,
+        "bandwidth": 250000,
+        "spread_factor": 7
+      },
+      "chan_multiSF_0": {
+        "enable": true,
+        "radio": 1,
+        "if": -300000
+      },
+      "chan_multiSF_1": {
+        "enable": true,
+        "radio": 1,
+        "if": -100000
+      },
+      "chan_multiSF_2": {
+        "enable": true,
+        "radio": 1,
+        "if": 100000
+      },
+      "chan_multiSF_3": {
+        "enable": true,
+        "radio": 1,
+        "if": 300000
+      },
+      "chan_multiSF_4": {
+        "enable": true,
+        "radio": 0,
+        "if": -300000
+      },
+      "chan_multiSF_5": {
+        "enable": true,
+        "radio": 0,
+        "if": -100000
+      },
+      "chan_multiSF_6": {
+        "enable": true,
+        "radio": 0,
+        "if": 100000
+      },
+      "chan_multiSF_7": {
+        "enable": true,
+        "radio": 0,
+        "if": 300000
+      }
     }
-  },
-  "desiredTxParams": {
-    "downlinkDwellLimit": true,
-    "uplinkDwellLimit": true,
-    "eirp": 5
-  }
+  ],
+  "nocca": true,
+  "nodc": true,
+  "nodwell": true
 }