diff --git a/client2/pom.xml b/client2/pom.xml
index 0be7b764da..5e8abcd59b 100644
--- a/client2/pom.xml
+++ b/client2/pom.xml
@@ -143,6 +143,9 @@
                             <item>
                                 <code>java.class.nonPublicPartOfAPI</code>
                             </item>
+                            <item>
+                                <code>java.class.removed</code>
+                            </item>
                         </revapi.ignore>
                     </analysisConfiguration>
                 </configuration>
diff --git a/server/impl/pom.xml b/server/impl/pom.xml
index 2b82c384ac..5dd67823a2 100644
--- a/server/impl/pom.xml
+++ b/server/impl/pom.xml
@@ -388,7 +388,6 @@
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin</artifactId>
                 <configuration>
-<!--                    <openapi31>true</openapi31>-->
                     <outputFileName>swagger</outputFileName>
                     <outputPath>${project.build.directory}/classes/com/walmartlabs/concord/server/swagger</outputPath>
                     <outputFormat>YAML</outputFormat>
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java
index 2e041d806f..b71dca41b1 100644
--- a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java
+++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java
@@ -34,6 +34,7 @@
 import com.walmartlabs.concord.server.user.UserManager;
 import com.walmartlabs.concord.server.user.UserType;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.headers.Header;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -102,7 +103,7 @@ public SecretResource(OrganizationManager orgManager,
     @Validate
     @Operation(description = "Create secret", operationId = "createSecret")
     public SecretOperationResponse create(@PathParam("orgName") @ConcordKey String orgName,
-                                          @RequestBody(content = @Content(schema = @Schema(type = "object"))) MultipartInput input) {
+                                          @Parameter(schema = @Schema(type = "object", implementation = Object.class)) MultipartInput input) {
 
         OrganizationEntry org = orgManager.assertAccess(orgName, true);
 
@@ -203,8 +204,7 @@ public SecretEntry get(@PathParam("orgName") @ConcordKey String orgName,
     )
     public Response getData(@PathParam("orgName") @ConcordKey String orgName,
                             @PathParam("secretName") @ConcordKey String secretName,
-                            @RequestBody(content = @Content(schema = @Schema(type = "object", implementation = GetDataRequest.class)))
-                            MultipartInput input) {
+                            @Parameter(schema = @Schema(type = "object", implementation = GetDataRequest.class)) MultipartInput input) {
 
         GetDataRequest request = GetDataRequest.from(input);
 
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceV2.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceV2.java
index a3deda4e44..31fa1877b0 100644
--- a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceV2.java
+++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceV2.java
@@ -109,7 +109,7 @@ public List<SecretEntryV2> list(@PathParam("orgName") @ConcordKey String orgName
     @Operation(description = "Updates an existing secret", operationId = "updateSecret")
     public GenericOperationResult update(@PathParam("orgName") @ConcordKey String orgName,
                                          @PathParam("secretName") @ConcordKey String secretName,
-                                         @RequestBody(content = @Content(schema = @Schema(type = "object"))) MultipartInput input) {
+                                         @Parameter(schema = @Schema(type = "object", implementation = Object.class)) MultipartInput input) {
 
         OrganizationEntry org = orgManager.assertAccess(orgName, true);
         Set<UUID> projectIds = getProjectIds(
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java
index 9f830ee941..41cba9aa1f 100644
--- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java
+++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java
@@ -267,8 +267,7 @@ public StartProcessResponse start(@PathParam("entryPoint") String entryPoint,
     @Produces(MediaType.APPLICATION_JSON)
     @WithTimer
     @Operation(description = "Start new process", operationId = "startProcess")
-    public StartProcessResponse start(@RequestBody(content = @Content(schema = @Schema(type = "object")))
-                                      MultipartInput input,
+    public StartProcessResponse start(@Parameter(schema = @Schema(type = "object", implementation = Object.class)) MultipartInput input,
                                       @Parameter(hidden = true) @Deprecated @QueryParam("parentId") UUID parentInstanceId,
                                       @Parameter(hidden = true) @Deprecated @DefaultValue("false") @QueryParam("sync") boolean sync,
                                       @Parameter(hidden = true) @Deprecated @QueryParam("out") String[] out,
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java
index 4134bbc28f..38758a78a7 100644
--- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java
+++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java
@@ -43,11 +43,8 @@
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.extensions.Extension;
 import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
-import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonatype.siesta.Resource;
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java
index 2d45878fb1..4e00330c6e 100644
--- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java
+++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java
@@ -33,6 +33,7 @@
 import com.walmartlabs.concord.server.sdk.ProcessKey;
 import com.walmartlabs.concord.server.sdk.metrics.WithTimer;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -116,8 +117,7 @@ public ResumeProcessResponse restore(@PathParam("id") UUID instanceId,
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Operation(description = "Upload checkpoint")
     public void uploadCheckpoint(@PathParam("id") UUID instanceId,
-                                 @RequestBody(content = @Content(schema = @Schema(type = "object")))
-                                 MultipartInput input) {
+                                 @Parameter(schema = @Schema(type = "object", implementation = Object.class)) MultipartInput input) {
 
         // TODO replace with ProcessKeyCache
         ProcessEntry entry = processManager.assertProcess(instanceId);
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java
index f885e810b6..ef1582ada1 100644
--- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java
+++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java
@@ -24,6 +24,7 @@
 import com.walmartlabs.concord.server.process.state.ProcessStateManager;
 import com.walmartlabs.concord.server.sdk.PartialProcessKey;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -119,7 +120,7 @@ public FormSubmitResponse submit(@PathParam("processInstanceId") UUID processIns
     @Operation(description = "Submit JSON form data", operationId = "submitFormAsMultipart")
     public FormSubmitResponse submit(@PathParam("processInstanceId") UUID processInstanceId,
                                      @PathParam("formName") String formName,
-                                     @RequestBody(content = @Content(schema = @Schema(type = "object"))) MultipartInput data) {
+                                     @Parameter(schema = @Schema(type = "object", implementation = Object.class)) MultipartInput data) {
 
         if (isV2(processInstanceId)) {
             return formResourceV2.submit(processInstanceId, formName, data);