diff --git a/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_android.proto b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_android.proto
index 8e52a3ad922..f558db7b304 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_android.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_android.proto
@@ -8,4 +8,6 @@ message PPACAndroid {
   string safetyNetJws = 1;
 
   string salt = 2;
+
+  bytes androidId = 3; // optional, only required for SRS
 }
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_ios.proto b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_ios.proto
index 214426ca0d9..e4883679d0f 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_ios.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/ppac_ios.proto
@@ -8,4 +8,6 @@ message PPACIOS {
   string deviceToken = 1;
 
   string apiToken = 2;
+
+  string previousApiToken = 3;
 }
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp.proto b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp.proto
new file mode 100644
index 00000000000..11358828291
--- /dev/null
+++ b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp.proto
@@ -0,0 +1,9 @@
+// This file is auto-generated, DO NOT make any changes here
+syntax = "proto3";
+package de.rki.coronawarnapp.server.protocols.internal.ppdd;
+
+
+message SRSOneTimePassword {
+
+  string otp = 1;
+}
\ No newline at end of file
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp_request_android.proto b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp_request_android.proto
new file mode 100644
index 00000000000..c7e6312497c
--- /dev/null
+++ b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp_request_android.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.ppdd;
+
+import "internal/ppdd/ppac_android.proto";
+import "internal/ppdd/srs_otp.proto";
+
+message SRSOneTimePasswordRequestAndroid {
+
+  PPACAndroid authentication = 1;
+
+  SRSOneTimePassword payload = 2;
+}
\ No newline at end of file
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp_request_ios.proto b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp_request_ios.proto
new file mode 100644
index 00000000000..37a0563156f
--- /dev/null
+++ b/Server-Protocol-Buffer/src/main/proto/internal/ppdd/srs_otp_request_ios.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.ppdd;
+
+import "internal/ppdd/ppac_ios.proto";
+import "internal/ppdd/srs_otp.proto";
+
+message SRSOneTimePasswordRequestIOS {
+
+  PPACIOS authentication = 1;
+
+  SRSOneTimePassword payload = 2;
+}
\ No newline at end of file
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 2aad809dcb6..6ec84cc09aa 100644
--- a/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
+++ b/Server-Protocol-Buffer/src/main/proto/internal/submission_payload.proto
@@ -19,5 +19,12 @@ message SubmissionPayload {
     SUBMISSION_TYPE_PCR_TEST = 0;
     SUBMISSION_TYPE_RAPID_TEST = 1;
     SUBMISSION_TYPE_HOST_WARNING = 2;
+    SUBMISSION_TYPE_SRS_SELF_TEST = 3;
+    SUBMISSION_TYPE_SRS_REGISTERED_RAT = 4;
+    SUBMISSION_TYPE_SRS_UNREGISTERED_RAT = 5;
+    SUBMISSION_TYPE_SRS_REGISTERED_PCR = 6;
+    SUBMISSION_TYPE_SRS_UNREGISTERED_PCR = 7;
+    SUBMISSION_TYPE_SRS_RAPID_PCR = 8;
+    SUBMISSION_TYPE_SRS_OTHER = 9;
   }
 }
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 2361ea6ece7..06cd21d9e6a 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
@@ -10,6 +10,7 @@ import "internal/v2/key_download_parameters.proto";
 import "internal/v2/ppdd_edus_parameters.proto";
 import "internal/v2/ppdd_els_parameters.proto";
 import "internal/v2/ppdd_ppa_parameters.proto";
+import "internal/v2/ppdd_srs_parameters.proto";
 import "internal/v2/presence_tracing_parameters.proto";
 import "internal/v2/risk_calculation_parameters.proto";
 
@@ -41,6 +42,8 @@ message ApplicationConfigurationAndroid {
   CoronaTestParameters coronaTestParameters = 14;
 
   DGCParameters dgcParameters = 15;
+
+  PPDDSelfReportSubmissionParametersAndroid selfReportParameters = 16;
 }
 
 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 278162cd16a..0d6d0a311ab 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
@@ -10,6 +10,7 @@ import "internal/v2/key_download_parameters.proto";
 import "internal/v2/ppdd_edus_parameters.proto";
 import "internal/v2/ppdd_els_parameters.proto";
 import "internal/v2/ppdd_ppa_parameters.proto";
+import "internal/v2/ppdd_srs_parameters.proto";
 import "internal/v2/risk_calculation_parameters.proto";
 import "internal/v2/presence_tracing_parameters.proto";
 import "internal/v2/semantic_version.proto";
@@ -40,6 +41,8 @@ message ApplicationConfigurationIOS {
   CoronaTestParameters coronaTestParameters = 13;
 
   DGCParameters dgcParameters = 14;
+
+  PPDDSelfReportSubmissionParametersIOS selfReportParameters = 15;
 }
 
 message ExposureConfiguration {
diff --git a/Server-Protocol-Buffer/src/main/proto/internal/v2/ppdd_srs_parameters.proto b/Server-Protocol-Buffer/src/main/proto/internal/v2/ppdd_srs_parameters.proto
new file mode 100644
index 00000000000..c13879a343c
--- /dev/null
+++ b/Server-Protocol-Buffer/src/main/proto/internal/v2/ppdd_srs_parameters.proto
@@ -0,0 +1,20 @@
+// This file is auto-generated, DO NOT make any changes here
+syntax = "proto3";
+package de.rki.coronawarnapp.server.protocols.internal.v2;
+
+import "internal/v2/ppdd_ppac_parameters.proto";
+
+message PPDDSelfReportSubmissionParametersIOS {
+  PPDDSelfReportSubmissionParametersCommon common = 1;
+  PPDDPrivacyPreservingAccessControlParametersIOS ppac = 2;
+}
+
+message PPDDSelfReportSubmissionParametersAndroid {
+  PPDDSelfReportSubmissionParametersCommon common = 1;
+  PPDDPrivacyPreservingAccessControlParametersAndroid ppac = 2;
+}
+
+message PPDDSelfReportSubmissionParametersCommon {
+  int32 timeSinceOnboardingInHours = 1;
+  int32 timeBetweenSubmissionsInDays = 2;
+}
\ No newline at end of file