diff --git a/frontend/src/lib/constants.ts b/frontend/src/lib/constants.ts
index 3e3925ec9..ceaa1fce0 100644
--- a/frontend/src/lib/constants.ts
+++ b/frontend/src/lib/constants.ts
@@ -1,4 +1,8 @@
-import { ConfigurationParameters, ConsumerGroupState } from 'generated-sources';
+import {
+  ApplicationConfigPropertiesKafkaMaskingTypeEnum,
+  ConfigurationParameters,
+  ConsumerGroupState,
+} from 'generated-sources';
 
 declare global {
   interface Window {
@@ -101,6 +105,20 @@ export const METRICS_OPTIONS = [
   { value: 'JMX', label: 'JMX' },
   { value: 'PROMETHEUS', label: 'PROMETHEUS' },
 ];
+export const MASKING_OPTIONS = [
+  {
+    value: ApplicationConfigPropertiesKafkaMaskingTypeEnum.MASK,
+    label: 'MASK',
+  },
+  {
+    value: ApplicationConfigPropertiesKafkaMaskingTypeEnum.REMOVE,
+    label: 'REMOVE',
+  },
+  {
+    value: ApplicationConfigPropertiesKafkaMaskingTypeEnum.REPLACE,
+    label: 'REPLACE',
+  },
+];
 
 export const CONSUMER_GROUP_STATE_TOOLTIPS: Record<ConsumerGroupState, string> =
   {
diff --git a/frontend/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts b/frontend/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
index 5a3452a93..a99c2f51b 100644
--- a/frontend/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
+++ b/frontend/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
@@ -41,6 +41,7 @@ export const FlexGrow1 = styled.div`
   flex-direction: column;
   display: flex;
 `;
+
 // KafkaCluster
 export const BootstrapServer = styled(InputContainer)`
   grid-template-columns: 3fr 110px 30px;
@@ -58,5 +59,23 @@ export const FileUploadInputWrapper = styled.div`
   display: flex;
   height: 40px;
   align-items: center;
-  color: ${({ theme }) => theme.clusterConfigForm.fileInput.color}};
+  color: ${({ theme }) => theme.clusterConfigForm.fileInput.color};
+`;
+
+// Masking
+export const FieldWrapper = styled.div`
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  flex-wrap: wrap;
+`;
+export const FieldContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 8px;
+  align-items: center;
+`;
+export const Error = styled.p`
+  color: ${({ theme }) => theme.input.error};
+  font-size: 12px;
 `;
diff --git a/frontend/src/widgets/ClusterConfigForm/Sections/Masking.tsx b/frontend/src/widgets/ClusterConfigForm/Sections/Masking.tsx
new file mode 100644
index 000000000..157932e04
--- /dev/null
+++ b/frontend/src/widgets/ClusterConfigForm/Sections/Masking.tsx
@@ -0,0 +1,225 @@
+import * as React from 'react';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import { Button } from 'components/common/Button/Button';
+import Input from 'components/common/Input/Input';
+import { useFieldArray, useFormContext } from 'react-hook-form';
+import PlusIcon from 'components/common/Icons/PlusIcon';
+import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
+import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
+import {
+  FieldContainer,
+  FieldWrapper,
+  FlexGrow1,
+  FlexRow,
+} from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+import { MASKING_OPTIONS } from 'lib/constants';
+import ControlledSelect from 'components/common/Select/ControlledSelect';
+import { FormError } from 'components/common/Input/Input.styled';
+import { ErrorMessage } from '@hookform/error-message';
+
+const Fields = ({ nestedIdx }: { nestedIdx: number }) => {
+  const { control } = useFormContext();
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: `masking.${nestedIdx}.fields`,
+  });
+
+  const handleAppend = () => append({ value: '' });
+
+  return (
+    <FlexGrow1>
+      <FieldWrapper>
+        <FieldWrapper>
+          {fields.map((item, index) => (
+            <FieldContainer key={item.id}>
+              <Input
+                label="Field"
+                name={`masking.${nestedIdx}.fields.${index}.value`}
+                placeholder="Field"
+                type="text"
+                withError
+              />
+
+              {fields.length > 1 && (
+                <S.RemoveButton
+                  style={{ marginTop: '18px' }}
+                  onClick={() => remove(index)}
+                >
+                  <IconButtonWrapper aria-label="deleteProperty">
+                    <CloseCircleIcon aria-hidden />
+                  </IconButtonWrapper>
+                </S.RemoveButton>
+              )}
+            </FieldContainer>
+          ))}
+        </FieldWrapper>
+
+        <Button
+          style={{ marginTop: '20px' }}
+          type="button"
+          buttonSize="M"
+          buttonType="secondary"
+          onClick={handleAppend}
+        >
+          <PlusIcon />
+          Add Field
+        </Button>
+      </FieldWrapper>
+
+      <FormError>
+        <ErrorMessage name={`masking.${nestedIdx}.fields`} />
+      </FormError>
+    </FlexGrow1>
+  );
+};
+
+const MaskingCharReplacement = ({ nestedIdx }: { nestedIdx: number }) => {
+  const { control } = useFormContext();
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: `masking.${nestedIdx}.maskingCharsReplacement`,
+  });
+
+  const handleAppend = () => append({ value: '' });
+
+  return (
+    <FlexGrow1>
+      <FieldWrapper>
+        <FieldWrapper>
+          {fields.map((item, index) => (
+            <FieldContainer key={item.id}>
+              <Input
+                label="Field"
+                name={`masking.${nestedIdx}.maskingCharsReplacement.${index}.value`}
+                placeholder="Field"
+                type="text"
+                withError
+              />
+
+              {fields.length > 1 && (
+                <S.RemoveButton
+                  style={{ marginTop: '18px' }}
+                  onClick={() => remove(index)}
+                >
+                  <IconButtonWrapper aria-label="deleteProperty">
+                    <CloseCircleIcon aria-hidden />
+                  </IconButtonWrapper>
+                </S.RemoveButton>
+              )}
+            </FieldContainer>
+          ))}
+        </FieldWrapper>
+
+        <Button
+          style={{ marginTop: '20px' }}
+          type="button"
+          buttonSize="M"
+          buttonType="secondary"
+          onClick={handleAppend}
+        >
+          <PlusIcon />
+          Add Masking Chars Replacement
+        </Button>
+      </FieldWrapper>
+
+      <FormError>
+        <ErrorMessage name={`masking.${nestedIdx}.maskingCharsReplacement`} />
+      </FormError>
+    </FlexGrow1>
+  );
+};
+
+const Masking = () => {
+  const { control } = useFormContext();
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: 'masking',
+  });
+  const handleAppend = () =>
+    append({
+      type: undefined,
+      fields: [{ value: '' }],
+      fieldsNamePattern: '',
+      maskingCharsReplacement: [{ value: '' }],
+      replacement: '',
+      topicKeysPattern: '',
+      topicValuesPattern: '',
+    });
+  const toggleConfig = () => (fields.length === 0 ? handleAppend() : remove());
+
+  const hasFields = fields.length > 0;
+
+  return (
+    <>
+      <SectionHeader
+        title="Masking"
+        addButtonText="Configure Masking"
+        adding={!hasFields}
+        onClick={toggleConfig}
+      />
+      {hasFields && (
+        <S.GroupFieldWrapper>
+          {fields.map((item, index) => (
+            <div key={item.id}>
+              <FlexRow>
+                <FlexGrow1>
+                  <ControlledSelect
+                    name={`masking.${index}.type`}
+                    label="Masking Type *"
+                    placeholder="Choose masking type"
+                    options={MASKING_OPTIONS}
+                  />
+                  <Fields nestedIdx={index} />
+                  <Input
+                    label="Fields name pattern"
+                    name={`masking.${index}.fieldsNamePattern`}
+                    placeholder="Pattern"
+                    type="text"
+                    withError
+                  />
+                  <MaskingCharReplacement nestedIdx={index} />
+                  <Input
+                    label="Replacement"
+                    name={`masking.${index}.replacement`}
+                    placeholder="Replacement"
+                    type="text"
+                  />
+                  <Input
+                    label="Topic Keys Pattern"
+                    name={`masking.${index}.topicKeysPattern`}
+                    placeholder="Keys pattern"
+                    type="text"
+                  />
+                  <Input
+                    label="Topic Values Pattern"
+                    name={`masking.${index}.topicValuesPattern`}
+                    placeholder="Values pattern"
+                    type="text"
+                  />
+                </FlexGrow1>
+                <S.RemoveButton onClick={() => remove(index)}>
+                  <IconButtonWrapper aria-label="deleteProperty">
+                    <CloseCircleIcon aria-hidden />
+                  </IconButtonWrapper>
+                </S.RemoveButton>
+              </FlexRow>
+
+              <hr />
+            </div>
+          ))}
+          <Button
+            type="button"
+            buttonSize="M"
+            buttonType="secondary"
+            onClick={handleAppend}
+          >
+            <PlusIcon />
+            Add Masking
+          </Button>
+        </S.GroupFieldWrapper>
+      )}
+    </>
+  );
+};
+export default Masking;
diff --git a/frontend/src/widgets/ClusterConfigForm/index.tsx b/frontend/src/widgets/ClusterConfigForm/index.tsx
index cc57cb52c..f2323c8f0 100644
--- a/frontend/src/widgets/ClusterConfigForm/index.tsx
+++ b/frontend/src/widgets/ClusterConfigForm/index.tsx
@@ -22,6 +22,7 @@ import Metrics from 'widgets/ClusterConfigForm/Sections/Metrics';
 import CustomAuthentication from 'widgets/ClusterConfigForm/Sections/CustomAuthentication';
 import Authentication from 'widgets/ClusterConfigForm/Sections/Authentication/Authentication';
 import KSQL from 'widgets/ClusterConfigForm/Sections/KSQL';
