diff --git a/core/src/main/java/org/justserve/client/GraphQLClient.java b/core/src/main/java/org/justserve/client/GraphQLClient.java
index d96cad8..2f268d4 100644
--- a/core/src/main/java/org/justserve/client/GraphQLClient.java
+++ b/core/src/main/java/org/justserve/client/GraphQLClient.java
@@ -11,51 +11,40 @@
 @Produces("application/json")
 @Consumes("application/graphql-response+json; charset=utf-8")
 @Retryable
-@Client("justserve")
+@Client(id = "justserve", path = "/graphql")
 public interface GraphQLClient {
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLAddProjectAttachmentData> executeAddProjectAttachment(@Body GraphQLAddProjectAttachmentRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLAddProjectOrganizationData> executeAddProjectOrganization(@Body GraphQLAddProjectOrganizationRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLCombinedMutationUpdateProjectAddProjectTagData> executeCombinedMutationUpdateProjectAddProjectTag(@Body GraphQLCombinedMutationUpdateProjectAddProjectTagRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLCreateEventData> executeCreateEvent(@Body GraphQLCreateEventRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLCreateProjectData> executeCreateProject(@Body GraphQLCreateProjectRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLPublishProjectData> executePublishProject(@Body GraphQLPublishProjectRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLSearchOrganizationData> executeSearchOrganization(@Body GraphQLSearchOrganizationRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLSetProjectLocationData> executeSetProjectLocation(@Body GraphQLSetProjectLocationRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLUpdateProjectAttachmentData> executeUpdateProjectAttachment(@Body GraphQLUpdateProjectAttachmentRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLUpdateProjectListingData> executeUpdateProjectListing(@Body GraphQLUpdateProjectListingRequest request);
 
-    @Post("/graphql")
-    @Consumes("application/graphql-response+json")
+    @Post
     GraphQLResponse<GraphQLUpdateProjectData> executeUpdateProject(@Body GraphQLUpdateProjectRequest request);
 
     default GraphQLResponse<GraphQLAddProjectAttachmentData> addProjectAttachment(GraphQLAddProjectAttachmentVariables variables) {
diff --git a/core/src/test/resources/application-test.yaml b/core/src/test/resources/application-test.yaml
index a923d6d..0a25b6f 100644
--- a/core/src/test/resources/application-test.yaml
+++ b/core/src/test/resources/application-test.yaml
@@ -3,6 +3,8 @@ micronaut:
     services:
       justserve:
         url: https://stage.justserve.org
+justserve:
+  token: ${:i-need-to-be-defined}
 logger:
   levels:
     io.micronaut.http.client: DEBUG