diff --git a/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationEnvVarsTable.tsx b/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationEnvVarsTable.tsx
index 19ff4967f..5c2ac907e 100644
--- a/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationEnvVarsTable.tsx
+++ b/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationEnvVarsTable.tsx
@@ -1,4 +1,4 @@
-import { Pod } from 'kubernetes-types/core/v1';
+import { EnvVar, Pod } from 'kubernetes-types/core/v1';
 import { Asterisk, File, FileCode, Key, Lock } from 'lucide-react';
 
 import { Icon } from '@@/Icon';
@@ -44,7 +44,7 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
                   {envVar.isInitContainer && (
                     <span>
                       <Icon icon={Asterisk} className="!ml-1" />
-                      {envVar.fieldPath} (
+                      {envVar.valueFrom?.fieldRef?.fieldPath} (
                       <a
                         href="https://kubernetes.io/docs/concepts/workloads/pods/init-containers/"
                         target="_blank"
@@ -56,13 +56,13 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
                     </span>
                   )}
                 </td>
-                <td data-cy="k8sAppDetail-envVarName">{envVar.key || '-'}</td>
+                <td data-cy="k8sAppDetail-envVarName">{envVar.name}</td>
                 <td data-cy="k8sAppDetail-envVarValue">
                   {envVar.value && <span>{envVar.value}</span>}
-                  {envVar.fieldPath && (
+                  {envVar.valueFrom?.fieldRef?.fieldPath && (
                     <span>
                       <Icon icon={Asterisk} className="!ml-1" />
-                      {envVar.fieldPath} (
+                      {envVar.valueFrom.fieldRef.fieldPath} (
                       <a
                         href="https://kubernetes.io/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information/"
                         target="_blank"
@@ -73,36 +73,50 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
                       )
                     </span>
                   )}
-                  {envVar.key ? (
+                  {envVar.valueFrom?.secretKeyRef?.key && (
                     <span className="flex items-center">
                       <Icon icon={Key} className="!mr-1" />
-                      {envVar.key}
+                      {envVar.valueFrom.secretKeyRef.key}
                     </span>
-                  ) : (
-                    '-'
                   )}
+                  {envVar.valueFrom?.configMapKeyRef?.key && (
+                    <span className="flex items-center">
+                      <Icon icon={Key} className="!mr-1" />
+                      {envVar.valueFrom.configMapKeyRef.key}
+                    </span>
+                  )}
+                  {!envVar.value && !envVar.valueFrom && <span>-</span>}
                 </td>
                 <td data-cy="k8sAppDetail-configName">
-                  {!envVar.resourseName && <span>-</span>}
-                  {envVar.resourseName && (
+                  {!envVar.valueFrom?.configMapKeyRef?.name &&
+                    !envVar.valueFrom?.secretKeyRef?.name && <span>-</span>}
+                  {envVar.valueFrom?.configMapKeyRef && (
                     <span>
                       <Link
-                        to={
-                          envVar.type === 'configMap'
-                            ? 'kubernetes.configmaps.configmap'
-                            : 'kubernetes.secrets.secret'
-                        }
+                        to="kubernetes.configmaps.configmap"
                         params={{
-                          name: envVar.resourseName,
+                          name: envVar.valueFrom.configMapKeyRef.name,
                           namespace,
                         }}
                         className="flex items-center"
                       >
-                        <Icon
-                          icon={envVar.type === 'configMap' ? FileCode : Lock}
-                          className="!mr-1"
-                        />
-                        {envVar.resourseName}
+                        <Icon icon={FileCode} className="!mr-1" />
+                        {envVar.valueFrom.configMapKeyRef.name}
+                      </Link>
+                    </span>
+                  )}
+                  {envVar.valueFrom?.secretKeyRef && (
+                    <span>
+                      <Link
+                        to="kubernetes.secrets.secret"
+                        params={{
+                          name: envVar.valueFrom.secretKeyRef.name,
+                          namespace,
+                        }}
+                        className="flex items-center"
+                      >
+                        <Icon icon={Lock} className="!mr-1" />
+                        {envVar.valueFrom.secretKeyRef.name}
                       </Link>
                     </span>
                   )}
@@ -116,14 +130,9 @@ export function ApplicationEnvVarsTable({ namespace, app }: Props) {
   );
 }
 
-interface ContainerEnvVar {
-  key?: string;
-  value?: string;
-  fieldPath?: string;
+interface ContainerEnvVar extends EnvVar {
   containerName: string;
   isInitContainer: boolean;
-  type: 'configMap' | 'secret';
-  resourseName: string;
 }
 
 function getApplicationEnvironmentVariables(
@@ -141,60 +150,23 @@ function getApplicationEnvironmentVariables(
 
   // get all the environment variables for each container
   const appContainersEnvVars =
-    appContainers?.flatMap((container) => {
-      const containerEnvVars: ContainerEnvVar[] =
+    appContainers?.flatMap(
+      (container) =>
         container?.env?.map((envVar) => ({
-          key: envVar?.name,
-          fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
+          ...envVar,
           containerName: container.name,
           isInitContainer: false,
-          type: envVar?.valueFrom?.configMapKeyRef ? 'configMap' : 'secret',
-          resourseName:
-            envVar?.valueFrom?.configMapKeyRef?.name ||
-            envVar?.valueFrom?.secretKeyRef?.name ||
-            '',
-        })) || [];
-
-      const containerEnvFroms: ContainerEnvVar[] =
-        container?.envFrom?.map((envFrom) => ({
-          name: '',
-          resourseName:
-            envFrom?.configMapRef?.name || envFrom?.secretRef?.name || '',
-          containerName: container.name,
-          isInitContainer: false,
-          type: envFrom?.configMapRef ? 'configMap' : 'secret',
-        })) || [];
-
-      return [...containerEnvVars, ...containerEnvFroms];
-    }) || [];
-
+        })) || []
+    ) || [];
   const appInitContainersEnvVars =
-    appInitContainers?.flatMap((container) => {
-      const containerEnvVars: ContainerEnvVar[] =
+    appInitContainers?.flatMap(
+      (container) =>
         container?.env?.map((envVar) => ({
-          key: envVar?.name,
-          fieldPath: envVar?.valueFrom?.fieldRef?.fieldPath,
+          ...envVar,
           containerName: container.name,
-          isInitContainer: false,
-          type: envVar?.valueFrom?.configMapKeyRef ? 'configMap' : 'secret',
-          resourseName:
-            envVar?.valueFrom?.configMapKeyRef?.name ||
-            envVar?.valueFrom?.secretKeyRef?.name ||
-            '',
-        })) || [];
-
-      const containerEnvFroms: ContainerEnvVar[] =
-        container?.envFrom?.map((envFrom) => ({
-          name: '',
-          resourseName:
-            envFrom?.configMapRef?.name || envFrom?.secretRef?.name || '',
-          containerName: container.name,
-          isInitContainer: false,
-          type: envFrom?.configMapRef ? 'configMap' : 'secret',
-        })) || [];
-
-      return [...containerEnvVars, ...containerEnvFroms];
-    }) || [];
+          isInitContainer: true,
+        })) || []
+    ) || [];
 
   return [...appContainersEnvVars, ...appInitContainersEnvVars];
 }
diff --git a/app/react/kubernetes/applications/application.service.ts b/app/react/kubernetes/applications/application.service.ts
index 22db69be7..ac04f2d04 100644
--- a/app/react/kubernetes/applications/application.service.ts
+++ b/app/react/kubernetes/applications/application.service.ts
@@ -250,12 +250,7 @@ async function getApplicationsByKind<T extends ApplicationList>(
     const { data } = await axios.get<T>(
       buildUrl(environmentId, namespace, `${appKind}s`)
     );
-    const items = (data.items || []).map((app) => ({
-      ...app,
-      kind: appKind,
-      apiVersion: data.apiVersion,
-    }));
-    return items as T['items'];
+    return data.items as T['items'];
   } catch (e) {
     throw parseAxiosError(e as Error, `Unable to retrieve ${appKind}s`);
   }
diff --git a/app/react/kubernetes/applications/pod.service.ts b/app/react/kubernetes/applications/pod.service.ts
index 5d53a9e55..f53c95d6d 100644
--- a/app/react/kubernetes/applications/pod.service.ts
+++ b/app/react/kubernetes/applications/pod.service.ts
@@ -19,15 +19,7 @@ export async function getNamespacePods(
         },
       }
     );
-    const items = (data.items || []).map(
-      (pod) =>
-        <Pod>{
-          ...pod,
-          kind: 'Pod',
-          apiVersion: data.apiVersion,
-        }
-    );
-    return items;
+    return data.items;
   } catch (e) {
     throw parseAxiosError(e as Error, 'Unable to retrieve pods');
   }
diff --git a/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/utils.ts b/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/utils.ts
index 343b89278..844c3f38c 100644
--- a/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/utils.ts
+++ b/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/utils.ts
@@ -14,16 +14,12 @@ export function getIsConfigMapInUse(
       ? app?.spec
       : app?.spec?.template?.spec;
 
-    const hasEnvVarReference = appSpec?.containers.some((container) => {
-      const valueFromEnv = container.env?.some(
+    const hasEnvVarReference = appSpec?.containers.some((container) =>
+      container.env?.some(
         (envVar) =>
           envVar.valueFrom?.configMapKeyRef?.name === configMap.metadata?.name
-      );
-      const envFromEnv = container.envFrom?.some(
-        (envVar) => envVar.configMapRef?.name === configMap.metadata?.name
-      );
-      return valueFromEnv || envFromEnv;
-    });
+      )
+    );
     const hasVolumeReference = appSpec?.volumes?.some(
       (volume) => volume.configMap?.name === configMap.metadata?.name
     );
diff --git a/app/react/kubernetes/configs/ListView/SecretsDatatable/utils.ts b/app/react/kubernetes/configs/ListView/SecretsDatatable/utils.ts
index b6d1d015d..ca4546b52 100644
--- a/app/react/kubernetes/configs/ListView/SecretsDatatable/utils.ts
+++ b/app/react/kubernetes/configs/ListView/SecretsDatatable/utils.ts
@@ -11,16 +11,12 @@ export function getIsSecretInUse(secret: Secret, applications: Application[]) {
       ? app?.spec
       : app?.spec?.template?.spec;
 
-    const hasEnvVarReference = appSpec?.containers.some((container) => {
-      const valueFromEnv = container.env?.some(
+    const hasEnvVarReference = appSpec?.containers.some((container) =>
+      container.env?.some(
         (envVar) =>
           envVar.valueFrom?.secretKeyRef?.name === secret.metadata?.name
-      );
-      const envFromEnv = container.envFrom?.some(
-        (envVar) => envVar.secretRef?.name === secret.metadata?.name
-      );
-      return valueFromEnv || envFromEnv;
-    });
+      )
+    );
     const hasVolumeReference = appSpec?.volumes?.some(
       (volume) => volume.secret?.secretName === secret.metadata?.name
     );