diff --git a/createReport.py b/createReport.py
index f787713..2bb598d 100644
--- a/createReport.py
+++ b/createReport.py
@@ -55,12 +55,14 @@ def GatherReportingInfo(DTAPIToken, DTENV,friendlyName):
     strnow = now.strftime("%Y%m%d_%H%M")
     for entity in entityList:
         if any(tag["stringRepresentation"].startswith('[Kubernetes]app.bmwgroup.com/') for tag in entity["tags"]):
-            kubernetesttagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('[Kubernetes]app.bmwgroup.com/')), None)
             appidtagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('[Kubernetes]app-id')), None)
             appnametagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('app-name')), None)
             compassidtagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('compass-id')), None)
             msidtagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('[Kubernetes]ms-id')), None)
             row={'Kubernetes Tag':kubernetesttagval["stringRepresentation"],'AppId':appidtagval["value"],'AppName':appnametagval["value"],'CompassId':compassidtagval["value"],'MsId':msidtagval["value"],'ServiceName':entity['displayName'],'ServiceId':entity['entityId']}
+            for kubetag in entity["tags"]:
+                if(kubetag["key"].startsWith("app.bmwgroup.com/")):
+                    row.update({kubetag["key"]:kubetag["value"]})
             mgmt = mgmt.append(row,ignore_index=True)
     mgmt.to_csv(friendlyName + '_TaggedEntities_' + strnow +'.csv',encoding='utf-8')