diff --git a/api/gateway-config.yml b/api/gateway-config.yml
index 4b88f29c962d65f5b2ab3cf329aa1ba8951a5127..649dfd0b2bc45c6235e9940c80015b7149687ab2 100644
--- a/api/gateway-config.yml
+++ b/api/gateway-config.yml
@@ -6,5 +6,5 @@ http:
     - selector: de.ozgcloud.fachstellenproxy.FachstelleRegistrationService.Register
       post: /api/fachstellen
       body: "*"
-    - selector: de.ozgcloud.fachstellenproxy.CollaborationService.FindVorgang
+    - selector: de.ozgcloud.collaboration.CollaborationService.FindVorgang
       get: /api/vorgang/{vorgangId}/{samlToken}
diff --git a/api/openapi-config.yml b/api/openapi-config.yml
index f32a4dd6e5c5a8d5629b450e15a881fc7048c522..f4dffedc92bcb3cf4e91c74900fb20756068356b 100644
--- a/api/openapi-config.yml
+++ b/api/openapi-config.yml
@@ -50,7 +50,7 @@ openapiOptions:
     - service: de.ozgcloud.fachstellenproxy.FachstelleRegistrationService
       option:
         description: "Service to proxy between Fachstelle and ZufiManager in OZG-Cloud"
-    - service: de.ozgcloud.fachstellenproxy.CollaborationService
+    - service: de.ozgcloud.collaboration.CollaborationService
       option:
         description: "Service to proxy between Fachstelle and CollaborationManager in OZG-Cloud"
   method:
@@ -65,7 +65,7 @@ openapiOptions:
             description: Returned when the request payload is not suitable.
           "503":
             description: Returned when the resource is temporarily unavailable.
-    - method: de.ozgcloud.fachstellenproxy.CollaborationService.FindVorgang
+    - method: de.ozgcloud.collaboration.CollaborationService.FindVorgang
       option:
         description: "Find vorgang by its id"
         summary: "Summary: FindVorgang rpc"
@@ -76,7 +76,7 @@ openapiOptions:
             description: Returned when the resource is temporarily unavailable.
           "404":
             description: Returned when the resource does not exist.
-    - method: de.ozgcloud.fachstellenproxy.CollaborationService.GetFileContent
+    - method: de.ozgcloud.collaboration.CollaborationService.GetFileContent
       option:
         description: "Get file content by file id"
         summary: "Summary: GetFileContent rpc"
diff --git a/api/proto/collaboration.model.proto b/api/proto/collaboration.model.proto
index b51dbbdf794130e400f0cea360c13822cb33e677..2095dead8e2cc4fd8e5b9fde0d7f372427cd0610 100644
--- a/api/proto/collaboration.model.proto
+++ b/api/proto/collaboration.model.proto
@@ -21,13 +21,16 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-
 syntax = "proto3";
 
-package de.ozgcloud.fachstellenproxy;
+package de.ozgcloud.collaboration;
 
 option go_package = "de.ozgcloud.fachstellenproxy";
 
+option java_multiple_files = true;
+option java_package = "de.ozgcloud.collaboration";
+option java_outer_classname = "CollaborationModelProto";
+
 message GrpcFindVorgangRequest {
   string vorgangId = 1;
   string samlToken = 2;
@@ -45,7 +48,6 @@ message GrpcVorgang {
 
   GrpcVorgangHeader header = 5;
   GrpcEingang eingang = 6;
-  GrpcCollaborationRequest collaborationRequest = 7;
 }
 
 message GrpcVorgangHeader {
@@ -53,11 +55,6 @@ message GrpcVorgangHeader {
   string aktenzeichen = 2;
 }
 
-message GrpcCollaborationRequest {
-  string title = 1;
-  string text = 2;
-}
-
 message GrpcEingang {
   GrpcAntragsteller antragsteller = 1;
 
diff --git a/api/proto/collaboration.proto b/api/proto/collaboration.proto
index fac2e32c3e532a0340a5d0dcf2a0000ef512f7ee..52f5af6b15d493815b0a0c03e3444aa45e08abf6 100644
--- a/api/proto/collaboration.proto
+++ b/api/proto/collaboration.proto
@@ -21,17 +21,23 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-
 syntax = "proto3";
 
-package de.ozgcloud.fachstellenproxy;
+package de.ozgcloud.collaboration;
 
 import "collaboration.model.proto";
 
 option go_package = "de.ozgcloud.fachstellenproxy";
 
+option java_multiple_files = true;
+option java_package = "de.ozgcloud.collaboration";
+option java_outer_classname = "CollaborationProto";
+
 service CollaborationService {
-  rpc FindVorgang(GrpcFindVorgangRequest) returns (GrpcFindVorgangResponse);
 
-  rpc GetFileContent(GrpcGetFileContentRequest) returns (stream GrpcGetFileContentResponse);
+  rpc FindVorgang(GrpcFindVorgangRequest) returns (GrpcFindVorgangResponse) {
+  }
+
+  rpc GetFileContent(GrpcGetFileContentRequest) returns (stream GrpcGetFileContentResponse) {
+  }
 }
\ No newline at end of file
diff --git a/config/config.yml b/config/config.yml
index 8a80d9ff53c5aecb6d8d2ef2aa61265ac0e0dbee..f785d25ac4f5e72c23b00a3b76c330ccd40604ca 100755
--- a/config/config.yml
+++ b/config/config.yml
@@ -2,9 +2,11 @@ http:
   server:
     port: 8082
 grpc:
-  mock: true
+  mock: false
   collaboration:
     router:
       port: 50051
+    server:
+      port: 9090
 logging:
   level: "INFO"
\ No newline at end of file