diff --git a/client/src/modules/AutoTest/components/AutoTestForm/AutoTestForm.tsx b/client/src/modules/AutoTest/components/AutoTestForm/AutoTestForm.tsx
new file mode 100644
index 000000000..c33f16789
--- /dev/null
+++ b/client/src/modules/AutoTest/components/AutoTestForm/AutoTestForm.tsx
@@ -0,0 +1,132 @@
+import { Button, Form, InputNumber, Card, Row, Col, Switch, Space } from 'antd';
+import { useMemo } from 'react';
+import { AutoTestTaskDto } from 'api';
+import { QuestionEditor } from './QuestionEditor';
+import { EditAutoTestFormData } from './data/types';
+
+type EditTaskFormProps = {
+  selectedTask: AutoTestTaskDto;
+  onCancel: () => void;
+  onSave: (updatedTask: AutoTestTaskDto) => void;
+};
+
+export default function EditTaskForm({ selectedTask, onCancel, onSave }: EditTaskFormProps) {
+  const [form] = Form.useForm<EditAutoTestFormData>();
+  const initialFormValues = useMemo(() => {
+    const pub = selectedTask.attributes.public;
+    const processedQuestions = pub.questions.map((q, idx) => {
+      if (q.multiple) {
+        return {
+          question: q.question,
+          questionImage: q.questionImage || '',
+          answersType: q.answersType || 'text',
+          multiple: q.multiple,
+          answers: q.answers.map((ans: string, aIdx: number) => ({
+            text: ans,
+            correct: selectedTask.attributes.answers?.[idx]?.includes(aIdx) || false,
+          })),
+        };
+      } else {
+        return {
+          question: q.question,
+          questionImage: q.questionImage || '',
+          answersType: q.answersType || 'text',
+          multiple: q.multiple,
+          answers: q.answers.map((ans: string) => ({ text: ans })),
+          correctIndex: selectedTask.attributes.answers?.[idx]?.[0],
+        };
+      }
+    });
+    return { ...pub, questions: processedQuestions };
+  }, [selectedTask]);
+
+  const handleSave = (values: any) => {
+    const { questions, ...rest } = values;
+    const updatedQuestions = questions.map((q: any) => ({
+      question: q.question,
+      questionImage: q.questionImage,
+      answersType: q.answersType,
+      multiple: q.multiple,
+      answers: q.answers.map((a: any) => a.text),
+    }));
+    const updatedAnswers = questions.map((q: any) => {
+      if (q.multiple) {
+        return q.answers.reduce((acc: number[], a: any, idx: number) => (a.correct ? [...acc, idx] : acc), []);
+      } else {
+        return typeof q.correctIndex === 'number' ? [q.correctIndex] : [];
+      }
+    });
+    onSave({
+      ...selectedTask,
+      attributes: { public: { ...rest, questions: updatedQuestions }, answers: updatedAnswers },
+    });
+  };
+
+  return (
+    <Card className="autoTestForm" size="small" title={`Edit ${selectedTask.name}`}>
+      <Form form={form} initialValues={initialFormValues} onFinish={handleSave} layout="vertical" size="small">
+        <Space direction="vertical" size="small" style={{ width: '100%' }}>
+          <Card type="inner" title="Test Settings">
+            <Row gutter={8}>
+              {[
+                {
+                  label: 'Max Attempts',
+                  name: 'maxAttemptsNumber',
+                  component: <InputNumber min={1} style={{ width: '100%' }} />,
+                },
+                {
+                  label: 'Number of Questions',
+                  name: 'numberOfQuestions',
+                  component: <InputNumber min={1} style={{ width: '100%' }} />,
+                },
+                {
+                  label: 'Threshold (%)',
+                  name: 'tresholdPercentage',
+                  component: <InputNumber min={0} max={100} style={{ width: '100%' }} />,
+                },
+                { label: 'Strict Mode', name: 'strictAttemptsMode', component: <Switch />, valuePropName: 'checked' },
+              ].map(({ label, name, component, valuePropName }) => (
+                <Col key={label} xs={24} sm={12} md={6}>
+                  <Form.Item label={label} name={name} {...(valuePropName ? { valuePropName } : {})}>
+                    {component}
+                  </Form.Item>
+                </Col>
+              ))}
+            </Row>
+          </Card>
+          <Card type="inner" title="Questions" style={{ marginBottom: 10 }}>
+            <Form.List name="questions">
+              {(fields, { add, remove }) => (
+                <>
+                  {fields.map(field => (
+                    <QuestionEditor key={field.key} field={field} form={form} removeQuestion={remove} />
+                  ))}
+                  <Form.Item>
+                    <Button type="dashed" onClick={() => add()} block>
+                      + Add Question
+                    </Button>
+                  </Form.Item>
+                </>
+              )}
+            </Form.List>
+          </Card>
+        </Space>
+        <Row justify="end" gutter={8}>
+          <Col>
+            <Button onClick={onCancel}>Cancel</Button>
+          </Col>
+          <Col>
+            <Button type="primary" htmlType="submit">
+              Save
+            </Button>
+          </Col>
+        </Row>
+      </Form>
+      <style jsx global>{`
+        .autoTestForm .ant-form-item {
+          margin-bottom: 12px !important;
+        }
+      `}</style>
+    </Card>
+  );
+}
diff --git a/client/src/modules/AutoTest/components/AutoTestForm/QuestionEditor.tsx b/client/src/modules/AutoTest/components/AutoTestForm/QuestionEditor.tsx
new file mode 100644
index 000000000..a4331e682
--- /dev/null
+++ b/client/src/modules/AutoTest/components/AutoTestForm/QuestionEditor.tsx
@@ -0,0 +1,100 @@
+import { Button, Card, Checkbox, Col, Form, FormInstance, Input, Radio, Row, Select } from 'antd';
+import DeleteOutlined from '@ant-design/icons/DeleteOutlined';
+import { FormListFieldData } from 'antd/lib';
+import { EditAutoTestFormData } from './data/types';
+
+type QuestionEditorProps = {
+  field: FormListFieldData;
+  form: FormInstance<EditAutoTestFormData>;
+  removeQuestion: (name: number) => void;
+};
+
+const { Option } = Select;
+
+export function QuestionEditor({ field, form, removeQuestion }: QuestionEditorProps) {
+  const { key, name, ...restField } = field;
+  const isMultiple = Form.useWatch(['questions', name, 'multiple'], form);
+  const answersList = Form.useWatch(['questions', name, 'answers'], form) || [];
+  return (
+    <Card key={key} size="small">
+      <Row gutter={8} align="bottom">
+        <Col xs={24} sm={16}>
+          <Form.Item
+            {...restField}
+            label={`Question ${name + 1}`}
+            name={[name, 'question']}
+            rules={[{ required: true, message: 'Enter question' }]}
+          >
+            <Input placeholder="Question" />
+          </Form.Item>
+        </Col>
+        <Col xs={24} sm={8}>
+          <Form.Item name={[name, 'multiple']} valuePropName="checked">
+            <Checkbox>Multiple Choice</Checkbox>
+          </Form.Item>
+        </Col>
+      </Row>
+      <Row gutter={8}>
+        <Col xs={24} sm={12}>
+          <Form.Item label="Question Image URL" name={[name, 'questionImage']}>
+            <Input placeholder="Optional image URL" />
+          </Form.Item>
+        </Col>
+        <Col xs={24} sm={12}>
+          <Form.Item label="Answers Type" name={[name, 'answersType']}>
+            <Select>
+              <Option value="text">Text</Option>
+              <Option value="image">Image</Option>
+            </Select>
+          </Form.Item>
+        </Col>
+      </Row>
+      <Form.List name={[name, 'answers']}>
+        {(subFields, { add: addAnswer, remove: removeAnswer }) => (
+          <>
+            {subFields.map(({ key: subKey, name: subName, ...subRestField }) => (
+              <Row key={subKey} gutter={4} align="top" style={{ marginBottom: 4 }}>
+                {isMultiple && (
+                  <Col flex="none">
+                    <Form.Item {...subRestField} name={[subName, 'correct']} valuePropName="checked">
+                      <Checkbox />
+                    </Form.Item>
+                  </Col>
+                )}
+                <Col flex="auto">
+                  <Form.Item name={[subName, 'text']} rules={[{ required: true, message: 'Enter answer' }]}>
+                    <Input placeholder="Answer" />
+                  </Form.Item>
+                </Col>
+                <Col flex="none">
+                  <Button icon={<DeleteOutlined />} danger onClick={() => removeAnswer(subName)} />
+                </Col>
+              </Row>
+            ))}
+            <Form.Item>
+              <Button type="dashed" onClick={() => addAnswer()} block>
+                + Add Answer
+              </Button>
+            </Form.Item>
+          </>
+        )}
+      </Form.List>
+      {!isMultiple && (
+        <Form.Item
+          label="Select Correct Answer"
+          name={[name, 'correctIndex']}
+          rules={[{ required: true, message: 'Select correct answer' }]}
+        >
+          <Radio.Group>
+            {answersList.map((_: any, index: number) => (
+              <Radio key={index} value={index}>{`Answer ${index + 1}`}</Radio>
+            ))}
+          </Radio.Group>
+        </Form.Item>
+      )}
+      <Button danger onClick={() => removeQuestion(name)} style={{ marginTop: 4 }}>
+        Remove Question
+      </Button>
+    </Card>
+  );
+}
diff --git a/client/src/modules/AutoTest/components/AutoTestForm/data/types.ts b/client/src/modules/AutoTest/components/AutoTestForm/data/types.ts
new file mode 100644
index 000000000..9c00cdb3b
--- /dev/null
+++ b/client/src/modules/AutoTest/components/AutoTestForm/data/types.ts
@@ -0,0 +1,21 @@
+export interface AnswerFormData {
+  text: string;
+  correct?: boolean;
+}
+
+export interface QuestionFormData {
+  question: string;
+  questionImage: string;
+  answersType: 'text' | 'image';
+  multiple: boolean;
+  answers: AnswerFormData[];
+  correctIndex?: number;
+}
+
+export interface EditAutoTestFormData {
+  maxAttemptsNumber: number;
+  numberOfQuestions: number;
+  tresholdPercentage: number;
+  strictAttemptsMode: boolean;
+  questions: QuestionFormData[];
+}
diff --git a/client/src/pages/admin/auto-test-task/[taskId].tsx b/client/src/pages/admin/auto-test-task/[taskId].tsx
index 29bab9d9b..6ba1772dd 100644
--- a/client/src/pages/admin/auto-test-task/[taskId].tsx
+++ b/client/src/pages/admin/auto-test-task/[taskId].tsx
@@ -1,5 +1,6 @@
-import { Descriptions, Divider, Form, Space, Switch, Tag, Typography } from 'antd';
-import { AutoTestTaskDto, AutoTestsApi, SelfEducationQuestionSelectedAnswersDto } from 'api';
+import { useState } from 'react';
+import { Button, Descriptions, Divider, Form, message, Space, Switch, Tag, Typography } from 'antd';
+import { AutoTestTaskDto, AutoTestsApi, SelfEducationQuestionSelectedAnswersDto, TasksApi } from 'api';
 import { AdminPageLayout } from 'components/PageLayout';
 import { ActiveCourseProvider, SessionProvider, useActiveCourseContext } from 'modules/Course/contexts';
 import { CourseRole } from 'services/models';
