diff --git a/api/proto/submission.proto b/api/proto/submission.proto
index b032e96..eedcccb 100644
--- a/api/proto/submission.proto
+++ b/api/proto/submission.proto
@@ -28,16 +28,16 @@ message Submission {
   string competition_id = 3;
   string task_id = 4;
   SubmissionStatus status = 5;
-  optional int32 earned_points = 6;
+  int32 earned_points = 6;
   google.protobuf.Timestamp submitted_at = 7;
-  optional google.protobuf.Timestamp checked_at = 8;
-  string content = 9;
+  google.protobuf.Timestamp checked_at = 8;
+  string file_url = 9;
 }
 
 message SubmitTaskRequest {
   string competition_id = 1;
   string task_id = 2;
-  bytes content = 3;
+  string file_url = 3;
 }
 
 message GetSubmissionsHistoryRequest {
@@ -55,11 +55,10 @@ message GetSubmissionRequest {
 message ListSubmissionsRequest {
   int32 page_size = 1;
   int32 page_token = 2;
-
-  optional string competition_id = 3;
-  optional string task_id = 4;
-  optional string user_id = 5;
-  optional SubmissionStatus status = 6;
+  string competition_id = 3;
+  string task_id = 4;
+  string user_id = 5;
+  SubmissionStatus status = 6;
 }
 message ListSubmissionsResponse {
   repeated Submission submissions = 1;
diff --git a/api/proto/task.proto b/api/proto/task.proto
index 55f0e6c..878c123 100644
--- a/api/proto/task.proto
+++ b/api/proto/task.proto
@@ -25,8 +25,8 @@ message Task {
   string title = 3;
   string description = 4;
   int32 in_competition_position = 5;
-  optional int32 max_points = 6;
-  optional int32 max_attempts = 7;
+  int32 max_points = 6;
+  int32 max_attempts = 7;
   TaskType type = 8;
   google.protobuf.Timestamp created_at = 9;
   google.protobuf.Timestamp updated_at = 10;