diff --git a/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas.ts b/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas.ts
index 7d83096eb2..2a0f06d0e5 100644
--- a/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas.ts
+++ b/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas.ts
@@ -2,13 +2,13 @@ import { z } from "zod";
 
 import { PamResource } from "../pam-resource-enums";
 import {
+  BaseCreateGatewayPamResourceSchema,
   BaseCreatePamAccountSchema,
-  BaseCreatePamResourceSchema,
   BasePamAccountSchema,
   BasePamAccountSchemaWithResource,
   BasePamResourceSchema,
-  BaseUpdatePamAccountSchema,
-  BaseUpdatePamResourceSchema
+  BaseUpdateGatewayPamResourceSchema,
+  BaseUpdatePamAccountSchema
 } from "../pam-resource-schemas";
 import { KubernetesAuthMethod } from "./kubernetes-resource-enums";
 
@@ -57,12 +57,12 @@ export const SanitizedKubernetesResourceSchema = BaseKubernetesResourceSchema.ex
     .optional()
 });
 
-export const CreateKubernetesResourceSchema = BaseCreatePamResourceSchema.extend({
+export const CreateKubernetesResourceSchema = BaseCreateGatewayPamResourceSchema.extend({
   connectionDetails: KubernetesResourceConnectionDetailsSchema,
   rotationAccountCredentials: KubernetesAccountCredentialsSchema.nullable().optional()
 });
 
-export const UpdateKubernetesResourceSchema = BaseUpdatePamResourceSchema.extend({
+export const UpdateKubernetesResourceSchema = BaseUpdateGatewayPamResourceSchema.extend({
   connectionDetails: KubernetesResourceConnectionDetailsSchema.optional(),
   rotationAccountCredentials: KubernetesAccountCredentialsSchema.nullable().optional()
 });
diff --git a/frontend/src/pages/pam/PamSessionsByIDPage/components/PamSessionLogsSection.tsx b/frontend/src/pages/pam/PamSessionsByIDPage/components/PamSessionLogsSection.tsx
index d9ce839415..5c2c35168a 100644
--- a/frontend/src/pages/pam/PamSessionsByIDPage/components/PamSessionLogsSection.tsx
+++ b/frontend/src/pages/pam/PamSessionsByIDPage/components/PamSessionLogsSection.tsx
@@ -56,7 +56,7 @@ export const PamSessionLogsSection = ({ session }: Props) => {
           </div>
         </div>
       )}
-      {!hasLogs && (
+      {!hasLogs && !isAwsIamSession && (
         <div className="text-bunker-300 flex grow items-center justify-center">
           <div className="text-center">
             <div className="mb-2">Session logs are not yet available</div>