@@ -7,6 +8,7 @@ import { GetServerSideProps } from 'next';
 import { getTokenFromContext } from 'utils/server';
 import { getApiConfiguration } from 'utils/axios';
 import { Question } from 'modules/AutoTest/components';
+import AutoTestForm from 'modules/AutoTest/components/AutoTestForm/AutoTestForm';
 
 type PageProps = {
   selectedTask: AutoTestTaskDto;
@@ -25,111 +27,134 @@ export const getServerSideProps: GetServerSideProps = async context => {
     const selectedTask = await api.getAutoTest(Number(taskId));
 
     if (!selectedTask.data) {
-      return {
-        props: {
-          notFound: true,
-        },
-      };
+      return { props: { notFound: true } };
     }
 
-    return {
-      props: { selectedTask: selectedTask.data },
-    };
+    return { props: { selectedTask: selectedTask.data } };
   } catch {
-    return {
-      notFound: true,
-    };
+    return { notFound: true };
   }
 };
 
+const taskApi = new TasksApi();
+
 function Page({ selectedTask }: PageProps) {
   const { courses } = useActiveCourseContext();
+  const [task, setTask] = useState<AutoTestTaskDto>(selectedTask);
+  const [isEditing, setIsEditing] = useState(false);
 
-  return (
-    <AdminPageLayout title="Auto test task" courses={courses} loading={false}>
-      <Descriptions column={1}>
-        <Descriptions.Item label="Name">{selectedTask?.name}</Descriptions.Item>
-        {selectedTask?.descriptionUrl && (
-          <Descriptions.Item label="Description URL">
-            <a href={selectedTask?.descriptionUrl} target="_blank">
-              {selectedTask?.descriptionUrl}
-            </a>
-          </Descriptions.Item>
-        )}
-        {selectedTask?.discipline?.name && (
-          <Descriptions.Item label="Discipline">{selectedTask?.discipline?.name}</Descriptions.Item>
-        )}
-        {selectedTask?.courses?.length && selectedTask?.courses?.length > 0 && (
-          <Descriptions.Item label="Courses">
-            <Space wrap size="small">
-              {selectedTask.courses.map(course => (
-                <Tag color={course?.isActive ? 'green' : 'red'} key={course.name}>
-                  <Typography.Text>{course.name}</Typography.Text>
-                </Tag>
-              ))}
-            </Space>
-          </Descriptions.Item>
-        )}
-
-        {selectedTask?.tags && (
-          <Descriptions.Item label="Tags">
-            {selectedTask?.tags.map(tag => (
-              <Tag color="blue" key={tag}>
-                {tag}
-              </Tag>
-            ))}
-          </Descriptions.Item>
-        )}
-      </Descriptions>
+  const handleSaveTask = async (updatedTask: AutoTestTaskDto) => {
+    try {
+      await taskApi.updateTask(updatedTask.id, {
+        name: selectedTask.name,
+        descriptionUrl: selectedTask.descriptionUrl,
+        disciplineId: selectedTask.discipline?.id,
+        tags: selectedTask.tags,
+        attributes: updatedTask.attributes,
+        description: selectedTask.description,
+        githubRepoName: selectedTask.githubRepoName,
+        sourceGithubRepoUrl: selectedTask.sourceGithubRepoUrl,
+        githubPrRequired: selectedTask.githubPrRequired,
+        type: selectedTask.type,
+        skills: selectedTask.skills,
+      });
+      setTask(updatedTask);
+      setIsEditing(false);
+    } catch {
+      message.error('Failed to update auto test');
+    }
+  };
 
-      {selectedTask?.attributes?.public?.questions && (
+  return (
+    <AdminPageLayout title="Auto test" courses={courses} loading={false}>
+      {isEditing ? (
+        <AutoTestForm selectedTask={task} onCancel={() => setIsEditing(false)} onSave={handleSaveTask} />
+      ) : (
         <>
-          <Divider />
-          <Descriptions
-            title="Test Settings"
-            bordered
-            size="small"
-            column={{
-              xs: 1,
-              md: 2,
-              lg: 3,
-              xxl: 5,
-            }}
-          >
-            <Descriptions.Item label="Max Attempts Number">
-              {selectedTask?.attributes?.public?.maxAttemptsNumber}
-            </Descriptions.Item>
-            <Descriptions.Item label="Number of Questions">
-              {selectedTask?.attributes?.public?.numberOfQuestions}
-            </Descriptions.Item>
-            <Descriptions.Item label="Total Questions">
-              {selectedTask?.attributes?.public?.questions?.length}
-            </Descriptions.Item>
-            <Descriptions.Item label="Strict Attempts Mode">
-              <Switch checked={selectedTask?.attributes?.public?.strictAttemptsMode} disabled />
-            </Descriptions.Item>
-            <Descriptions.Item label="Threshold Percentage">
-              {selectedTask?.attributes?.public?.tresholdPercentage}
-            </Descriptions.Item>
+          <Space style={{ marginBottom: 16 }}>
+            <Button type="primary" onClick={() => setIsEditing(true)}>
+              Edit
+            </Button>
+          </Space>
+          <Descriptions column={1}>
+            <Descriptions.Item label="Name">{task.name}</Descriptions.Item>
+            {task?.descriptionUrl && (
+              <Descriptions.Item label="Description URL">
+                <a href={task?.descriptionUrl} target="_blank" rel="noreferrer">
+                  {task?.descriptionUrl}
+                </a>
+              </Descriptions.Item>
+            )}
+            {task?.discipline?.name && (
+              <Descriptions.Item label="Discipline">{task?.discipline?.name}</Descriptions.Item>
+            )}
+            {task?.courses?.length && task?.courses?.length > 0 && (
+              <Descriptions.Item label="Courses">
+                <Space wrap size="small">
+                  {task.courses.map(course => (
+                    <Tag color={course?.isActive ? 'green' : 'red'} key={course.name}>
+                      <Typography.Text>{course.name}</Typography.Text>
+                    </Tag>
+                  ))}
+                </Space>
+              </Descriptions.Item>
+            )}
+            {task?.tags && (
+              <Descriptions.Item label="Tags">
+                {task?.tags.map(tag => (
+                  <Tag color="blue" key={tag}>
+                    {tag}
+                  </Tag>
+                ))}
+              </Descriptions.Item>
+            )}
           </Descriptions>
-          <Form layout="vertical" requiredMark={false} disabled={true}>
-            {selectedTask?.attributes.public.questions.map((question, index) => (
-              <Question
-                key={index}
-                question={
-                  {
-                    ...question,
-                    // TODO: Investigate and fix potential type mismatch for selectedAnswers.
-                    // Related issue: https://github.com/rolling-scopes/rsschool-app/issues/2572
-                    selectedAnswers: question.multiple
-                      ? selectedTask?.attributes.answers[index]
-                      : selectedTask?.attributes.answers[index][0],
-                  } as SelfEducationQuestionSelectedAnswersDto
-                }
-                questionIndex={index}
-              />
-            ))}
-          </Form>
+          {task?.attributes?.public?.questions && (
+            <>
+              <Divider />
+              <Descriptions
+                title="Test Settings"
+                bordered
+                size="small"
+                column={{
+                  xs: 1,
+                  md: 2,
+                  lg: 3,
+                  xxl: 5,
+                }}
+              >
+                <Descriptions.Item label="Max Attempts Number">
+                  {task.attributes.public.maxAttemptsNumber}
+                </Descriptions.Item>
+                <Descriptions.Item label="Number of Questions">
+                  {task.attributes.public.numberOfQuestions}
+                </Descriptions.Item>
+                <Descriptions.Item label="Total Questions">{task.attributes.public.questions.length}</Descriptions.Item>
+                <Descriptions.Item label="Strict Attempts Mode">
+                  <Switch checked={task.attributes.public.strictAttemptsMode} disabled />
+                </Descriptions.Item>
+                <Descriptions.Item label="Threshold Percentage">
+                  {task.attributes.public.tresholdPercentage}
+                </Descriptions.Item>
+              </Descriptions>
+              <Form layout="vertical" requiredMark={false} disabled>
+                {task.attributes.public.questions.map((question, index) => (
+                  <Question
+                    key={index}
+                    question={
+                      {
+                        ...question,
+                        selectedAnswers: question.multiple
+                          ? task.attributes.answers[index]
+                          : task.attributes.answers[index][0],
+                      } as SelfEducationQuestionSelectedAnswersDto
+                    }
+                    questionIndex={index}
+                  />
+                ))}
+              </Form>
+            </>
+          )}
         </>
       )}
     </AdminPageLayout>