+import Masking from 'widgets/ClusterConfigForm/Sections/Masking';
 import { useConfirm } from 'lib/hooks/useConfirm';
 
 interface ClusterConfigFormProps {
@@ -145,6 +146,8 @@ const ClusterConfigForm: React.FC<ClusterConfigFormProps> = ({
           <hr />
           <Metrics />
           <hr />
+          <Masking />
+          <hr />
           <S.ButtonWrapper>
             <Button
               buttonSize="L"
diff --git a/frontend/src/widgets/ClusterConfigForm/schema.ts b/frontend/src/widgets/ClusterConfigForm/schema.ts
index 3c49568b2..5c9aaa2b1 100644
--- a/frontend/src/widgets/ClusterConfigForm/schema.ts
+++ b/frontend/src/widgets/ClusterConfigForm/schema.ts
@@ -1,4 +1,5 @@
 import { object, string, number, array, boolean, mixed, lazy } from 'yup';
+import { ApplicationConfigPropertiesKafkaMaskingTypeEnum } from 'generated-sources';
 
 const requiredString = string().required('required field');
 
@@ -179,6 +180,71 @@ const authSchema = lazy((value) => {
   return mixed().optional();
 });
 
+const maskingSchema = object({
+  type: mixed<ApplicationConfigPropertiesKafkaMaskingTypeEnum>()
+    .oneOf(Object.values(ApplicationConfigPropertiesKafkaMaskingTypeEnum))
+    .required('required field'),
+  fields: array().of(
+    object().shape({
+      value: string().test(
+        'fieldsOrPattern',
+        'Either fields or fieldsNamePattern is required',
+        (value, { path, parent, ...ctx }) => {
+          const maskingItem = ctx.from?.[1].value;
+
+          if (value && value.trim() !== '') {
+            return true;
+          }
+
+          const otherFieldHasValue =
+            maskingItem.fields &&
+            maskingItem.fields.some(
+              (field: { value: string }) =>
+                field.value && field.value.trim() !== ''
+            );
+
+          if (otherFieldHasValue) {
+            return true;
+          }
+
+          const hasPattern =
+            maskingItem.fieldsNamePattern &&
+            maskingItem.fieldsNamePattern.trim() !== '';
+
+          return hasPattern;
+        }
+      ),
+    })
+  ),
+  fieldsNamePattern: string().test(
+    'fieldsOrPattern',
+    'Either fields or fieldsNamePattern is required',
+    (value, { parent }) => {
+      const hasValidFields =
+        parent.fields &&
+        parent.fields.length > 0 &&
+        parent.fields.some(
+          (field: { value: string }) => field.value && field.value.trim() !== ''
+        );
+
+      const hasPattern = value && value.trim() !== '';
+
+      return hasValidFields || hasPattern;
+    }
+  ),
+  maskingCharsReplacement: array().of(object().shape({ value: string() })),
+  replacement: string(),
+  topicKeysPattern: string(),
+  topicValuesPattern: string(),
+});
+
+const maskingsSchema = lazy((value) => {
+  if (Array.isArray(value)) {
+    return array().of(maskingSchema);
+  }
+  return mixed().optional();
+});
+
 const formSchema = object({
   name: string()
     .required('required field')
@@ -190,6 +256,7 @@ const formSchema = object({
   schemaRegistry: urlWithAuthSchema,
   ksql: urlWithAuthSchema,
   kafkaConnect: kafkaConnectsSchema,
+  masking: maskingsSchema,
   metrics: metricsSchema,
 });
 
diff --git a/frontend/src/widgets/ClusterConfigForm/types.ts b/frontend/src/widgets/ClusterConfigForm/types.ts
index d10199a61..db36a867f 100644
--- a/frontend/src/widgets/ClusterConfigForm/types.ts
+++ b/frontend/src/widgets/ClusterConfigForm/types.ts
@@ -1,3 +1,5 @@
+import { ApplicationConfigPropertiesKafkaMaskingTypeEnum } from 'generated-sources';
+
 type SecurityProtocol = 'SASL_SSL' | 'SASL_PLAINTEXT';
 type BootstrapServer = {
   host: string;
@@ -56,4 +58,13 @@ export type ClusterConfigFormValues = {
   kafkaConnect?: KafkaConnect[];
   metrics?: Metrics;
   customAuth: Record<string, string>;
+  masking?: {
+    type?: ApplicationConfigPropertiesKafkaMaskingTypeEnum;
+    fields?: { value: string }[];
+    fieldsNamePattern?: string;
+    maskingCharsReplacement?: { value: string }[];
+    replacement?: string;
+    topicKeysPattern?: string;
+    topicValuesPattern?: string;
+  }[];
 };
diff --git a/frontend/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts b/frontend/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts
index 73a945818..31e5a1fed 100644
--- a/frontend/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts
+++ b/frontend/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts
@@ -43,6 +43,7 @@ export const getInitialFormData = (
     ksqldbServer,
     ksqldbServerAuth,
     ksqldbServerSsl,
+    masking,
   } = payload;
 
   const initialValues: Partial<ClusterConfigFormValues> = {
@@ -99,6 +100,16 @@ export const getInitialFormData = (
     };
   }
 
+  if (masking) {
+    initialValues.masking = masking.map((m) => ({
+      ...m,
+      fields: (m.fields ?? []).map((f) => ({ value: f })),
+      maskingCharsReplacement: (m.maskingCharsReplacement ?? []).map((f) => ({
+        value: f,
+      })),
+    }));
+  }
+
   const properties = payload.properties || {};
 
   // Authentification
diff --git a/frontend/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts b/frontend/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
index fdc9d740e..35c09aa4d 100644
--- a/frontend/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
+++ b/frontend/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
@@ -101,6 +101,21 @@ export const transformFormDataToPayload = (data: ClusterConfigFormValues) => {
     };
   }
 
+  // Masking
+  if (data.masking && data.masking.length > 0) {
+    config.masking = data.masking.map((formData) => ({
+      type: formData.type,
+      fields: (formData.fields ?? []).map((f) => f.value),
+      fieldsNamePattern: formData.fieldsNamePattern,
+      topicKeysPattern: formData.topicKeysPattern,
+      topicValuesPattern: formData.topicValuesPattern,
+      maskingCharsReplacement: (formData.maskingCharsReplacement ?? []).map(
+        (f) => f.value
+      ),
+      replacement: formData.replacement,
+    }));
+  }
+
   config.properties = {
     ...transformCustomProps(data.customAuth),
   };