diff --git a/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto b/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
index c307356d2e3817732cf9efca8bd448a635b53cf7..bd159f8d49e580267d6403fc1967fd1075f654c3 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
@@ -12,4 +12,10 @@ message SubmissionPayload {
   optional string origin = 4;
   optional bool consentToFederation = 5;
   repeated de.rki.coronawarnapp.server.protocols.internal.pt.CheckIn checkIns = 6;
+  optional SubmissionType submissionType = 7 [default = SUBMISSION_TYPE_PCR_TEST];
+
+  enum SubmissionType {
+    SUBMISSION_TYPE_PCR_TEST = 0;
+    SUBMISSION_TYPE_RAPID_TEST = 1;
+  }
 }
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto
index 910b687cd7c2fed15000ccfdb511ac64923dff64..4eb56db06fcd08d88de564204f8395c9b96841f7 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_android.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package de.rki.coronawarnapp.server.protocols.internal.v2;
 
 import "internal/v2/app_features.proto";
+import "internal/v2/corona_test_parameters.proto";
 import "internal/v2/exposure_detection_parameters.proto";
 import "internal/v2/key_download_parameters.proto";
 import "internal/v2/ppdd_edus_parameters.proto";
@@ -36,6 +37,7 @@ message ApplicationConfigurationAndroid {
 
   PresenceTracingParameters presenceTracingParameters = 13;
 
+  CoronaTestParameters coronaTestParameters = 14;
 }
 
 message DiagnosisKeysDataMapping {
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto
index 903269ff8952ae6f701f186a1745a8e40eb2a4ac..98c90fa8b00767fa5e13599e956c5de3ea002c0a 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/v2/app_config_ios.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package de.rki.coronawarnapp.server.protocols.internal.v2;
 
 import "internal/v2/app_features.proto";
+import "internal/v2/corona_test_parameters.proto";
 import "internal/v2/exposure_detection_parameters.proto";
 import "internal/v2/key_download_parameters.proto";
 import "internal/v2/ppdd_edus_parameters.proto";
@@ -34,6 +35,8 @@ message ApplicationConfigurationIOS {
   PPDDErrorLogSharingParametersIOS errorLogSharingParameters = 11;
 
   PresenceTracingParameters presenceTracingParameters = 12;
+
+  CoronaTestParameters coronaTestParameters = 13;
 }
 
 message ExposureConfiguration {
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/v2/corona_test_parameters.proto b/Server-Protocol-Buffer/src/main/proto/internal/v2/corona_test_parameters.proto
new file mode 100644
index 0000000000000000000000000000000000000000..4b8664b4789fa91c7a8e68287c88dda09c46b7d6
--- /dev/null
+++ b/Server-Protocol-Buffer/src/main/proto/internal/v2/corona_test_parameters.proto
@@ -0,0 +1,13 @@
+// This file is auto-generated, DO NOT make any changes here
+syntax = "proto3";
+package de.rki.coronawarnapp.server.protocols.internal.v2;
+
+
+message CoronaTestParameters {
+
+  CoronaRapidAntigenTestParameters coronaRapidAntigenTestParameters = 1;
+}
+
+message CoronaRapidAntigenTestParameters {
+  uint32 hoursToDeemTestOutdated = 1;
+}
\ No newline at end of file