diff --git a/backend/src/ee/routes/v1/pam-account-routers/pam-account-router.ts b/backend/src/ee/routes/v1/pam-account-routers/pam-account-router.ts
index 74bd5eeb1..c0477312f 100644
--- a/backend/src/ee/routes/v1/pam-account-routers/pam-account-router.ts
+++ b/backend/src/ee/routes/v1/pam-account-routers/pam-account-router.ts
@@ -3,6 +3,7 @@ import { z } from "zod";
 import { PamFoldersSchema } from "@app/db/schemas";
 import { EventType } from "@app/ee/services/audit-log/audit-log-types";
 import { PamAccountOrderBy, PamAccountView } from "@app/ee/services/pam-account/pam-account-enums";
+import { SanitizedKubernetesAccountWithResourceSchema } from "@app/ee/services/pam-resource/kubernetes/kubernetes-resource-schemas";
 import { SanitizedMySQLAccountWithResourceSchema } from "@app/ee/services/pam-resource/mysql/mysql-resource-schemas";
 import { PamResource } from "@app/ee/services/pam-resource/pam-resource-enums";
 import { SanitizedPostgresAccountWithResourceSchema } from "@app/ee/services/pam-resource/postgres/postgres-resource-schemas";
@@ -18,7 +19,8 @@ import { AuthMode } from "@app/services/auth/auth-type";
 const SanitizedAccountSchema = z.union([
   SanitizedSSHAccountWithResourceSchema, // ORDER MATTERS
   SanitizedPostgresAccountWithResourceSchema,
-  SanitizedMySQLAccountWithResourceSchema
+  SanitizedMySQLAccountWithResourceSchema,
+  SanitizedKubernetesAccountWithResourceSchema
 ]);
 
 export const registerPamAccountRouter = async (server: FastifyZodProvider) => {
diff --git a/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-factory.ts b/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-factory.ts
index 14aefc243..3afad5ae2 100644
--- a/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-factory.ts
+++ b/backend/src/ee/services/pam-resource/kubernetes/kubernetes-resource-factory.ts
@@ -67,7 +67,6 @@ export const executeWithGateway = async <T>(
     async (proxyPort) => {
       const protocol = url.protocol === "https:" ? "https" : "http";
       const baseUrl = `${protocol}://localhost:${proxyPort}`;
-      // const baseUrl = `http://localhost:${proxyPort}`;
       return operation(baseUrl, httpsAgent);
     },
     {
@@ -149,7 +148,7 @@ export const kubernetesResourceFactory: TPamResourceFactory<
               });
 
               logger.info(
-                { serviceAccountName: credentials.serviceAccountName, namespace: connectionDetails.namespace },
+                { namespace: connectionDetails.namespace },
                 "[Kubernetes Resource Factory] Kubernetes service account token authentication successful"
               );
             } catch (error) {
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 67bef8be0..19da74823 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
@@ -30,7 +30,6 @@ export const KubernetesResourceConnectionDetailsSchema = z.object({
 
 export const KubernetesServiceAccountTokenCredentialsSchema = z.object({
   authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
-  serviceAccountName: z.string().trim().max(255),
   serviceAccountToken: z.string().trim().max(10000)
 });
 
@@ -48,8 +47,7 @@ export const SanitizedKubernetesResourceSchema = BaseKubernetesResourceSchema.ex
   rotationAccountCredentials: z
     .discriminatedUnion("authMethod", [
       z.object({
-        authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
-        serviceAccountName: z.string()
+        authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken)
       })
     ])
     .nullable()
@@ -82,8 +80,7 @@ export const UpdateKubernetesAccountSchema = BaseUpdatePamAccountSchema.extend({
 export const SanitizedKubernetesAccountWithResourceSchema = BasePamAccountSchemaWithResource.extend({
   credentials: z.discriminatedUnion("authMethod", [
     z.object({
-      authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
-      serviceAccountName: z.string()
+      authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken)
     })
   ])
 });
diff --git a/frontend/src/pages/pam/PamAccountsPage/components/PamAccountForm/KubernetesAccountForm.tsx b/frontend/src/pages/pam/PamAccountsPage/components/PamAccountForm/KubernetesAccountForm.tsx
new file mode 100644
index 000000000..875bee2a0
--- /dev/null
+++ b/frontend/src/pages/pam/PamAccountsPage/components/PamAccountForm/KubernetesAccountForm.tsx
@@ -0,0 +1,119 @@
+import { Controller, FormProvider, useForm, useFormContext } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+
+import { Button, FormControl, ModalClose, TextArea } from "@app/components/v2";
+import { KubernetesAuthMethod, TKubernetesAccount } from "@app/hooks/api/pam";
+import { UNCHANGED_PASSWORD_SENTINEL } from "@app/hooks/api/pam/constants";
+
+import { GenericAccountFields, genericAccountFieldsSchema } from "./GenericAccountFields";
+import { rotateAccountFieldsSchema } from "./RotateAccountFields";
+
+type Props = {
+  account?: TKubernetesAccount;
+  onSubmit: (formData: FormData) => Promise<void>;
+};
+
+const KubernetesServiceAccountTokenCredentialsSchema = z.object({
+  authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
+  serviceAccountToken: z.string().trim().min(1, "Service account token is required")
+});
+
+const formSchema = genericAccountFieldsSchema.extend(rotateAccountFieldsSchema.shape).extend({
+  credentials: KubernetesServiceAccountTokenCredentialsSchema
+});
+
+type FormData = z.infer<typeof formSchema>;
+
+const KubernetesAccountFields = ({ isUpdate }: { isUpdate: boolean }) => {
+  const { control } = useFormContext<FormData>();
+
+  return (
+    <div className="mb-4 rounded-sm border border-mineshaft-600 bg-mineshaft-700/70 p-3">
+      <Controller
+        name="credentials.serviceAccountToken"
+        control={control}
+        render={({ field, fieldState: { error } }) => (
+          <FormControl
+            className="mb-0"
+            errorText={error?.message}
+            isError={Boolean(error?.message)}
+            label="Service Account Token"
+            helperText="The bearer token for the service account"
+          >
+            <TextArea
+              {...field}
+              value={field.value === UNCHANGED_PASSWORD_SENTINEL ? "" : field.value || ""}
+              className="min-h-32 resize-y font-mono text-xs"
+              placeholder={
+                isUpdate && field.value === UNCHANGED_PASSWORD_SENTINEL
+                  ? "Token unchanged - click to update"
+                  : "eyJhbGciOiJSUzI1NiIsImtpZCI6..."
+              }
+            />
+          </FormControl>
+        )}
+      />
+    </div>
+  );
+};
+
+export const KubernetesAccountForm = ({ account, onSubmit }: Props) => {
+  const isUpdate = Boolean(account);
+
+  const form = useForm<FormData>({
+    resolver: zodResolver(formSchema),
+    defaultValues: account
+      ? {
+          ...account,
+          credentials: {
+            ...account.credentials,
+            serviceAccountToken: UNCHANGED_PASSWORD_SENTINEL
+          }
+        }
+      : {
+          name: "",
+          description: "",
+          credentials: {
+            authMethod: KubernetesAuthMethod.ServiceAccountToken,
+            serviceAccountToken: ""
+          },
+          rotationEnabled: false
+        }
+  });
+
+  const {
+    handleSubmit,
+    formState: { isSubmitting, isDirty }
+  } = form;
+
+  return (
+    <FormProvider {...form}>
+      <form
+        onSubmit={(e) => {
+          handleSubmit(onSubmit)(e);
+        }}
+      >
+        <GenericAccountFields />
+        <KubernetesAccountFields isUpdate={isUpdate} />
+        <div className="mt-6 flex items-center">
+          <Button
+            className="mr-4"
+            size="sm"
+            type="submit"
+            colorSchema="secondary"
+            isLoading={isSubmitting}
+            isDisabled={isSubmitting || !isDirty}
+          >
+            {isUpdate ? "Update Account" : "Create Account"}
+          </Button>
+          <ModalClose asChild>
+            <Button colorSchema="secondary" variant="plain">
+              Cancel
+            </Button>
+          </ModalClose>
+        </div>
+      </form>
+    </FormProvider>
+  );
+};
diff --git a/frontend/src/pages/pam/PamAccountsPage/components/PamAccountForm/PamAccountForm.tsx b/frontend/src/pages/pam/PamAccountsPage/components/PamAccountForm/PamAccountForm.tsx
index fc1662349..8c93d2dd5 100644
--- a/frontend/src/pages/pam/PamAccountsPage/components/PamAccountForm/PamAccountForm.tsx
+++ b/frontend/src/pages/pam/PamAccountsPage/components/PamAccountForm/PamAccountForm.tsx
@@ -8,6 +8,7 @@ import {
 import { DiscriminativePick } from "@app/types";
 
 import { PamAccountHeader } from "../PamAccountHeader";
+import { KubernetesAccountForm } from "./KubernetesAccountForm";
 import { MySQLAccountForm } from "./MySQLAccountForm";
 import { PostgresAccountForm } from "./PostgresAccountForm";
 import { SshAccountForm } from "./SshAccountForm";
@@ -70,6 +71,14 @@ const CreateForm = ({
       return (
         <SshAccountForm onSubmit={onSubmit} resourceId={resourceId} resourceType={resourceType} />
       );
+    case PamResourceType.Kubernetes:
+      return (
+        <KubernetesAccountForm
+          onSubmit={onSubmit}
+          resourceId={resourceId}
+          resourceType={resourceType}
+        />
+      );
     default:
       throw new Error(`Unhandled resource: ${resourceType}`);
   }
@@ -100,6 +109,8 @@ const UpdateForm = ({ account, onComplete }: UpdateFormProps) => {
       return <MySQLAccountForm account={account as any} onSubmit={onSubmit} />;
     case PamResourceType.SSH:
       return <SshAccountForm account={account as any} onSubmit={onSubmit} />;
+    case PamResourceType.Kubernetes:
+      return <KubernetesAccountForm account={account as any} onSubmit={onSubmit} />;
     default:
       throw new Error(`Unhandled resource: ${account.resource.resourceType}`);
   }
diff --git a/frontend/src/pages/pam/PamResourcesPage/components/PamResourceForm/KubernetesResourceForm.tsx b/frontend/src/pages/pam/PamResourcesPage/components/PamResourceForm/KubernetesResourceForm.tsx
index 8b650c3b6..651e83a6a 100644
--- a/frontend/src/pages/pam/PamResourcesPage/components/PamResourceForm/KubernetesResourceForm.tsx
+++ b/frontend/src/pages/pam/PamResourcesPage/components/PamResourceForm/KubernetesResourceForm.tsx
@@ -7,7 +7,6 @@ import { KubernetesAuthMethod, PamResourceType, TKubernetesResource } from "@app
 import { UNCHANGED_PASSWORD_SENTINEL } from "@app/hooks/api/pam/constants";
 
 import { KubernetesResourceFields } from "./shared/KubernetesResourceFields";
-import { KubernetesRotateAccountFields } from "./shared/KubernetesRotateAccountFields";
 import { GenericResourceFields, genericResourceFieldsSchema } from "./GenericResourceFields";
 
 type Props = {
@@ -24,7 +23,6 @@ const KubernetesConnectionDetailsSchema = z.object({
 
 const KubernetesServiceAccountTokenCredentialsSchema = z.object({
   authMethod: z.literal(KubernetesAuthMethod.ServiceAccountToken),
-  serviceAccountName: z.string().trim().max(255),
   serviceAccountToken: z.string().trim().max(10000)
 });
 
@@ -72,7 +70,6 @@ export const KubernetesResourceForm = ({ resource, onSubmit }: Props) => {
       <form onSubmit={handleSubmit(onSubmit)}>
         <GenericResourceFields />
         <KubernetesResourceFields />
-        <KubernetesRotateAccountFields isUpdate={isUpdate} />
         <div className="mt-6 flex items-center">
           <Button
             className="mr-4"
diff --git a/frontend/src/pages/pam/PamResourcesPage/components/PamResourceForm/shared/KubernetesRotateAccountFields.tsx b/frontend/src/pages/pam/PamResourcesPage/components/PamResourceForm/shared/KubernetesRotateAccountFields.tsx
deleted file mode 100644
index b4b949102..000000000
--- a/frontend/src/pages/pam/PamResourcesPage/components/PamResourceForm/shared/KubernetesRotateAccountFields.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { useEffect, useState } from "react";
-import { Controller, useFormContext, useWatch } from "react-hook-form";
-
-import { FormControl, Input, Switch } from "@app/components/v2";
-import { KubernetesAuthMethod } from "@app/hooks/api/pam";
-import { UNCHANGED_PASSWORD_SENTINEL } from "@app/hooks/api/pam/constants";
-
-export const KubernetesRotateAccountFields = ({ isUpdate }: { isUpdate: boolean }) => {
-  const { control, setValue, getValues } = useFormContext();
-  const [showToken, setShowToken] = useState(false);
-
-  const rotationServiceAccountName = useWatch({
-    control,
-    name: "rotationAccountCredentials.serviceAccountName"
-  });
-  const rotationServiceAccountToken = useWatch({
-    control,
-    name: "rotationAccountCredentials.serviceAccountToken"
-  });
-
-  const [enabled, setEnabled] = useState(false);
-  const [wasRotationTokenSentinelInitially, setWasRotationTokenSentinelInitially] = useState(false);
-
-  useEffect(() => {
-    const initialRotationToken = getValues("rotationAccountCredentials.serviceAccountToken");
-    if (initialRotationToken === UNCHANGED_PASSWORD_SENTINEL) {
-      setWasRotationTokenSentinelInitially(true);
-    }
-  }, [getValues]);
-
-  useEffect(() => {
-    if (rotationServiceAccountToken === UNCHANGED_PASSWORD_SENTINEL) {
-      setShowToken(false);
-    }
-  }, [rotationServiceAccountToken]);
-
-  useEffect(() => {
-    const isServiceAccountNamePopulated =
-      rotationServiceAccountName && rotationServiceAccountName !== "";
-    const isTokenPopulated =
-      rotationServiceAccountToken &&
-      rotationServiceAccountToken !== "" &&
-      rotationServiceAccountToken !== UNCHANGED_PASSWORD_SENTINEL;
-
-    if (isServiceAccountNamePopulated || isTokenPopulated) {
-      setEnabled(true);
-    }
-  }, [rotationServiceAccountName, rotationServiceAccountToken]);
-
-  return (
-    <div className="flex flex-col gap-2">
-      <Switch
-        id="account-rotation"
-        onCheckedChange={(value) => {
-          setEnabled(value);
-          if (value) {
-            setValue(
-              "rotationAccountCredentials.authMethod",
-              KubernetesAuthMethod.ServiceAccountToken,
-              {
-                shouldDirty: true
-              }
-            );
-            setValue("rotationAccountCredentials.serviceAccountName", "", {
-              shouldDirty: true
-            });
-            setValue("rotationAccountCredentials.serviceAccountToken", "", {
-              shouldDirty: true
-            });
-          } else {
-            setValue("rotationAccountCredentials", null, {
-              shouldDirty: true
-            });
-          }
-        }}
-        isChecked={enabled}
-        containerClassName="flex-row-reverse w-fit"
-        className="ml-0"
-      >
-        <p className="ml-2">Credential Rotation</p>
-      </Switch>
-
-      {enabled && (
-        <>
-          <div className="flex gap-2">
-            <Controller
-              name="rotationAccountCredentials.serviceAccountName"
-              control={control}
-              render={({ field, fieldState: { error } }) => (
-                <FormControl
-                  className="mb-0 flex-1"
-                  errorText={error?.message}
-                  isError={Boolean(error?.message)}
-                  label="Service Account Name"
-                >
-                  <div className="relative">
-                    <Input {...field} autoComplete="off" />
-                  </div>
-                </FormControl>
-              )}
-            />
-            <Controller
-              name="rotationAccountCredentials.serviceAccountToken"
-              control={control}
-              render={({ field, fieldState: { error } }) => (
-                <FormControl
-                  className="mb-0 flex-1"
-                  errorText={error?.message}
-                  isError={Boolean(error?.message)}
-                  label="Service Account Token"
-                >
-                  <div className="relative">
-                    <Input
-                      {...field}
-                      type={showToken ? "text" : "password"}
-                      autoComplete="new-password"
-                      onFocus={() => {
-                        if (isUpdate && field.value === UNCHANGED_PASSWORD_SENTINEL) {
-                          field.onChange("");
-                        }
-                        setShowToken(true);
-                      }}
-                      onBlur={() => {
-                        if (isUpdate && field.value === "" && wasRotationTokenSentinelInitially) {
-                          field.onChange(UNCHANGED_PASSWORD_SENTINEL);
-                        }
-                        setShowToken(false);
-                      }}
-                    />
-                  </div>
-                </FormControl>
-              )}
-            />
-          </div>
-
-          <p className="mb-2 text-xs text-mineshaft-400">
-            Credentials of the privileged service account which will be used for rotating other
-            accounts under this resource
-          </p>
-        </>
-      )}
-    </div>
-  );
-};