diff --git a/Solutions/ProofPointTap/Package/3.1.1.zip b/Solutions/ProofPointTap/Package/3.1.1.zip
index 8601cd69878..53a187c1075 100644
Binary files a/Solutions/ProofPointTap/Package/3.1.1.zip and b/Solutions/ProofPointTap/Package/3.1.1.zip differ
diff --git a/Solutions/ProofPointTap/Package/mainTemplate.json b/Solutions/ProofPointTap/Package/mainTemplate.json
index 019b5521e7a..5713cc7aaef 100644
--- a/Solutions/ProofPointTap/Package/mainTemplate.json
+++ b/Solutions/ProofPointTap/Package/mainTemplate.json
@@ -126,7 +126,12 @@
     "playbookId4": "[resourceId('Microsoft.Logic/workflows', variables('playbookContentId4'))]",
     "playbookTemplateSpecName4": "[concat(parameters('workspace'),'/Microsoft.SecurityInsights/',concat(parameters('workspace'),'-pl-',uniquestring(variables('_playbookContentId4'))))]",
     "_playbookcontentProductId4": "[concat(take(variables('_solutionId'),50),'-','pl','-', uniqueString(concat(variables('_solutionId'),'-','Playbook','-',variables('_playbookContentId4'),'-', variables('playbookVersion4'))))]",
-    "_solutioncontentProductId": "[concat(take(variables('_solutionId'),50),'-','sl','-', uniqueString(concat(variables('_solutionId'),'-','Solution','-',variables('_solutionId'),'-', variables('_solutionVersion'))))]"
+    "_solutioncontentProductId": "[concat(take(variables('_solutionId'),50),'-','sl','-', uniqueString(concat(variables('_solutionId'),'-','Solution','-',variables('_solutionId'),'-', variables('_solutionVersion'))))]",
+     "operation": "getCampaignById",
+     "operation1": "getVAP",
+     "operation2": "getForensics",
+     "operation3": "getTopClickers",
+     "operation4": "decodeURL"
   },
   "resources": [
     {
@@ -2196,16 +2201,6 @@
             }
           },
           "variables": {
-            "operationId-getCampaignById": "getCampaignById",
-            "_operationId-getCampaignById": "[[variables('operationId-getCampaignById')]",
-            "operationId-getVAP": "getVAP",
-            "_operationId-getVAP": "[[variables('operationId-getVAP')]",
-            "operationId-getForensics": "getForensics",
-            "_operationId-getForensics": "[[variables('operationId-getForensics')]",
-            "operationId-getTopClickers": "getTopClickers",
-            "_operationId-getTopClickers": "[[variables('operationId-getTopClickers')]",
-            "operationId-decodeURL": "decodeURL",
-            "_operationId-decodeURL": "[[variables('operationId-decodeURL')]",
             "workspace-location-inline": "[concat('[resourceGroup().locatio', 'n]')]",
             "playbookContentId1": "ProofpointTAPConnector",
             "playbookId1": "[[resourceId('Microsoft.Web/customApis', parameters('customApis_ProofpointTAP_name'))]",
@@ -2274,7 +2269,7 @@
                       "get": {
                         "summary": "Get Campaign by Id",
                         "description": "Fetch detailed information for a given campaign.",
-                        "operationId": "[[variables('_operationId-getCampaignById')]",
+                        "operationId": "[[variables('operation')]",
                         "produces": [
                           "application/json"
                         ],
@@ -2476,7 +2471,7 @@
                       "get": {
                         "summary": "Get Very Attacked People",
                         "description": "Fetch the identities and attack index breakdown of Very Attacked People within your organization for a given period.",
-                        "operationId": "[[variables('_operationId-getVAP')]",
+                        "operationId": "[[variables('operation1')]",
                         "produces": [
                           "application/json"
                         ],
@@ -2830,7 +2825,7 @@
                         },
                         "summary": "Get Forensics",
                         "description": "Fetch forensic information for a given threat or campaign.",
-                        "operationId": "[[variables('_operationId-getForensics')]",
+                        "operationId": "[[variables('operation2')]",
                         "parameters": [
                           {
                             "name": "campaignId",
@@ -2966,7 +2961,7 @@
                         },
                         "summary": "Get top clickers",
                         "description": "Fetch the identities and attack index of the top clickers within your organization for a given period. Top clickers are the users who have demonstrated a tendency to click on malicious URLs, regardless of whether the clicks were blocked or not. Knowing who are more susceptible to threats is useful for proactive security approaches such as security training assignments.",
-                        "operationId": "[[variables('_operationId-getTopClickers')]",
+                        "operationId": "[[variables('operation3')]",
                         "parameters": [
                           {
                             "name": "window",
@@ -3058,7 +3053,7 @@
                         },
                         "summary": "Decode URL",
                         "description": "Decodes one or more URLs. Available fields in results vary, depending on if the request is authenticated.",
-                        "operationId": "[[variables('_operationId-decodeURL')]",
+                        "operationId": "[[variables('operation4')]",
                         "parameters": [
                           {
                             "name": "Content-Type",