diff --git a/cluster-stamp.json b/cluster-stamp.json
index a2abdc48..04f9b785 100644
--- a/cluster-stamp.json
+++ b/cluster-stamp.json
@@ -763,7 +763,8 @@
             "apiVersion": "2018-04-16",
             "location": "[parameters('location')]",
             "dependsOn": [
-                "[resourceId('Microsoft.OperationsManagement/solutions',variables('containerInsightsSolutionName'))]"
+                "[resourceId('Microsoft.OperationsManagement/solutions',variables('containerInsightsSolutionName'))]",
+                "[resourceId('Microsoft.OperationalInsights/workspaces', variables('logAnalyticsWorkspaceName'))]"
             ],
             "properties": {
                 "description": "Alert on pod Failed phase.",
@@ -839,24 +840,6 @@
                 "publisher": "Microsoft"
             }
         },
-        {
-            "type": "Microsoft.OperationsManagement/solutions",
-            "apiVersion": "2015-11-01-preview",
-            "name": "[concat('AzureAppGatewayAnalytics(', variables('logAnalyticsWorkspaceName'),')')]",
-            "location": "[parameters('location')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.OperationalInsights/workspaces', variables('logAnalyticsWorkspaceName'))]"
-            ],
-            "properties": {
-                "workspaceResourceId": "[resourceId('Microsoft.OperationalInsights/workspaces', variables('logAnalyticsWorkspaceName'))]"
-            },
-            "plan": {
-                "name": "[concat('AzureAppGatewayAnalytics(', variables('logAnalyticsWorkspaceName'),')')]",
-                "product": "OMSGallery/AzureAppGatewayAnalytics",
-                "promotionCode": "",
-                "publisher": "Microsoft"
-            }
-        },
         {
             "type": "Microsoft.OperationsManagement/solutions",
             "apiVersion": "2015-11-01-preview",
diff --git a/networking/hub-regionA.json b/networking/hub-regionA.json
index 94e60a69..877e4133 100644
--- a/networking/hub-regionA.json
+++ b/networking/hub-regionA.json
@@ -819,44 +819,6 @@
                                             "123"
                                         ]
                                     },
-                                    {
-                                        "ruleType": "NetworkRule",
-                                        "name": "tunnelfront-pod-tcp",
-                                        "ipProtocols": [
-                                            "TCP"
-                                        ],
-                                        "sourceAddresses": [],
-                                        "sourceIpGroups": [
-                                            "[resourceId('Microsoft.Network/ipGroups', variables('aksIpGroupName'))]"
-                                        ],
-                                        "destinationAddresses": [
-                                            "AzureCloud.eastus2"
-                                        ],
-                                        "destinationIpGroups": [],
-                                        "destinationFqdns": [],
-                                        "destinationPorts": [
-                                            "9000"
-                                        ]
-                                    },
-                                    {
-                                        "ruleType": "NetworkRule",
-                                        "name": "tunnelfront-pod-udp",
-                                        "ipProtocols": [
-                                            "UDP"
-                                        ],
-                                        "sourceAddresses": [],
-                                        "sourceIpGroups": [
-                                            "[resourceId('Microsoft.Network/ipGroups', variables('aksIpGroupName'))]"
-                                        ],
-                                        "destinationAddresses": [
-                                            "AzureCloud.eastus2"
-                                        ],
-                                        "destinationIpGroups": [],
-                                        "destinationFqdns": [],
-                                        "destinationPorts": [
-                                            "1194"
-                                        ]
-                                    },
                                     {
                                         "ruleType": "NetworkRule",
                                         "name": "pod-to-api-server",
@@ -868,7 +830,7 @@
                                             "[resourceId('Microsoft.Network/ipGroups', variables('aksIpGroupName'))]"
                                         ],
                                         "destinationAddresses": [
-                                            "AzureCloud.eastus2"
+                                            "[concat('AzureCloud.', parameters('location'))]"
                                         ],
                                         "destinationIpGroups": [],
                                         "destinationFqdns": [],