diff --git a/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java b/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java
index 4cd545dc..22b9114d 100644
--- a/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java
+++ b/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java
@@ -99,6 +99,7 @@ public class ManifestService {
         LogManifestDifference(newManifestCopy, oldManifest);
         newManifest.addRedactedValuesToSecrets();
         newManifest.addRedactedValuesToSuperSecrets();
+        newManifest.setInfraVertical(portalVertical);
         manifestResponse.setManifest(newManifest);
         kubernetesManifestService.generateManifestsAndApply(manifestResponse.getManifest());
         return manifestResponse;
diff --git a/src/test/resources/fixtures/kube_objects/kube_object_1.json b/src/test/resources/fixtures/kube_objects/kube_object_1.json
index b4dda6c3..d8048ebe 100644
--- a/src/test/resources/fixtures/kube_objects/kube_object_1.json
+++ b/src/test/resources/fixtures/kube_objects/kube_object_1.json
@@ -9,7 +9,10 @@
         "name" : "test-app-navi-service-secret",
         "labels" : {
           "app" : "navi-service",
-          "owner" : "Infra",
+          "Owner" : "medici",
+          "Environment": "dev",
+          "Team": "Infra",
+          "Name": "test-app",
           "micrometer-prometheus" : "enabled",
           "release" : "test-app",
           "heritage" : "NaviDeploymentManifest",
@@ -37,7 +40,10 @@
         },
         "labels" : {
           "app" : "navi-service",
-          "owner" : "Infra",
+          "Owner" : "medici",
+          "Environment": "dev",
+          "Team": "Infra",
+          "Name": "test-app",
           "micrometer-prometheus" : "enabled",
           "release" : "test-app",
           "heritage" : "NaviDeploymentManifest",
@@ -69,7 +75,10 @@
         "name" : "test-app-navi-service",
         "labels" : {
           "app" : "navi-service",
-          "owner" : "Infra",
+          "Owner" : "medici",
+          "Environment": "dev",
+          "Team": "Infra",
+          "Name": "test-app",
           "micrometer-prometheus" : "enabled",
           "release" : "test-app",
           "heritage" : "NaviDeploymentManifest",
@@ -87,7 +96,10 @@
             },
             "labels" : {
               "app" : "navi-service",
-              "owner" : "Infra",
+              "Owner" : "medici",
+              "Environment": "dev",
+              "Team": "Infra",
+              "Name": "test-app",
               "micrometer-prometheus" : "enabled",
               "release" : "test-app",
               "heritage" : "NaviDeploymentManifest",
@@ -239,7 +251,10 @@
         },
         "labels" : {
           "app" : "navi-service",
-          "owner" : "Infra",
+          "Owner" : "medici",
+          "Environment": "dev",
+          "Team": "Infra",
+          "Name": "test-app",
           "micrometer-prometheus" : "enabled",
           "release" : "test-app",
           "heritage" : "NaviDeploymentManifest",
@@ -263,7 +278,18 @@
       }
     }, {
       "metadata" : {
-        "name" : "test-app-navi-service-pdb"
+        "name" : "test-app-navi-service-pdb",
+        "labels" : {
+          "app" : "navi-service",
+          "Owner" : "medici",
+          "Environment": "dev",
+          "Team": "Infra",
+          "Name": "test-app",
+          "micrometer-prometheus" : "enabled",
+          "release" : "test-app",
+          "heritage" : "NaviDeploymentManifest",
+          "chart" : "navi-service-0.0.1"
+        }
       },
       "apiVersion" : "policy/v1beta1",
       "kind" : "PodDisruptionBudget",
@@ -281,7 +307,10 @@
         "name" : "test-app-navi-service",
         "labels" : {
           "app" : "navi-service",
-          "owner" : "Infra",
+          "Owner" : "medici",
+          "Environment": "dev",
+          "Team": "Infra",
+          "Name": "test-app",
           "micrometer-prometheus" : "enabled",
           "role" : "alert-rules",
           "release" : "test-app",
@@ -366,7 +395,10 @@
         "annotations" : { },
         "labels" : {
           "app" : "navi-service",
-          "owner" : "Infra",
+          "Owner" : "medici",
+          "Environment": "dev",
+          "Team": "Infra",
+          "Name": "test-app",
           "micrometer-prometheus" : "enabled",
           "release" : "test-app",
           "heritage" : "NaviDeploymentManifest",
diff --git a/src/test/resources/fixtures/manifest/expected_output/dev-testapp-update.json b/src/test/resources/fixtures/manifest/expected_output/dev-testapp-update.json
index a60c738f..de4fe86a 100644
--- a/src/test/resources/fixtures/manifest/expected_output/dev-testapp-update.json
+++ b/src/test/resources/fixtures/manifest/expected_output/dev-testapp-update.json
@@ -180,7 +180,7 @@
     ],
     "timeout": 1500
   },
-  "infraVertical": null,
+  "infraVertical": "lending",
   "team": {
     "name": "Infra"
   },
diff --git a/templates/common.jsonnet b/templates/common.jsonnet
index fd6f2168..b66c0618 100644
--- a/templates/common.jsonnet
+++ b/templates/common.jsonnet
@@ -9,7 +9,10 @@ local deployment_manifest = import 'deployment_manifest.jsonnet';
       chart: chart.service_chart,
       heritage: 'NaviDeploymentManifest',
       release: deployment_manifest.deployment.name,
-      owner: deployment_manifest.team.name,
+      Team: deployment_manifest.team.name,
+      Environment: deployment_manifest.environment,
+      Name: deployment_manifest.deployment.name,
+      Owner: if deployment_manifest.infraVertical == 'lending' then 'medici' else 'gi'
     },
 
   matchLabels::
diff --git a/templates/pdb.jsonnet b/templates/pdb.jsonnet
index 014a63c6..1231af0d 100644
--- a/templates/pdb.jsonnet
+++ b/templates/pdb.jsonnet
@@ -7,6 +7,7 @@ if deployment_manifest.deployment.instance.count > 1 then {
   kind: 'PodDisruptionBudget',
   metadata: {
     name: chart.full_service_name(deployment_manifest.deployment.name) + '-pdb',
+    labels: common.labels
   },
   spec: {
     maxUnavailable: '15%',