fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vorbur...@apache.org
Subject [fineract] branch develop updated: FINERACT-835: Upgrade Swagger Annotations to Annotations 2.0 (#1101)
Date Fri, 26 Jun 2020 11:32:23 GMT
This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new d9df7fe  FINERACT-835: Upgrade Swagger Annotations to Annotations 2.0 (#1101)
d9df7fe is described below

commit d9df7fe245d49d4542ddf4d331bd846828d7ed22
Author: Petri Tuomola <ptuomola@users.noreply.github.com>
AuthorDate: Fri Jun 26 14:32:14 2020 +0300

    FINERACT-835: Upgrade Swagger Annotations to Annotations 2.0 (#1101)
    
    Co-authored-by: Michael Vorburger ⛑️ <mike@vorburger.ch>
---
 .travis.yml                                        |   2 +-
 Dockerfile                                         |   4 +-
 fineract-provider/build.gradle                     |   6 +-
 fineract-provider/dependencies.gradle              |   6 +-
 .../accrual/api/AccrualAccountingApiResource.java  |  31 +-
 .../api/AccrualAccountingApiResourceSwagger.java   |  11 +-
 .../closure/api/GLClosuresApiResource.java         |  71 +--
 .../closure/api/GLClosuresApiResourceSwagger.java  |  65 +--
 .../api/FinancialActivityAccountsApiResource.java  |  63 +-
 ...inancialActivityAccountsApiResourceSwagger.java |  33 +-
 .../glaccount/api/GLAccountsApiResource.java       | 104 ++--
 .../api/GLAccountsApiResourceSwagger.java          |  67 ++-
 .../api/JournalEntriesApiResource.java             | 103 ++--
 .../api/JournalEntriesApiResourceSwagger.java      |  17 +-
 .../api/ProvisioningEntriesApiResource.java        |  69 ++-
 .../api/ProvisioningEntriesApiResourceSwagger.java |  25 +-
 .../rule/api/AccountingRuleApiResource.java        |  80 +--
 .../rule/api/AccountingRuleApiResourceSwagger.java |  41 +-
 .../fineract/adhocquery/api/AdHocApiResource.java  |  15 +-
 .../fineract/batch/api/BatchApiResource.java       |  45 +-
 .../batch/api/BatchApiResourceSwagger.java         |  31 +-
 .../fineract/commands/api/AuditsApiResource.java   |  82 +--
 .../commands/api/MakercheckersApiResource.java     |  64 +-
 .../api/MakercheckersApiResourceSwagger.java       |  11 +-
 .../api/AccountNumberFormatsApiResource.java       |  66 +--
 .../AccountNumberFormatsApiResourceSwagger.java    |  35 +-
 .../infrastructure/cache/api/CacheApiResource.java |  39 +-
 .../cache/api/CacheApiResourceSwagger.java         |  13 +-
 .../campaigns/sms/api/SmsCampaignApiResource.java  |  53 +-
 .../codes/api/CodeValuesApiResource.java           |  78 +--
 .../codes/api/CodeValuesApiResourceSwagger.java    |  47 +-
 .../infrastructure/codes/api/CodesApiResource.java |  67 +--
 .../codes/api/CodesApiResourceSwagger.java         |  33 +-
 .../ExternalServicesConfigurationApiResource.java  |  44 +-
 ...nalServicesConfigurationApiResourceSwagger.java |   9 +-
 .../api/GlobalConfigurationApiResource.java        |  62 +-
 .../api/GlobalConfigurationApiResourceSwagger.java |  19 +-
 .../api/CreditBureauConfigurationAPI.java          |   2 -
 .../dataqueries/api/DatatablesApiResource.java     | 169 +++---
 .../api/DatatablesApiResourceSwagger.java          | 119 ++--
 .../api/EntityDatatableChecksApiResource.java      |  56 +-
 .../EntityDatatableChecksApiResourceSwagger.java   |  25 +-
 .../dataqueries/api/ReportsApiResource.java        |  70 +--
 .../dataqueries/api/ReportsApiResourceSwagger.java |  55 +-
 .../dataqueries/api/RunreportsApiResource.java     |  26 +-
 .../api/RunreportsApiResourceSwagger.java          |   4 +-
 .../api/DocumentManagementApiResource.java         | 105 ++--
 .../api/DocumentManagementApiResourceSwagger.java  |  43 +-
 .../documentmanagement/api/ImagesApiResource.java  |   3 +-
 .../api/FineractEntityApiResource.java             |   3 +-
 .../infrastructure/hooks/api/HookApiResource.java  |  71 +--
 .../hooks/api/HookApiResourceSwagger.java          |  59 +-
 .../jobs/api/SchedulerApiResource.java             |  30 +-
 .../jobs/api/SchedulerApiResourceSwagger.java      |   7 +-
 .../jobs/api/SchedulerJobApiResource.java          |  67 ++-
 .../jobs/api/SchedulerJobApiResourceSwagger.java   |  41 +-
 .../api/ReportMailingJobApiResource.java           |  77 ++-
 .../api/ReportMailingJobApiResourceSwagger.java    |  89 ++-
 .../api/ReportMailingJobRunHistoryApiResource.java |  33 +-
 ...portMailingJobRunHistoryApiResourceSwagger.java |  19 +-
 .../security/api/AuthenticationApiResource.java    |  23 +-
 .../api/AuthenticationApiResourceSwagger.java      |  23 +-
 .../security/api/UserDetailsApiResource.java       |  26 +-
 .../api/UserDetailsApiResourceSwagger.java         |  23 +-
 .../infrastructure/sms/api/SmsApiResource.java     |   3 +-
 .../survey/api/LikelihoodApiResource.java          |   3 +-
 .../survey/api/PovertyLineApiResource.java         |   3 +-
 .../survey/api/SurveyApiResource.java              |  42 +-
 .../survey/api/SurveyApiResourceSwagger.java       |  47 +-
 .../interoperation/api/InteropApiResource.java     | 188 +++---
 .../fineract/mix/api/MixReportApiResource.java     |   8 +-
 .../fineract/mix/api/MixTaxonomyApiResource.java   |   8 +-
 .../mix/api/MixTaxonomyMappingApiResource.java     |   8 +-
 .../notification/api/NotificationApiResource.java  |   8 +-
 .../holiday/api/HolidaysApiResource.java           |  95 +--
 .../holiday/api/HolidaysApiResourceSwagger.java    |  63 +-
 .../monetary/api/CurrenciesApiResource.java        |  37 +-
 .../monetary/api/CurrenciesApiResourceSwagger.java |  17 +-
 .../office/api/OfficeTransactionsApiResource.java  |   3 +-
 .../office/api/OfficesApiResource.java             |  69 +--
 .../office/api/OfficesApiResourceSwagger.java      |  57 +-
 .../api/ProvisioningCategoryApiResource.java       |   8 +-
 .../api/ProvisioningCriteriaApiResource.java       |  58 +-
 .../ProvisioningCriteriaApiResourceSwagger.java    |  41 +-
 .../organisation/staff/api/StaffApiResource.java   |  68 +--
 .../staff/api/StaffApiResourceSwagger.java         |  69 ++-
 .../teller/api/CashierApiResource.java             |   8 +-
 .../organisation/teller/api/TellerApiResource.java | 202 ++++---
 .../teller/api/TellerApiResourceSwagger.java       | 281 +++++----
 .../teller/api/TellerJournalApiResource.java       |   8 +-
 .../workingdays/api/WorkingDaysApiResource.java    |  43 +-
 .../api/WorkingDaysApiResourceSwagger.java         |  27 +-
 .../account/api/AccountTransfersApiResource.java   | 110 ++--
 .../api/AccountTransfersApiResourceSwagger.java    | 315 +++++-----
 .../api/StandingInstructionApiResource.java        | 115 ++--
 .../api/StandingInstructionApiResourceSwagger.java | 309 +++++-----
 .../api/StandingInstructionHistoryApiResource.java |  52 +-
 ...andingInstructionHistoryApiResourceSwagger.java |  51 +-
 .../accounts/api/AccountsApiResource.java          |  93 ++-
 .../accounts/api/AccountsApiResourceSwagger.java   | 313 +++++-----
 .../api/EntityFieldConfigurationApiResources.java  |  30 +-
 ...ntityFieldConfigurationApiResourcesSwagger.java |  19 +-
 .../portfolio/charge/api/ChargesApiResource.java   |  78 +--
 .../charge/api/ChargesApiResourceSwagger.java      | 125 ++--
 .../client/api/ClientAddressApiResources.java      |  58 +-
 .../api/ClientAddressApiResourcesSwagger.java      |  75 ++-
 .../client/api/ClientChargesApiResource.java       |  81 ++-
 .../api/ClientChargesApiResourceSwagger.java       | 111 ++--
 .../client/api/ClientIdentifiersApiResource.java   |  77 ++-
 .../api/ClientIdentifiersApiResourceSwagger.java   |  65 +--
 .../client/api/ClientTransactionsApiResource.java  |  51 +-
 .../api/ClientTransactionsApiResourceSwagger.java  |  65 +--
 .../portfolio/client/api/ClientsApiResource.java   | 129 ++--
 .../client/api/ClientsApiResourceSwagger.java      | 277 +++++----
 .../collateral/api/CollateralsApiResource.java     |  76 ++-
 .../api/CollateralsApiResourceSwagger.java         |  61 +-
 .../api/CollectionSheetApiResourceSwagger.java     |  35 +-
 .../api/CollectionSheetApiResourse.java            |  27 +-
 .../api/FloatingRatesApiResource.java              |  55 +-
 .../api/FloatingRatesApiResourceSwagger.java       |  89 ++-
 .../portfolio/fund/api/FundsApiResource.java       |  53 +-
 .../fund/api/FundsApiResourceSwagger.java          |  25 +-
 .../portfolio/group/api/CentersApiResource.java    | 128 ++--
 .../group/api/CentersApiResourceSwagger.java       | 181 +++---
 .../portfolio/group/api/GroupsApiResource.java     | 147 ++---
 .../group/api/GroupsApiResourceSwagger.java        | 285 +++++----
 .../api/InterestRateChartSlabsApiResource.java     |  69 ++-
 .../InterestRateChartSlabsApiResourceSwagger.java  |  99 ++--
 .../api/InterestRateChartsApiResource.java         |  67 +--
 .../api/InterestRateChartsApiResourceSwagger.java  |  73 ++-
 .../loanaccount/api/LoanChargesApiResource.java    | 100 ++--
 .../api/LoanChargesApiResourceSwagger.java         | 165 +++---
 .../loanaccount/api/LoanScheduleApiResource.java   |  34 +-
 .../api/LoanScheduleApiResourceSwagger.java        |  11 +-
 .../api/LoanTransactionsApiResource.java           |  72 ++-
 .../api/LoanTransactionsApiResourceSwagger.java    | 109 ++--
 .../loanaccount/api/LoansApiResource.java          | 234 ++++----
 .../loanaccount/api/LoansApiResourceSwagger.java   | 471 ++++++++-------
 .../loanproduct/api/LoanProductsApiResource.java   |  65 +--
 .../api/LoanProductsApiResourceSwagger.java        | 647 ++++++++++-----------
 .../portfolio/note/api/NotesApiResource.java       |  82 ++-
 .../note/api/NotesApiResourceSwagger.java          |  81 ++-
 .../paymenttype/api/PaymentTypeApiResource.java    |  61 +-
 .../api/PaymentTypeApiResourceSwagger.java         |  59 +-
 .../products/api/ProductsApiResource.java          |  75 +--
 .../products/api/ProductsApiResourceSwagger.java   | 335 ++++++-----
 .../api/FixedDepositAccountsApiResource.java       | 101 ++--
 .../FixedDepositAccountsApiResourceSwagger.java    | 313 +++++-----
 .../api/FixedDepositProductsApiResource.java       |  69 ++-
 .../FixedDepositProductsApiResourceSwagger.java    | 319 +++++-----
 ...rringDepositAccountTransactionsApiResource.java |  68 +--
 ...positAccountTransactionsApiResourceSwagger.java | 177 +++---
 .../api/RecurringDepositAccountsApiResource.java   | 101 ++--
 ...RecurringDepositAccountsApiResourceSwagger.java | 313 +++++-----
 .../api/RecurringDepositProductsApiResource.java   |  69 ++-
 ...RecurringDepositProductsApiResourceSwagger.java | 341 ++++++-----
 .../api/SavingsAccountChargesApiResource.java      | 102 ++--
 .../SavingsAccountChargesApiResourceSwagger.java   | 201 ++++---
 .../savings/api/SavingsAccountsApiResource.java    | 102 ++--
 .../api/SavingsAccountsApiResourceSwagger.java     | 189 +++---
 .../savings/api/SavingsProductsApiResource.java    |  71 ++-
 .../api/SavingsProductsApiResourceSwagger.java     | 367 ++++++------
 .../portfolio/search/api/SearchApiResource.java    |  46 +-
 .../search/api/SearchApiResourceSwagger.java       |  55 +-
 .../api/SelfAccountTransferApiResource.java        |  33 +-
 .../api/SelfAccountTransferApiResourceSwagger.java |  71 ++-
 .../api/SelfBeneficiariesTPTApiResource.java       |  71 ++-
 .../SelfBeneficiariesTPTApiResourceSwagger.java    |  63 +-
 .../self/client/api/SelfClientsApiResource.java    | 110 ++--
 .../client/api/SelfClientsApiResourceSwagger.java  | 279 +++++----
 .../self/loanaccount/api/SelfLoansApiResource.java | 108 ++--
 .../api/SelfLoansApiResourceSwagger.java           | 573 +++++++++---------
 .../self/pockets/api/PocketApiResource.java        |  31 +-
 .../self/pockets/api/PocketApiResourceSwagger.java |  35 +-
 .../products/api/SelfLoanProductsApiResource.java  | 166 +++---
 .../api/SelfServiceRegistrationApiResource.java    |   8 +-
 .../self/runreport/SelfRunReportApiResource.java   |  41 +-
 .../runreport/SelfRunReportApiResourceSwagger.java |  17 +-
 .../self/savings/api/SelfSavingsApiResource.java   |  57 +-
 .../savings/api/SelfSavingsApiResourceSwagger.java | 221 ++++---
 .../api/SelfAuthenticationApiResource.java         |  18 +-
 .../api/SelfAuthenticationApiResourceSwagger.java  |  41 +-
 .../self/security/api/SelfUserApiResource.java     |  31 +-
 .../security/api/SelfUserApiResourceSwagger.java   |  17 +-
 .../security/api/SelfUserDetailsApiResource.java   |  25 +-
 .../api/SelfUserDetailsApiResourceSwagger.java     |  41 +-
 .../api/SelfShareAccountsApiResource.java          |  40 +-
 .../api/SelfShareAccountsApiResourceSwagger.java   | 339 ++++++-----
 .../self/spm/api/SelfScorecardApiResource.java     |   8 +-
 .../portfolio/self/spm/api/SelfSpmApiResource.java |   8 +-
 .../api/ShareDividendApiResource.java              |   8 +-
 .../portfolio/tax/api/TaxComponentApiResource.java |  54 +-
 .../tax/api/TaxComponentApiResourceSwagger.java    |  69 ++-
 .../portfolio/tax/api/TaxGroupApiResource.java     |  58 +-
 .../tax/api/TaxGroupApiResourceSwagger.java        |  59 +-
 .../fineract/spm/api/LookupTableApiResource.java   |  41 +-
 .../fineract/spm/api/ScorecardApiResource.java     |  38 +-
 .../apache/fineract/spm/api/SpmApiResource.java    |  43 +-
 .../template/api/TemplatesApiResource.java         |  82 +--
 .../template/api/TemplatesApiResourcesSwagger.java |  75 ++-
 .../api/PasswordPreferencesApiResource.java        |  41 +-
 .../api/PasswordPreferencesApiResourceSwagger.java |  17 +-
 .../api/PermissionsApiResource.java                |  41 +-
 .../api/PermissionsApiResourceSwagger.java         |  19 +-
 .../useradministration/api/RolesApiResource.java   |  95 +--
 .../api/RolesApiResourceSwagger.java               |  75 ++-
 .../useradministration/api/UsersApiResource.java   |  71 +--
 .../api/UsersApiResourceSwagger.java               |  91 ++-
 .../main/resources/META-INF/spring/appContext.xml  |   2 -
 .../src/main/resources/META-INF/spring/swagger.xml |  74 ---
 .../main/resources/static/swagger-ui/index.html    |   2 +-
 gradle.properties                                  |   7 +-
 212 files changed, 8626 insertions(+), 8913 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 244228b..184a451 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,6 +74,6 @@ script:
 # and Docker test does not run if integration test fails, which makes PR failure easier to understand.
 # @see https://docs.travis-ci.com/user/job-lifecycle/#customizing-the-build-phase
 # NOTE: Sleep after docker-compose increased to 60 seconds as often Travis would fail to get Docker up in 30 seconds
-  - ./gradlew --console=plain licenseMain licenseTest licenseIntegrationTest check  &&  ./gradlew --console=plain integrationTest --fail-fast  &&  sudo service mysql stop  &&  docker-compose build  &&  docker-compose up -d  &&  sleep 30s  &&  http --verify=no --timeout 240 --check-status get https://localhost:8443/fineract-provider/actuator/health  &&  (( $(http --verify=no --timeout 30 --check-status --body get https://localhost:8443/fineract-provider/actuator/info | wc --chars) > 100 ))
+  - ./gradlew --console=plain -q licenseMain licenseTest licenseIntegrationTest check  &&  ./gradlew --console=plain integrationTest --fail-fast  &&  sudo service mysql stop  &&  docker-compose build  &&  docker-compose up -d  &&  sleep 60s  &&  http --verify=no --timeout 240 --check-status get https://localhost:8443/fineract-provider/actuator/health  &&  (( $(http --verify=no --timeout 30 --check-status --body get https://localhost:8443/fineract-provider/actuator/info | wc --chars) > 100 ))
 # We stop the mysql system service when running the Docker test to avoid port 3306 conflicts (unless we run the mysql in docker-compose on another port; req. FINERACT-773)
 # The fany /actuator/info test makes sure that has more than 100 characters of JSON to test that the git.properties worked (see FINERACT-983)
diff --git a/Dockerfile b/Dockerfile
index 4b41164..fa32a21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && apt-get install -y wget
 COPY . fineract
 WORKDIR /fineract
 
-RUN ./gradlew --no-daemon -x rat -x test bootJar
+RUN ./gradlew --no-daemon -q -x rat -x test bootJar
 
 WORKDIR /fineract/target
 RUN jar -xf /fineract/build/libs/fineract-provider.jar
@@ -33,7 +33,7 @@ RUN jar -xf /fineract/build/libs/fineract-provider.jar
 # allowing implementations to switch the driver used by changing start-up parameters (for both tenants and each tenant DB)
 # The commented out lines in the docker-compose.yml illustrate how to do this.
 WORKDIR /fineract/target/BOOT-INF/lib
-RUN wget https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.20/mysql-connector-java-8.0.20.jar 
+RUN wget -q https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.20/mysql-connector-java-8.0.20.jar
 
 # =========================================
 
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 1723001..f6e1a4c 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -102,7 +102,7 @@ dependencyManagement {
         dependency 'com.jayway.jsonpath:json-path:2.4.0'
         dependency 'org.apache.tika:tika-core:1.24.1'
         dependency 'org.apache.httpcomponents:httpclient:4.5.12'
-        dependency 'io.swagger:swagger-jersey-jaxrs:1.6.1'
+        dependency 'io.swagger.core.v3:swagger-annotations:2.1.2'
         dependency 'jakarta.management.j2ee:jakarta.management.j2ee-api:1.1.4'
         dependency 'jakarta.jms:jakarta.jms-api:2.0.3'
         dependency 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
@@ -179,6 +179,8 @@ eclipse
     }
 }
 
+System.setProperty("openjpa.Log", "commons")
+
 openjpa {
     includes = ['**/AbstractPersistableCustom.class', '**/domain/*.class']
     enhance {
@@ -189,6 +191,7 @@ openjpa {
 // Configuration for Swagger documentation generation task
 // https://github.com/swagger-api/swagger-core/tree/master/modules/swagger-gradle-plugin
 resolve {
+    logging.captureStandardOutput LogLevel.INFO
     outputFileName = 'fineract'
     outputFormat = 'JSON'
     prettyPrint = 'TRUE'
@@ -626,6 +629,7 @@ cargoRunLocal.dependsOn bootWar
 cargoStartLocal.dependsOn bootWar
 cargoStartLocal.mustRunAfter "integrationTestClasses"
 cargoStartLocal.mustRunAfter "enhance"
+cargoStartLocal.mustRunAfter "resolve"
 
 /* http://stackoverflow.com/questions/19653311/jpa-repository-works-in-idea-and-production-but-not-in-gradle */
 sourceSets.main.output.resourcesDir = sourceSets.main.java.outputDir
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index 911e224..3fa3e44 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -76,11 +76,9 @@ dependencies {
 
              'javax.cache:cache-api',
 
-             'com.github.spotbugs:spotbugs-annotations'
+             'com.github.spotbugs:spotbugs-annotations',
+             'io.swagger.core.v3:swagger-annotations'
     )
-    implementation ('io.swagger:swagger-jersey-jaxrs') {
-        exclude group: 'javax.validation'
-    }
     implementation ('org.apache.activemq:activemq-broker') {
         exclude group: 'org.apache.geronimo.specs'
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java
index 073ec08..906a59f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java
@@ -18,15 +18,12 @@
  */
 package org.apache.fineract.accounting.accrual.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -44,9 +41,7 @@ import org.springframework.stereotype.Component;
 @Path("/runaccruals")
 @Component
 @Scope("singleton")
-@Api(tags = { "Periodic Accrual Accounting" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Periodic Accrual Accounting", description = "Periodic Accrual is to accrue the loan income till the specific date or till batch job scheduled time.\n") })
+@Tag(name = "Periodic Accrual Accounting", description = "Periodic Accrual is to accrue the loan income till the specific date or till batch job scheduled time.\n")
 public class AccrualAccountingApiResource {
 
     private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
@@ -63,13 +58,11 @@ public class AccrualAccountingApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Executes Periodic Accrual Accounting", httpMethod = "POST", notes = "Mandatory Fields\n" + "\n" + "tillDate\n")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", required = true, type = "body", dataTypeClass = AccrualAccountingApiResourceSwagger.PostRunaccrualsRequest.class, value = "Request Body\n"
-                    + "\n" + "Field Descriptions: \n" + "tillDate: \n"
-                    + "which specifies periodic accruals should happen till the given Date") })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK") })
-    public String executePeriodicAccrualAccounting(@ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(summary = "Executes Periodic Accrual Accounting", method = "POST", description = "Mandatory Fields\n" + "\n" + "tillDate\n")
+    @Parameter(required = true, schema = @Schema(implementation = AccrualAccountingApiResourceSwagger.PostRunaccrualsRequest.class, description = "Request Body\n"
+            + "\n" + "Field Descriptions: \n" + "tillDate: \n" + "which specifies periodic accruals should happen till the given Date"))
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK") })
+    public String executePeriodicAccrualAccounting(@Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().excuteAccrualAccounting().withJson(jsonRequestBody).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResourceSwagger.java
index 3b1b3e4..c18a55b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.accounting.accrual.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 24/7/17.
@@ -30,18 +29,18 @@ final class AccrualAccountingApiResourceSwagger {
         // don't allow to instantiate; use only for live API documentation
     }
 
-    @ApiModel(value = "runaccrualsRequest")
+    @Schema(description = "runaccrualsRequest")
     public static final class PostRunaccrualsRequest {
 
         private PostRunaccrualsRequest() {
             // don't allow to instantiate; use only for live API documentation
         }
 
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "04 June 2014", notes = "which specifies periodic accruals should happen till the given Date", required = true)
+        @Schema(example = "04 June 2014", description = "which specifies periodic accruals should happen till the given Date", required = true)
         public String tillDate;
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java
index 33ca125..3d13cb4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.accounting.closure.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -61,12 +61,11 @@ import org.springframework.stereotype.Component;
 @Path("/glclosures")
 @Component
 @Scope("singleton")
-@Api(tags = { "Accounting Closure" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Accounting Closure", description = "An accounting closure indicates that no more journal entries may be logged (or reversed) in the system, either manually or via the portfolio with an entry date prior to the defined closure date\n"
-                + "\n" + "Field Descriptions\n" + "closingDate\n" + "The date for which the accounting closure is defined\n" + "officeId\n"
-                + "The identifer of the branch for which accounting has been closed\n" + "comments\n"
-                + "Description associated with an Accounting closure") })
+@Tag(name = "Accounting Closure", description = "An accounting closure indicates that no more journal entries may be logged (or reversed) in the system, either manually or via the portfolio with an entry date prior to the defined closure date\n"
+        + "\n" + "Field Descriptions\n" + "closingDate\n" + "The date for which the accounting closure is defined\n" + "officeId\n"
+        + "The identifer of the branch for which accounting has been closed\n" + "comments\n"
+        + "Description associated with an Accounting closure")
+
 public class GLClosuresApiResource {
 
     private static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
@@ -98,11 +97,11 @@ public class GLClosuresApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Accounting closures", notes = "Example Requests:\n" + "\n" + "glclosures")
+    @Operation(summary = "List Accounting closures", description = "Example Requests:\n" + "\n" + "glclosures")
     @ApiResponses({
-            @ApiResponse(code = 200, response = GLClosuresApiResourceSwagger.GetGlClosureResponse.class, message = "", responseContainer = "list") })
+            @ApiResponse(responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = GLClosuresApiResourceSwagger.GetGlClosureResponse.class, description = "")))) })
     public String retrieveAllClosures(@Context final UriInfo uriInfo,
-            @QueryParam("officeId") @ApiParam(value = "officeId") final Long officeId) {
+            @QueryParam("officeId") @Parameter(name = "officeId") final Long officeId) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
         final List<GLClosureData> glClosureDatas = this.glClosureReadPlatformService.retrieveAllGLClosures(officeId);
@@ -115,10 +114,11 @@ public class GLClosuresApiResource {
     @Path("{glClosureId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve an Accounting Closure", notes = "Example Requests:\n" + "\n" + "glclosures/1\n" + "\n" + "\n"
+    @Operation(summary = "Retrieve an Accounting Closure", description = "Example Requests:\n" + "\n" + "glclosures/1\n" + "\n" + "\n"
             + "/glclosures/1?fields=officeName,closingDate")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLClosuresApiResourceSwagger.GetGlClosureResponse.class) })
-    public String retreiveClosure(@PathParam("glClosureId") @ApiParam(value = "glClosureId") final Long glClosureId,
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLClosuresApiResourceSwagger.GetGlClosureResponse.class))) })
+    public String retreiveClosure(@PathParam("glClosureId") @Parameter(description = "glClosureId") final Long glClosureId,
             @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
@@ -137,11 +137,11 @@ public class GLClosuresApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create an Accounting Closure", notes = "Mandatory Fields\n" + "officeId,closingDate")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", required = true, type = "body", dataTypeClass = GLClosuresApiResourceSwagger.PostGlClosuresRequest.class, value = "Request Body") })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLClosuresApiResourceSwagger.PostGlClosuresResponse.class) })
-    public String createGLClosure(@ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(summary = "Create an Accounting Closure", description = "Mandatory Fields\n" + "officeId,closingDate")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = GLClosuresApiResourceSwagger.PostGlClosuresRequest.class, description = "Request Body")))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLClosuresApiResourceSwagger.PostGlClosuresResponse.class))) })
+    public String createGLClosure(@Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createGLClosure().withJson(jsonRequestBody).build();
 
@@ -154,12 +154,12 @@ public class GLClosuresApiResource {
     @Path("{glClosureId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update an Accounting closure", notes = "Once an accounting closure is created, only the comments associated with it may be edited")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "Request body", dataType = "body", dataTypeClass = GLClosuresApiResourceSwagger.PutGlClosuresRequest.class, required = true) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLClosuresApiResourceSwagger.PutGlClosuresResponse.class) })
-    public String updateGLClosure(@PathParam("glClosureId") @ApiParam(value = "glClosureId") final Long glClosureId,
-            @ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(summary = "Update an Accounting closure", description = "Once an accounting closure is created, only the comments associated with it may be edited")
+    @RequestBody(content = @Content(schema = @Schema(implementation = GLClosuresApiResourceSwagger.PutGlClosuresRequest.class, required = true)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLClosuresApiResourceSwagger.PutGlClosuresResponse.class))) })
+    public String updateGLClosure(@PathParam("glClosureId") @Parameter(description = "glClosureId") final Long glClosureId,
+            @Parameter(hidden = true) final String jsonRequestBody) {
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateGLClosure(glClosureId).withJson(jsonRequestBody).build();
 
         final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
@@ -171,9 +171,10 @@ public class GLClosuresApiResource {
     @Path("{glClosureId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete an accounting closure", notes = "Note: Only the latest accounting closure associated with a branch may be deleted.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLClosuresApiResourceSwagger.DeleteGlClosuresResponse.class) })
-    public String deleteGLClosure(@PathParam("glClosureId") @ApiParam(value = "glclosureId") final Long glClosureId) {
+    @Operation(summary = "Delete an accounting closure", description = "Note: Only the latest accounting closure associated with a branch may be deleted.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLClosuresApiResourceSwagger.DeleteGlClosuresResponse.class))) })
+    public String deleteGLClosure(@PathParam("glClosureId") @Parameter(description = "glclosureId") final Long glClosureId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteGLClosure(glClosureId).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java
index 99345a1..7810858 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.accounting.closure.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.joda.time.LocalDate;
 
 final class GLClosuresApiResourceSwagger {
@@ -33,108 +32,108 @@ final class GLClosuresApiResourceSwagger {
      */
     // Check !!
 
-    @ApiModel(value = "GetGLClosureResponse")
+    @Schema(description = "GetGLClosureResponse")
     public static final class GetGlClosureResponse {
 
         private GetGlClosureResponse() {
             // dont allow to initiatiate
         }
 
-        @ApiModelProperty(example = "7")
+        @Schema(example = "7")
         public Long id;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
-        @ApiModelProperty(example = "2013,1,2")
+        @Schema(example = "2013,1,2")
         public LocalDate closingDate;
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public boolean deleted;
-        @ApiModelProperty(example = "2013,1,3")
+        @Schema(example = "2013,1,3")
         public LocalDate createdDate;
-        @ApiModelProperty(example = "2013,1,3")
+        @Schema(example = "2013,1,3")
         public LocalDate lastUpdatedDate;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long createdByUserId;
-        @ApiModelProperty(example = "mifos")
+        @Schema(example = "mifos")
         public String createdByUsername;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long lastUpdatedByUserId;
-        @ApiModelProperty(example = "mifos")
+        @Schema(example = "mifos")
         public String lastUpdatedByUsername;
-        @ApiModelProperty(example = "closed")
+        @Schema(example = "closed")
         public String comments;
 
     }
 
-    @ApiModel(value = "PostGLCLosuresRequest")
+    @Schema(description = "PostGLCLosuresRequest")
     public static final class PostGlClosuresRequest {
 
         private PostGlClosuresRequest() {
             // don't allow to instantiate; use only for live API documentation
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "06 December 2012")
+        @Schema(example = "06 December 2012")
         public LocalDate closingDate;
-        @ApiModelProperty(example = "The accountants are heading for a carribean vacation")
+        @Schema(example = "The accountants are heading for a carribean vacation")
         public String comments;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
     }
 
-    @ApiModel(value = "PostGlClosuresResponse")
+    @Schema(description = "PostGlClosuresResponse")
     public static final class PostGlClosuresResponse {
 
         private PostGlClosuresResponse() {
             // don't allow to instantiate; use only for live API documentation
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "9")
+        @Schema(example = "9")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutGlClosuresRequest")
+    @Schema(description = "PutGlClosuresRequest")
     public static final class PutGlClosuresRequest {
 
         private PutGlClosuresRequest() {
             // don't allow to instantiate; use only for live API documentation
         }
 
-        @ApiModelProperty(example = "All transactions verified by Johnny Cash")
+        @Schema(example = "All transactions verified by Johnny Cash")
         public String comments;
     }
 
-    @ApiModel(value = "PutGlClosuresResponse")
+    @Schema(description = "PutGlClosuresResponse")
     public static final class PutGlClosuresResponse {
 
         private PutGlClosuresResponse() {
             // don't allow to instantiate; use only for live API documentation
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "9")
+        @Schema(example = "9")
         public Long resourceId;
-        @ApiModelProperty(example = "All transactions verified by Johnny Cash")
+        @Schema(example = "All transactions verified by Johnny Cash")
         public String comments;
     }
 
-    @ApiModel(value = "DeleteGlClosuresResponse")
+    @Schema(description = "DeleteGlClosuresResponse")
     public static final class DeleteGlClosuresResponse {
 
         private DeleteGlClosuresResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "9")
+        @Schema(example = "9")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java
index 4fd498c..5aa7cd6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.accounting.financialactivityaccount.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -56,11 +56,9 @@ import org.springframework.stereotype.Component;
 @Path("/financialactivityaccounts")
 @Component
 @Scope("singleton")
-@Api(tags = { "Mapping Financial Activities to Accounts" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Mapping Financial Activities to Accounts", description = "Organization Level Financial Activities like Asset and Liability Transfer can be mapped to GL Account. Integrated accounting takes these accounts into consideration when an Account transfer is made between a savings to loan/savings account and vice-versa\n"
-                + "\n" + "Field Descriptions\n" + "financialActivityId\n" + "The identifier of the Financial Activity\n" + "glAccountId\n"
-                + "The identifier of a GL Account ( Ledger Account) which shall be used as the default account for the selected Financial Activity") })
+@Tag(name = "Mapping Financial Activities to Accounts", description = "Organization Level Financial Activities like Asset and Liability Transfer can be mapped to GL Account. Integrated accounting takes these accounts into consideration when an Account transfer is made between a savings to loan/savings account and vice-versa\n"
+        + "\n" + "Field Descriptions\n" + "financialActivityId\n" + "The identifier of the Financial Activity\n" + "glAccountId\n"
+        + "The identifier of a GL Account ( Ledger Account) which shall be used as the default account for the selected Financial Activity")
 public class FinancialActivityAccountsApiResource {
 
     private final FinancialActivityAccountReadPlatformService financialActivityAccountReadPlatformService;
@@ -101,10 +99,10 @@ public class FinancialActivityAccountsApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Financial Activities to Accounts Mappings", notes = "Example Requests:\n" + "\n"
+    @Operation(summary = "List Financial Activities to Accounts Mappings", description = "Example Requests:\n" + "\n"
             + "financialactivityaccounts")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = FinancialActivityAccountsApiResourceSwagger.GetFinancialActivityAccountsResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.GetFinancialActivityAccountsResponse.class)))) })
     public String retrieveAll(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.resourceNameForPermission);
@@ -119,11 +117,12 @@ public class FinancialActivityAccountsApiResource {
     @Path("{mappingId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Financial Activity to Account Mapping\n", notes = "Example Requests:\n" + "\n"
+    @Operation(summary = "Retrieve a Financial Activity to Account Mapping\n", description = "Example Requests:\n" + "\n"
             + "financialactivityaccounts/1")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = FinancialActivityAccountsApiResourceSwagger.GetFinancialActivityAccountsResponse.class) })
-    public String retreive(@PathParam("mappingId") @ApiParam(value = "mappingId") final Long mappingId, @Context final UriInfo uriInfo) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.GetFinancialActivityAccountsResponse.class))) })
+    public String retreive(@PathParam("mappingId") @Parameter(description = "mappingId") final Long mappingId,
+            @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.resourceNameForPermission);
 
@@ -141,13 +140,12 @@ public class FinancialActivityAccountsApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a new Financial Activity to Accounts Mapping", notes = "Mandatory Fields\n"
+    @Operation(summary = "Create a new Financial Activity to Accounts Mapping", description = "Mandatory Fields\n"
             + "financialActivityId, glAccountId")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "Request body", paramType = "body", dataType = "body", dataTypeClass = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsRequest.class) })
+    @RequestBody(content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsResponse.class) })
-    public String createGLAccount(@ApiParam(hidden = true) final String jsonRequestBody) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsResponse.class))) })
+    public String createGLAccount(@Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createOfficeToGLAccountMapping().withJson(jsonRequestBody)
                 .build();
@@ -161,13 +159,12 @@ public class FinancialActivityAccountsApiResource {
     @Path("{mappingId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Financial Activity to Account Mapping", notes = "the API updates the Ledger account linked to a Financial Activity \n")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "Request body", dataType = "body", paramType = "body", dataTypeClass = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsRequest.class) })
+    @Operation(summary = "Update a Financial Activity to Account Mapping", description = "the API updates the Ledger account linked to a Financial Activity \n")
+    @RequestBody(content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.PostFinancialActivityAccountsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = FinancialActivityAccountsApiResourceSwagger.PutFinancialActivityAccountsResponse.class) })
-    public String updateGLAccount(@PathParam("mappingId") @ApiParam(value = "mappingId") final Long mappingId,
-            @ApiParam(hidden = true) final String jsonRequestBody) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.PutFinancialActivityAccountsResponse.class))) })
+    public String updateGLAccount(@PathParam("mappingId") @Parameter(description = "mappingId") final Long mappingId,
+            @Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateOfficeToGLAccountMapping(mappingId)
                 .withJson(jsonRequestBody).build();
@@ -181,10 +178,10 @@ public class FinancialActivityAccountsApiResource {
     @Path("{mappingId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete a Financial Activity to Account Mapping")
+    @Operation(summary = "Delete a Financial Activity to Account Mapping")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = FinancialActivityAccountsApiResourceSwagger.DeleteFinancialActivityAccountsResponse.class) })
-    public String deleteGLAccount(@PathParam("mappingId") @ApiParam(value = "mappingId") final Long mappingId) {
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.DeleteFinancialActivityAccountsResponse.class))) })
+    public String deleteGLAccount(@PathParam("mappingId") @Parameter(description = "mappingId") final Long mappingId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteOfficeToGLAccountMapping(mappingId).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
index 44a8b4b..2b0f9e9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.accounting.financialactivityaccount.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 
@@ -30,58 +29,58 @@ final class FinancialActivityAccountsApiResourceSwagger {
 
     private FinancialActivityAccountsApiResourceSwagger() {}
 
-    @ApiModel(value = "GetFinancialActivityAccountsResponse")
+    @Schema(description = "GetFinancialActivityAccountsResponse")
     public static final class GetFinancialActivityAccountsResponse {
 
         private GetFinancialActivityAccountsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
         public FinancialActivityData financialActivityData;
         public GLAccountData glAccountData;
 
     }
 
-    @ApiModel(value = "PostFinancialActivityAccountsRequest")
+    @Schema(description = "PostFinancialActivityAccountsRequest")
     public static final class PostFinancialActivityAccountsRequest {
 
         private PostFinancialActivityAccountsRequest() {
 
         }
 
-        @ApiModelProperty(example = "200")
+        @Schema(example = "200")
         public Long financialActivityId;
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long glAccountId;
     }
 
-    @ApiModel(value = "PostFinancialActivityAccountsResponse")
+    @Schema(description = "PostFinancialActivityAccountsResponse")
     public static final class PostFinancialActivityAccountsResponse {
 
         private PostFinancialActivityAccountsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutFinancialActivityAccountsRequest")
+    @Schema(description = "PutFinancialActivityAccountsRequest")
     public static final class PutFinancialActivityAccountsRequest {
 
         private PutFinancialActivityAccountsRequest() {
 
         }
 
-        @ApiModelProperty(example = "200")
+        @Schema(example = "200")
         public Long financialActivityId;
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long glAccountId;
     }
 
-    @ApiModel(value = "PutFinancialActivityAccountsResponse")
+    @Schema(description = "PutFinancialActivityAccountsResponse")
     public static final class PutFinancialActivityAccountsResponse {
 
         private PutFinancialActivityAccountsResponse() {
@@ -92,23 +91,23 @@ final class FinancialActivityAccountsApiResourceSwagger {
 
             private PutFinancialActivityAccountscommentsSwagger() {}
 
-            @ApiModelProperty(example = "1")
+            @Schema(example = "1")
             public Long glAccountId;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
         public PutFinancialActivityAccountscommentsSwagger comments;
     }
 
-    @ApiModel(value = "DeleteFinancialActivityAccountsResponse")
+    @Schema(description = "DeleteFinancialActivityAccountsResponse")
     public static final class DeleteFinancialActivityAccountsResponse {
 
         private DeleteFinancialActivityAccountsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java
index e0491d3..0050447 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java
@@ -20,15 +20,15 @@ package org.apache.fineract.accounting.glaccount.api;
 
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
@@ -75,10 +75,8 @@ import org.springframework.stereotype.Component;
 @Path("/glaccounts")
 @Component
 @Scope("singleton")
-@Api(tags = { "General Ledger Account" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "General Ledger Account", description = "Ledger accounts represent an Individual account within an Organizations Chart Of Accounts(COA) and are assigned a name and unique number by which they can be identified. \n"
-                + "All transactions relating to a company's assets, liabilities, owners' equity, revenue and expenses are recorded against these accounts") })
+@Tag(name = "General Ledger Account", description = "Ledger accounts represent an Individual account within an Organizations Chart Of Accounts(COA) and are assigned a name and unique number by which they can be identified. \n"
+        + "All transactions relating to a company's assets, liabilities, owners' equity, revenue and expenses are recorded against these accounts")
 public class GLAccountsApiResource {
 
     private static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "name", "parentId", "glCode", "disabled",
@@ -121,13 +119,15 @@ public class GLAccountsApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve GL Accounts Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
-            + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "glaccounts/template\n"
-            + "glaccounts/template?type=1\n" + "\n" + "type is optional and integer value from 1 to 5.\n" + "\n" + "1.Assets \n"
-            + "2.Liabilities \n" + "3.Equity \n" + "4.Income \n" + "5.Expenses")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLAccountsApiResourceSwagger.GetGLAccountsTemplateResponse.class) })
+    @Operation(tags = {
+            "General Ledger Account" }, summary = "Retrieve GL Accounts Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
+                    + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "glaccounts/template\n"
+                    + "glaccounts/template?type=1\n" + "\n" + "type is optional and integer value from 1 to 5.\n" + "\n" + "1.Assets \n"
+                    + "2.Liabilities \n" + "3.Equity \n" + "4.Income \n" + "5.Expenses")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.GetGLAccountsTemplateResponse.class))) })
     public String retrieveNewAccountDetails(@Context final UriInfo uriInfo,
-            @QueryParam("type") @ApiParam(value = "type") final Integer type) {
+            @QueryParam("type") @Parameter(description = "type") final Integer type) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
 
@@ -141,18 +141,19 @@ public class GLAccountsApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List General Ledger Accounts", notes = "ARGUMENTS\n"
+    @Operation(tags = { "General Ledger Account" }, summary = "List General Ledger Accounts", description = "ARGUMENTS\n"
             + "type Integer optional manualEntriesAllowed boolean optional usage Integer optional disabled boolean optional parentId Long optional tagId Long optional\n"
             + "Example Requests:\n" + "\n" + "glaccounts\n" + "\n" + "\n"
             + "glaccounts?type=1&manualEntriesAllowed=true&usage=1&disabled=false\n" + "\n" + "glaccounts?fetchRunningBalance=true")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = GLAccountsApiResourceSwagger.GetGLAccountsResponse.class, responseContainer = "list") })
-    public String retrieveAllAccounts(@Context final UriInfo uriInfo, @QueryParam("type") @ApiParam(value = "type") final Integer type,
-            @QueryParam("searchParam") @ApiParam(value = "searchParam") final String searchParam,
-            @QueryParam("usage") @ApiParam(value = "usage") final Integer usage,
-            @QueryParam("manualEntriesAllowed") @ApiParam(value = "manualEntriesAllowed") final Boolean manualEntriesAllowed,
-            @QueryParam("disabled") @ApiParam(value = "disabled") final Boolean disabled,
-            @QueryParam("fetchRunningBalance") @ApiParam(value = "fetchRunningBalance") final boolean runningBalance) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = GLAccountsApiResourceSwagger.GetGLAccountsResponse.class)))) })
+    public String retrieveAllAccounts(@Context final UriInfo uriInfo,
+            @QueryParam("type") @Parameter(description = "type") final Integer type,
+            @QueryParam("searchParam") @Parameter(description = "searchParam") final String searchParam,
+            @QueryParam("usage") @Parameter(description = "usage") final Integer usage,
+            @QueryParam("manualEntriesAllowed") @Parameter(description = "manualEntriesAllowed") final Boolean manualEntriesAllowed,
+            @QueryParam("disabled") @Parameter(description = "disabled") final Boolean disabled,
+            @QueryParam("fetchRunningBalance") @Parameter(description = "fetchRunningBalance") final boolean runningBalance) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
         JournalEntryAssociationParametersData associationParametersData = new JournalEntryAssociationParametersData(false, runningBalance);
@@ -167,13 +168,14 @@ public class GLAccountsApiResource {
     @Path("{glAccountId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a General Ledger Account", notes = "Example Requests:\n" + "\n" + "glaccounts/1\n" + "\n" + "\n"
-            + "glaccounts/1?template=true\n" + "\n" + "\n" + "glaccounts/1?fields=name,glCode\n" + "\n" + "\n"
-            + "glaccounts/1?fetchRunningBalance=true")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLAccountsApiResourceSwagger.GetGLAccountsResponse.class) })
-    public String retreiveAccount(@PathParam("glAccountId") @ApiParam(value = "glAccountId") final Long glAccountId,
+    @Operation(tags = { "General Ledger Account" }, summary = "Retrieve a General Ledger Account", description = "Example Requests:\n"
+            + "\n" + "glaccounts/1\n" + "\n" + "\n" + "glaccounts/1?template=true\n" + "\n" + "\n" + "glaccounts/1?fields=name,glCode\n"
+            + "\n" + "\n" + "glaccounts/1?fetchRunningBalance=true")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.GetGLAccountsResponse.class))) })
+    public String retreiveAccount(@PathParam("glAccountId") @Parameter(description = "glAccountId") final Long glAccountId,
             @Context final UriInfo uriInfo,
-            @QueryParam("fetchRunningBalance") @ApiParam(value = "fetchRunningBalance") final boolean runningBalance) {
+            @QueryParam("fetchRunningBalance") @Parameter(description = "fetchRunningBalance") final boolean runningBalance) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
 
@@ -190,12 +192,13 @@ public class GLAccountsApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a General Ledger Account", notes = "Note: You may optionally create Hierarchical Chart of Accounts by using the \"parentId\" property of an Account\n"
-            + "Mandatory Fields: \n" + "name, glCode, type, usage and manualEntriesAllowed")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = GLAccountsApiResourceSwagger.PostGLAccountsRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLAccountsApiResourceSwagger.PostGLAccountsResponse.class) })
-    public String createGLAccount(@ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(tags = {
+            "General Ledger Account" }, summary = "Create a General Ledger Account", description = "Note: You may optionally create Hierarchical Chart of Accounts by using the \"parentId\" property of an Account\n"
+                    + "Mandatory Fields: \n" + "name, glCode, type, usage and manualEntriesAllowed")
+    @RequestBody(content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PostGLAccountsRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PostGLAccountsResponse.class))) })
+    public String createGLAccount(@Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createGLAccount().withJson(jsonRequestBody).build();
 
@@ -208,13 +211,14 @@ public class GLAccountsApiResource {
     @Path("{glAccountId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update an Accounting closure", notes = "Once an accounting closure is created, only the comments associated with it may be edited\n"
-            + "\n")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = GLAccountsApiResourceSwagger.PutGLAccountsRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLAccountsApiResourceSwagger.PutGLAccountsResponse.class) })
-    public String updateGLAccount(@PathParam("glAccountId") @ApiParam(value = "glAccountId") final Long glAccountId,
-            @ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(tags = {
+            "General Ledger Account" }, summary = "Update an Accounting closure", description = "Once an accounting closure is created, only the comments associated with it may be edited\n"
+                    + "\n")
+    @RequestBody(content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PutGLAccountsRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.PutGLAccountsResponse.class))) })
+    public String updateGLAccount(@PathParam("glAccountId") @Parameter(description = "glAccountId") final Long glAccountId,
+            @Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateGLAccount(glAccountId).withJson(jsonRequestBody).build();
 
@@ -227,9 +231,11 @@ public class GLAccountsApiResource {
     @Path("{glAccountId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete an accounting closure", notes = "Note: Only the latest accounting closure associated with a branch may be deleted.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = GLAccountsApiResourceSwagger.DeleteGLAccountsRequest.class) })
-    public String deleteGLAccount(@PathParam("glAccountId") @ApiParam(value = "glAccountId") final Long glAccountId) {
+    @Operation(tags = {
+            "General Ledger Account" }, summary = "Delete an accounting closure", description = "Note: Only the latest accounting closure associated with a branch may be deleted.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GLAccountsApiResourceSwagger.DeleteGLAccountsRequest.class))) })
+    public String deleteGLAccount(@PathParam("glAccountId") @Parameter(description = "glAccountId") final Long glAccountId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteGLAccount(glAccountId).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java
index d32fc3d..7a1d542 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.accounting.glaccount.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import java.util.List;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
@@ -35,57 +34,57 @@ final class GLAccountsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetGLAccountsResponse")
+    @Schema(description = "GetGLAccountsResponse")
     public static final class GetGLAccountsResponse {
 
         private GetGLAccountsResponse() {
 
         }
 
-        @ApiModelProperty(example = "16")
+        @Schema(example = "16")
         public Long id;
 
-        @ApiModelProperty(example = "Cash")
+        @Schema(example = "Cash")
         public String name;
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long parentId;
 
-        @ApiModelProperty(example = "100001")
+        @Schema(example = "100001")
         public String glCode;
 
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public Boolean disabled;
 
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean manualEntriesAllowed;
 
         public EnumOptionData type;
         public EnumOptionData usage;
 
-        @ApiModelProperty(example = "Desc")
+        @Schema(example = "Desc")
         public String description;
 
-        @ApiModelProperty(example = "....Cash")
+        @Schema(example = "....Cash")
         public String nameDecorated;
 
         public CodeValueData tagId;
 
-        @ApiModelProperty(example = "118437")
+        @Schema(example = "118437")
         public Long organizationRunningBalance;
     }
 
-    @ApiModel(value = "GetGLAccountsTemplateResponse")
+    @Schema(description = "GetGLAccountsTemplateResponse")
     public static final class GetGLAccountsTemplateResponse {
 
         private GetGLAccountsTemplateResponse() {
 
         }
 
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public Boolean disabled;
 
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean manualEntriesAllowed;
 
         public EnumOptionData type;
@@ -104,83 +103,83 @@ final class GLAccountsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PostGLAccountsRequest")
+    @Schema(description = "PostGLAccountsRequest")
     public static final class PostGLAccountsRequest {
 
         private PostGLAccountsRequest() {
 
         }
 
-        @ApiModelProperty(example = "Cash at Bangalore")
+        @Schema(example = "Cash at Bangalore")
         public String name;
 
-        @ApiModelProperty(example = "100001")
+        @Schema(example = "100001")
         public String glCode;
 
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean manualEntriesAllowed;
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public String type;
 
-        @ApiModelProperty(example = "10")
+        @Schema(example = "10")
         public String tagId;
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long parentId;
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public EnumOptionData usage;
 
-        @ApiModelProperty(example = "Desc")
+        @Schema(example = "Desc")
         public String description;
 
     }
 
-    @ApiModel(value = "PostGLAccountsResponse")
+    @Schema(description = "PostGLAccountsResponse")
     public static final class PostGLAccountsResponse {
 
         private PostGLAccountsResponse() {
 
         }
 
-        @ApiModelProperty(example = "22")
+        @Schema(example = "22")
         public int resourceId;
     }
 
-    @ApiModel(value = "PutGLAccountsRequest")
+    @Schema(description = "PutGLAccountsRequest")
     public static final class PutGLAccountsRequest {
 
         private PutGLAccountsRequest() {
 
         }
 
-        @ApiModelProperty(example = "Cash at Bangalore")
+        @Schema(example = "Cash at Bangalore")
         public String name;
     }
 
-    @ApiModel(value = "PutGLAccountsResponse")
+    @Schema(description = "PutGLAccountsResponse")
     public static final class PutGLAccountsResponse {
 
         private PutGLAccountsResponse() {
 
         }
 
-        @ApiModel
+        @Schema
         public static final class PutGLAccountsResponsechangesSwagger {
 
             private PutGLAccountsResponsechangesSwagger() {}
 
-            @ApiModelProperty(example = "Cash at Bangalore")
+            @Schema(example = "Cash at Bangalore")
             public String name;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public int resourceId;
         public PutGLAccountsResponsechangesSwagger changes;
     }
 
-    @ApiModel(value = "DeleteGLAccountsRequest")
+    @Schema(description = "DeleteGLAccountsRequest")
     public static final class DeleteGLAccountsRequest {
 
         private DeleteGLAccountsRequest() {
@@ -193,7 +192,7 @@ final class GLAccountsApiResourceSwagger {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public int resourceId;
 
         private DeleteGLAccountsRequestchangesSwagger changes;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java
index ccbe095..dd6e84d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java
@@ -20,15 +20,16 @@ package org.apache.fineract.accounting.journalentry.api;
 
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Date;
@@ -73,10 +74,8 @@ import org.springframework.stereotype.Component;
 @Path("/journalentries")
 @Component
 @Scope("singleton")
-@Api(tags = { "Journal Entries" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Journal Entries", description = "A journal entry refers to the logging of transactions against general ledger accounts. A journal entry may consist of several line items, each of which is either a \"debit\" or a \"credit\". The total amount of the debits must equal the total amount of the credits or the journal entry is said to be \"unbalanced\" \n"
-                + "\n" + "A journal entry directly changes the account balances on the general ledger") })
+@Tag(name = "Journal Entries", description = "A journal entry refers to the logging of transactions against general ledger accounts. A journal entry may consist of several line items, each of which is either a \"debit\" or a \"credit\". The total amount of the debits must equal the total amount of the credits or the journal entry is said to be \"unbalanced\" \n"
+        + "\n" + "A journal entry directly changes the account balances on the general ledger")
 public class JournalEntriesApiResource {
 
     private static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
@@ -113,30 +112,32 @@ public class JournalEntriesApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Journal Entries", notes = "The list capability of journal entries can support pagination and sorting.\n\n"
+    @Operation(summary = "List Journal Entries", description = "The list capability of journal entries can support pagination and sorting.\n\n"
             + "Example Requests:\n" + "\n" + "journalentries\n" + "\n" + "journalentries?transactionId=PB37X8Y21EQUY4S\n" + "\n"
             + "journalentries?officeId=1&manualEntriesOnly=true&fromDate=1 July 2013&toDate=15 July 2013&dateFormat=dd MMMM yyyy&locale=en\n"
             + "\n" + "journalentries?fields=officeName,glAccountName,transactionDate\n" + "\n" + "journalentries?offset=10&limit=50\n"
             + "\n" + "journalentries?orderBy=transactionId&sortOrder=DESC\n" + "\n" + "journalentries?runningBalance=true\n" + "\n"
             + "journalentries?transactionDetails=true\n" + "\n" + "journalentries?loanId=12\n" + "\n" + "journalentries?savingsId=24")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = JournalEntryData.class, responseContainer = "list") })
-    public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("officeId") @ApiParam(value = "officeId") final Long officeId,
-            @QueryParam("glAccountId") @ApiParam(value = "glAccountId") final Long glAccountId,
-            @QueryParam("manualEntriesOnly") @ApiParam(value = "manualEntriesOnly") final Boolean onlyManualEntries,
-            @QueryParam("fromDate") @ApiParam(value = "fromDate") final DateParam fromDateParam,
-            @QueryParam("toDate") @ApiParam(value = "toDate") final DateParam toDateParam,
-            @QueryParam("transactionId") @ApiParam(value = "transactionId") final String transactionId,
-            @QueryParam("entityType") @ApiParam(value = "entityType") final Integer entityType,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder,
-            @QueryParam("locale") @ApiParam(value = "locale") final String locale,
-            @QueryParam("dateFormat") @ApiParam(value = "dateFormat") final String dateFormat,
-            @QueryParam("loanId") @ApiParam(value = "loanId") final Long loanId,
-            @QueryParam("savingsId") @ApiParam(value = "savingsId") final Long savingsId,
-            @QueryParam("runningBalance") @ApiParam(value = "runningBalance") final boolean runningBalance,
-            @QueryParam("transactionDetails") @ApiParam(value = "transactionDetails") final boolean transactionDetails) {
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = JournalEntryData.class)))) })
+    public String retrieveAll(@Context final UriInfo uriInfo,
+            @QueryParam("officeId") @Parameter(description = "officeId") final Long officeId,
+            @QueryParam("glAccountId") @Parameter(description = "glAccountId") final Long glAccountId,
+            @QueryParam("manualEntriesOnly") @Parameter(description = "manualEntriesOnly") final Boolean onlyManualEntries,
+            @QueryParam("fromDate") @Parameter(description = "fromDate") final DateParam fromDateParam,
+            @QueryParam("toDate") @Parameter(description = "toDate") final DateParam toDateParam,
+            @QueryParam("transactionId") @Parameter(description = "transactionId") final String transactionId,
+            @QueryParam("entityType") @Parameter(description = "entityType") final Integer entityType,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder,
+            @QueryParam("locale") @Parameter(description = "locale") final String locale,
+            @QueryParam("dateFormat") @Parameter(description = "dateFormat") final String dateFormat,
+            @QueryParam("loanId") @Parameter(description = "loanId") final Long loanId,
+            @QueryParam("savingsId") @Parameter(description = "savingsId") final Long savingsId,
+            @QueryParam("runningBalance") @Parameter(description = "runningBalance") final boolean runningBalance,
+            @QueryParam("transactionDetails") @Parameter(description = "transactionDetails") final boolean transactionDetails) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
 
@@ -164,13 +165,16 @@ public class JournalEntriesApiResource {
     @Path("{journalEntryId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a single Entry", notes = "Example Requests:\n" + "\n" + "journalentries/1\n" + "\n" + "\n" + "\n"
+    @Operation(summary = "Retrieve a single Entry", description = "Example Requests:\n" + "\n" + "journalentries/1\n" + "\n" + "\n" + "\n"
             + "journalentries/1?fields=officeName,glAccountId,entryType,amount\n" + "\n" + "journalentries/1?runningBalance=true\n" + "\n"
             + "journalentries/1?transactionDetails=true")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = JournalEntryData.class) })
-    public String retreiveJournalEntryById(@PathParam("journalEntryId") @ApiParam(value = "journalEntryId") final Long journalEntryId,
-            @Context final UriInfo uriInfo, @QueryParam("runningBalance") @ApiParam(value = "runningBalance") final boolean runningBalance,
-            @QueryParam("transactionDetails") @ApiParam(value = "transactionDetails") final boolean transactionDetails) {
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = JournalEntryData.class))) })
+    public String retreiveJournalEntryById(
+            @PathParam("journalEntryId") @Parameter(description = "journalEntryId") final Long journalEntryId,
+            @Context final UriInfo uriInfo,
+            @QueryParam("runningBalance") @Parameter(description = "runningBalance") final boolean runningBalance,
+            @QueryParam("transactionDetails") @Parameter(description = "transactionDetails") final boolean transactionDetails) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
         JournalEntryAssociationParametersData associationParametersData = new JournalEntryAssociationParametersData(transactionDetails,
@@ -185,16 +189,16 @@ public class JournalEntriesApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create \"Balanced\" Journal Entries", notes = "Note: A Balanced (simple) Journal entry would have atleast one \"Debit\" and one \"Credit\" entry whose amounts are equal \n"
+    @Operation(summary = "Create \"Balanced\" Journal Entries", description = "Note: A Balanced (simple) Journal entry would have atleast one \"Debit\" and one \"Credit\" entry whose amounts are equal \n"
             + "Compound Journal entries may have \"n\" debits and \"m\" credits where both \"m\" and \"n\" are greater than 0 and the net sum or all debits and credits are equal \n\n"
             + "\n" + "Mandatory Fields\n" + "officeId, transactionDate\n\n" + "\ncredits- glAccountId, amount, comments\n\n "
             + "\ndebits-  glAccountId, amount, comments\n\n " + "\n" + "Optional Fields\n"
             + "paymentTypeId, accountNumber, checkNumber, routingCode, receiptNumber, bankNumber")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = JournalEntryCommand.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = JournalEntriesApiResourceSwagger.PostJournalEntriesResponse.class) })
-    public String createGLJournalEntry(@ApiParam(hidden = true) final String jsonRequestBody,
-            @QueryParam("command") @ApiParam(value = "command") final String commandParam) {
+    @Parameters({ @Parameter(content = @Content(schema = @Schema(implementation = JournalEntryCommand.class))) })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = JournalEntriesApiResourceSwagger.PostJournalEntriesResponse.class))) })
+    public String createGLJournalEntry(@Parameter(hidden = true) final String jsonRequestBody,
+            @QueryParam("command") @Parameter(description = "command") final String commandParam) {
 
         CommandProcessingResult result = null;
         if (is(commandParam, "updateRunningBalance")) {
@@ -216,15 +220,14 @@ public class JournalEntriesApiResource {
     @Path("{transactionId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update Running balances for Journal Entries", notes = "This API calculates the running balances for office. If office ID not provided this API calculates running balances for all offices. \n"
+    @Operation(summary = "Update Running balances for Journal Entries", description = "This API calculates the running balances for office. If office ID not provided this API calculates running balances for all offices. \n"
             + "Mandatory Fields\n" + "officeId")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = JournalEntriesApiResourceSwagger.PostJournalEntriesTransactionIdRequest.class) })
+    @RequestBody(content = @Content(schema = @Schema(implementation = JournalEntriesApiResourceSwagger.PostJournalEntriesTransactionIdRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = JournalEntriesApiResourceSwagger.PostJournalEntriesTransactionIdResponse.class) })
-    public String createReversalJournalEntry(@ApiParam(hidden = true) final String jsonRequestBody,
-            @PathParam("transactionId") @ApiParam(value = "transactionId") final String transactionId,
-            @QueryParam("command") @ApiParam(value = "command") final String commandParam) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = JournalEntriesApiResourceSwagger.PostJournalEntriesTransactionIdResponse.class))) })
+    public String createReversalJournalEntry(@Parameter(hidden = true) final String jsonRequestBody,
+            @PathParam("transactionId") @Parameter(description = "transactionId") final String transactionId,
+            @QueryParam("command") @Parameter(description = "command") final String commandParam) {
         CommandProcessingResult result = null;
         if (is(commandParam, "reverse")) {
             final CommandWrapper commandRequest = new CommandWrapperBuilder().reverseJournalEntry(transactionId).withJson(jsonRequestBody)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java
index 86b09db..a1cea3d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.accounting.journalentry.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 25/7/17.
@@ -28,39 +27,39 @@ final class JournalEntriesApiResourceSwagger {
 
     private JournalEntriesApiResourceSwagger() {}
 
-    @ApiModel(value = "PostJournalEntriesResponse")
+    @Schema(description = "PostJournalEntriesResponse")
     public static final class PostJournalEntriesResponse {
 
         private PostJournalEntriesResponse() {
 
         }
 
-        @ApiModelProperty(value = "1")
+        @Schema(description = "1")
         public Long officeId;
-        @ApiModelProperty(value = "RS9MCISID4WK1ZM")
+        @Schema(description = "RS9MCISID4WK1ZM")
         public String transactionId;
 
     }
 
-    @ApiModel(value = "PostJournalEntriesTransactionIdRequest")
+    @Schema(description = "PostJournalEntriesTransactionIdRequest")
     public static final class PostJournalEntriesTransactionIdRequest {
 
         private PostJournalEntriesTransactionIdRequest() {
 
         }
 
-        @ApiModelProperty(value = "1")
+        @Schema(description = "1")
         public Long officeId;
     }
 
-    @ApiModel(value = "PostJournalEntriesTransactionIdResponse")
+    @Schema(description = "PostJournalEntriesTransactionIdResponse")
     public static final class PostJournalEntriesTransactionIdResponse {
 
         private PostJournalEntriesTransactionIdResponse() {
 
         }
 
-        @ApiModelProperty(value = "1")
+        @Schema(description = "1")
         public Long officeId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java
index 2052544..3ee7f47 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.accounting.provisioning.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -62,11 +62,9 @@ import org.springframework.stereotype.Component;
 @Path("/provisioningentries")
 @Component
 @Scope("singleton")
-@Api(tags = { "Provisioning Entries" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Provisioning Entries", description = "This defines the Provisioning Entries for all active loan products\n" + "\n"
-                + "Field Descriptions\n" + "date\n" + "Date on which day provisioning entries should be created\n"
-                + "createjournalentries\n" + "Boolean variable whether to add journal entries for generated provisioning entries\n") })
+@Tag(name = "Provisioning Entries", description = "This defines the Provisioning Entries for all active loan products\n" + "\n"
+        + "Field Descriptions\n" + "date\n" + "Date on which day provisioning entries should be created\n" + "createjournalentries\n"
+        + "Boolean variable whether to add journal entries for generated provisioning entries\n")
 public class ProvisioningEntriesApiResource {
 
     private final PlatformSecurityContext platformSecurityContext;
@@ -97,13 +95,12 @@ public class ProvisioningEntriesApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create new Provisioning Entries", notes = "Creates a new Provisioning Entries\n" + "\n" + "Mandatory Fields\n"
-            + "date\n" + "dateFormat\n" + "locale\n" + "Optional Fields\n" + "createjournalentries")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = ProvisioningEntriesApiResourceSwagger.PostProvisioningEntriesRequest.class) })
+    @Operation(summary = "Create new Provisioning Entries", description = "Creates a new Provisioning Entries\n" + "\n"
+            + "Mandatory Fields\n" + "date\n" + "dateFormat\n" + "locale\n" + "Optional Fields\n" + "createjournalentries")
+    @RequestBody(content = @Content(schema = @Schema(implementation = ProvisioningEntriesApiResourceSwagger.PostProvisioningEntriesRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ProvisioningEntriesApiResourceSwagger.PostProvisioningEntriesResponse.class) })
-    public String createProvisioningEntries(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ProvisioningEntriesApiResourceSwagger.PostProvisioningEntriesResponse.class))) })
+    public String createProvisioningEntries(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
         CommandWrapper commandWrapper = null;
         this.platformSecurityContext.authenticatedUser();
         commandWrapper = new CommandWrapperBuilder().createProvisioningEntries().withJson(apiRequestBodyAsJson).build();
@@ -115,14 +112,13 @@ public class ProvisioningEntriesApiResource {
     @Path("{entryId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Recreates Provisioning Entry", notes = "Recreates Provisioning Entry | createjournalentry.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = ProvisioningEntriesApiResourceSwagger.PutProvisioningEntriesRequest.class) })
+    @Operation(summary = "Recreates Provisioning Entry", description = "Recreates Provisioning Entry | createjournalentry.")
+    @RequestBody(content = @Content(schema = @Schema(implementation = ProvisioningEntriesApiResourceSwagger.PutProvisioningEntriesRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ProvisioningEntriesApiResourceSwagger.PutProvisioningEntriesResponse.class) })
-    public String modifyProvisioningEntry(@PathParam("entryId") @ApiParam(value = "entryId") final Long entryId,
-            @QueryParam("command") @ApiParam(value = "command=createjournalentry\ncommand=recreateprovisioningentry") final String commandParam,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ProvisioningEntriesApiResourceSwagger.PutProvisioningEntriesResponse.class))) })
+    public String modifyProvisioningEntry(@PathParam("entryId") @Parameter(description = "entryId") final Long entryId,
+            @QueryParam("command") @Parameter(description = "command=createjournalentry\ncommand=recreateprovisioningentry") final String commandParam,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
         CommandWrapper commandWrapper = null;
         this.platformSecurityContext.authenticatedUser();
         if ("createjournalentry".equals(commandParam)) {
@@ -143,9 +139,10 @@ public class ProvisioningEntriesApiResource {
     @Path("{entryId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieves a Provisioning Entry", notes = "Returns the details of a generated Provisioning Entry.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ProvisioningEntryData.class) })
-    public String retrieveProvisioningEntry(@PathParam("entryId") @ApiParam(value = "entryId") final Long entryId,
+    @Operation(summary = "Retrieves a Provisioning Entry", description = "Returns the details of a generated Provisioning Entry.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ProvisioningEntryData.class))) })
+    public String retrieveProvisioningEntry(@PathParam("entryId") @Parameter(description = "entryId") final Long entryId,
             @Context final UriInfo uriInfo) {
         platformSecurityContext.authenticatedUser();
         ProvisioningEntryData data = this.provisioningEntriesReadPlatformService.retrieveProvisioningEntryData(entryId);
@@ -157,7 +154,8 @@ public class ProvisioningEntriesApiResource {
     @Path("entries")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = LoanProductProvisioningEntryData.class) })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = LoanProductProvisioningEntryData.class))) })
     public String retrieveProviioningEntries(@QueryParam("entryId") final Long entryId, @QueryParam("offset") final Integer offset,
             @QueryParam("limit") final Integer limit, @QueryParam("officeId") final Long officeId,
             @QueryParam("productId") final Long productId, @QueryParam("categoryId") final Long categoryId,
@@ -172,10 +170,11 @@ public class ProvisioningEntriesApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List all Provisioning Entries")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ProvisioningEntryData.class, responseContainer = "list") })
-    public String retrieveAllProvisioningEntries(@QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit, @Context final UriInfo uriInfo) {
+    @Operation(summary = "List all Provisioning Entries")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ProvisioningEntryData.class)))) })
+    public String retrieveAllProvisioningEntries(@QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit, @Context final UriInfo uriInfo) {
         platformSecurityContext.authenticatedUser();
         Page<ProvisioningEntryData> data = this.provisioningEntriesReadPlatformService.retrieveAllProvisioningEntries(offset, limit);
         final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResourceSwagger.java
index 1b41356..86a139d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.accounting.provisioning.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 25/7/17.
@@ -30,23 +29,23 @@ final class ProvisioningEntriesApiResourceSwagger {
         // only for Swagger Documentation
     }
 
-    @ApiModel(value = "PostProvisioningEntriesRequest")
+    @Schema(description = "PostProvisioningEntriesRequest")
     public static final class PostProvisioningEntriesRequest {
 
         private PostProvisioningEntriesRequest() {
 
         }
 
-        @ApiModelProperty(example = "16 October 2015")
+        @Schema(example = "16 October 2015")
         public String date;
 
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
 
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
 
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public String createjournalentries;
 
         public String provisioningentry;
@@ -54,36 +53,36 @@ final class ProvisioningEntriesApiResourceSwagger {
         public String entries;
     }
 
-    @ApiModel(value = "PostProvisioningEntriesResponse")
+    @Schema(description = "PostProvisioningEntriesResponse")
     public static final class PostProvisioningEntriesResponse {
 
         private PostProvisioningEntriesResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutProvisioningEntriesRequest")
+    @Schema(description = "PutProvisioningEntriesRequest")
     public static final class PutProvisioningEntriesRequest {
 
         private PutProvisioningEntriesRequest() {
 
         }
 
-        @ApiModelProperty(example = "recreateprovisioningentry")
+        @Schema(example = "recreateprovisioningentry")
         public String command;
     }
 
-    @ApiModel(value = "PutProvisioningEntriesResponse")
+    @Schema(description = "PutProvisioningEntriesResponse")
     public static final class PutProvisioningEntriesResponse {
 
         private PutProvisioningEntriesResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java
index 3f9570e..23424b4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.accounting.rule.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -73,15 +73,13 @@ import org.springframework.stereotype.Component;
 @Path("/accountingrules")
 @Component
 @Scope("singleton")
-@Api(tags = { "Accounting Rules" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Accounting Rules", description = "It is typical scenario in MFI's that non accountants pass journal entries on a regular basis. For Ex: A branch office might deposit their entire cash at hand to their Bank account at the end of a working day. The branch office users might not understand enough of accounting to figure out which account needs to get credited and which account needs to be debited to represent this transaction.\n"
-                + "\n"
-                + "Enter accounting rules, an abstraction on top of manual Journal entires for enabling simpler data entry. An accounting rule can define any of the following abstractions\n"
-                + "\n" + "A Simple journal entry where both the credit and debit account have been preselected\n"
-                + "A Simple journal entry where either credit or debit accounts have been limited to a pre-selected list of accounts (Ex: Debit account should be one of \"Bank of America\" of \"JP Morgan\" and credit account should be \"Cash\")\n"
-                + "A Compound journal entry where multiple debits and / or multiple credits may be made amongst a set of preselected list of accounts (Ex: Credit account should be either \"Bank Of America\" or \"Cash\" and debit account can be \"Employee Salary\" and/or \"Miscellenous Expenses\")\n"
-                + "An accounting rule can also be optionally associated with a branch, so that only a particular Branch's users have access to the rule") })
+@Tag(name = "Accounting Rules", description = "It is typical scenario in MFI's that non accountants pass journal entries on a regular basis. For Ex: A branch office might deposit their entire cash at hand to their Bank account at the end of a working day. The branch office users might not understand enough of accounting to figure out which account needs to get credited and which account needs to be debited to represent this transaction.\n"
+        + "\n"
+        + "Enter accounting rules, an abstraction on top of manual Journal entires for enabling simpler data entry. An accounting rule can define any of the following abstractions\n"
+        + "\n" + "A Simple journal entry where both the credit and debit account have been preselected\n"
+        + "A Simple journal entry where either credit or debit accounts have been limited to a pre-selected list of accounts (Ex: Debit account should be one of \"Bank of America\" of \"JP Morgan\" and credit account should be \"Cash\")\n"
+        + "A Compound journal entry where multiple debits and / or multiple credits may be made amongst a set of preselected list of accounts (Ex: Credit account should be either \"Bank Of America\" or \"Cash\" and debit account can be \"Employee Salary\" and/or \"Miscellenous Expenses\")\n"
+        + "An accounting rule can also be optionally associated with a branch, so that only a particular Branch's users have access to the rule")
 public class AccountingRuleApiResource {
 
     private static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
@@ -121,10 +119,10 @@ public class AccountingRuleApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Accounting Rule Details Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
+    @Operation(summary = "Retrieve Accounting Rule Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
             + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "accountingrules/template")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountingRuleApiResourceSwagger.GetAccountRulesTemplateResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.GetAccountRulesTemplateResponse.class))) })
     public String retrieveTemplate(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
@@ -139,10 +137,10 @@ public class AccountingRuleApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Accounting Rules", notes = "Returns the list of defined accounting rules.\n" + "\n"
+    @Operation(summary = "Retrieve Accounting Rules", description = "Returns the list of defined accounting rules.\n" + "\n"
             + "Example Requests:\n" + "\n" + "accountingrules")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountingRuleApiResourceSwagger.GetAccountRulesResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.GetAccountRulesResponse.class)))) })
     public String retrieveAllAccountingRules(@Context final UriInfo uriInfo) {
 
         final AppUser currentUser = this.context.authenticatedUser();
@@ -171,10 +169,12 @@ public class AccountingRuleApiResource {
     @Path("{accountingRuleId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Accounting rule", notes = "Returns the details of a defined Accounting rule.\n" + "\n"
+    @Operation(summary = "Retrieve a Accounting rule", description = "Returns the details of a defined Accounting rule.\n" + "\n"
             + "Example Requests:\n" + "\n" + "accountingrules/1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = AccountingRuleData.class) })
-    public String retreiveAccountingRule(@PathParam("accountingRuleId") @ApiParam(value = "accountingRuleId") final Long accountingRuleId,
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountingRuleData.class))) })
+    public String retreiveAccountingRule(
+            @PathParam("accountingRuleId") @Parameter(description = "accountingRuleId") final Long accountingRuleId,
             @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermission);
@@ -191,13 +191,13 @@ public class AccountingRuleApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create/Define a Accounting rule", notes = "Define a new Accounting rule.\n" + "\n" + "Mandatory Fields\n"
+    @Operation(summary = "Create/Define a Accounting rule", description = "Define a new Accounting rule.\n" + "\n" + "Mandatory Fields\n"
             + "name, officeId,\n" + "accountToDebit OR debitTags,\n" + "accountToCredit OR creditTags.\n" + "\n" + "Optional Fields\n"
             + "description")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = AccountingRuleApiResourceSwagger.PostAccountingRulesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = AccountingRuleApiResourceSwagger.PostAccountingRulesResponse.class) })
-    public String createAccountingRule(@ApiParam(hidden = true) final String jsonRequestBody) {
+    @RequestBody(content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PostAccountingRulesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PostAccountingRulesResponse.class))) })
+    public String createAccountingRule(@Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createAccountingRule().withJson(jsonRequestBody).build();
 
@@ -210,12 +210,13 @@ public class AccountingRuleApiResource {
     @Path("{accountingRuleId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Accounting Rule", notes = "Updates the details of a Accounting rule.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", value = "body", dataType = "body", dataTypeClass = AccountingRuleApiResourceSwagger.PutAccountingRulesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = AccountingRuleApiResourceSwagger.PutAccountingRulesResponse.class) })
-    public String updateAccountingRule(@PathParam("accountingRuleId") @ApiParam(value = "accountingRuleId") final Long accountingRuleId,
-            @ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(summary = "Update a Accounting Rule", description = "Updates the details of a Accounting rule.")
+    @RequestBody(content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PutAccountingRulesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.PutAccountingRulesResponse.class))) })
+    public String updateAccountingRule(
+            @PathParam("accountingRuleId") @Parameter(description = "accountingRuleId") final Long accountingRuleId,
+            @Parameter(hidden = true) final String jsonRequestBody) {
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateAccountingRule(accountingRuleId).withJson(jsonRequestBody)
                 .build();
 
@@ -228,10 +229,11 @@ public class AccountingRuleApiResource {
     @Path("{accountingRuleId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete a Accounting Rule", notes = "Deletes a Accounting rule.")
+    @Operation(summary = "Delete a Accounting Rule", description = "Deletes a Accounting rule.")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountingRuleApiResourceSwagger.DeleteAccountingRulesResponse.class) })
-    public String deleteAccountingRule(@PathParam("accountingRuleId") @ApiParam(value = "accountingRuleId") final Long accountingRuleId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountingRuleApiResourceSwagger.DeleteAccountingRulesResponse.class))) })
+    public String deleteAccountingRule(
+            @PathParam("accountingRuleId") @Parameter(description = "accountingRuleId") final Long accountingRuleId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteAccountingRule(accountingRuleId).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
index a29bb38..019ff7e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.accounting.rule.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
@@ -35,7 +34,7 @@ final class AccountingRuleApiResourceSwagger {
         // For Swagger Documentation
     }
 
-    @ApiModel(value = "GetAccountRulesResponse")
+    @Schema(description = "GetAccountRulesResponse")
     public static final class GetAccountRulesResponse {
 
         private GetAccountRulesResponse() {
@@ -54,63 +53,63 @@ final class AccountingRuleApiResourceSwagger {
         public List<AccountingTagRuleData> debitTags;
     }
 
-    @ApiModel(value = "GetAccountRulesTemplateResponse")
+    @Schema(description = "GetAccountRulesTemplateResponse")
     public static final class GetAccountRulesTemplateResponse {
 
         private GetAccountRulesTemplateResponse() {
 
         }
 
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public boolean systemDefined;
         public List<OfficeData> allowedOffices = new ArrayList<OfficeData>();
         public List<GLAccountData> allowedAccounts = new ArrayList<GLAccountData>();
     }
 
-    @ApiModel(value = "PostAccountingRulesRequest")
+    @Schema(description = "PostAccountingRulesRequest")
     public static final class PostAccountingRulesRequest {
 
         private PostAccountingRulesRequest() {
 
         }
 
-        @ApiModelProperty(example = "test")
+        @Schema(example = "test")
         public String name;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "21")
+        @Schema(example = "21")
         public Long accountToDebit;
-        @ApiModelProperty(example = "9")
+        @Schema(example = "9")
         public Long accountToCredit;
-        @ApiModelProperty(example = "Employee salary")
+        @Schema(example = "Employee salary")
         public String description;
     }
 
-    @ApiModel(value = "PostAccountingRulesResponse")
+    @Schema(description = "PostAccountingRulesResponse")
     public static final class PostAccountingRulesResponse {
 
         private PostAccountingRulesResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutAccountingRulesRequest")
+    @Schema(description = "PutAccountingRulesRequest")
     public static final class PutAccountingRulesRequest {
 
         private PutAccountingRulesRequest() {
 
         }
 
-        @ApiModelProperty(example = "Employee Salary posting rule")
+        @Schema(example = "Employee Salary posting rule")
         public String name;
     }
 
-    @ApiModel(value = "PutAccountingRulesResponse")
+    @Schema(description = "PutAccountingRulesResponse")
     public static final class PutAccountingRulesResponse {
 
         private PutAccountingRulesResponse() {
@@ -121,23 +120,23 @@ final class AccountingRuleApiResourceSwagger {
 
             public PutAccountingRulesResponsechangesSwagger() {}
 
-            @ApiModelProperty(example = "Employee Salary posting rule")
+            @Schema(example = "Employee Salary posting rule")
             public String name;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
         public PutAccountingRulesResponsechangesSwagger changes;
     }
 
-    @ApiModel(value = "DeleteAccountingRulesResponse")
+    @Schema(description = "DeleteAccountingRulesResponse")
     public static final class DeleteAccountingRulesResponse {
 
         private DeleteAccountingRulesResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java
index 5daf44e..ca57e31 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java
@@ -18,10 +18,8 @@
  */
 package org.apache.fineract.adhocquery.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -54,8 +52,7 @@ import org.springframework.stereotype.Component;
 @Path("/adhocquery")
 @Component
 @Scope("singleton")
-@Api(tags = { "AdhocQuery Api" })
-@SwaggerDefinition(tags = { @Tag(name = "AdhocQuery Api", description = "") })
+@Tag(name = "AdhocQuery Api", description = "")
 public class AdHocApiResource {
 
     /**
@@ -122,7 +119,7 @@ public class AdHocApiResource {
     @Path("{adHocId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    public String retrieveAdHocQuery(@PathParam("adHocId") @ApiParam(value = "adHocId") final Long adHocId,
+    public String retrieveAdHocQuery(@PathParam("adHocId") @Parameter(description = "adHocId") final Long adHocId,
             @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser();
@@ -138,7 +135,7 @@ public class AdHocApiResource {
     @Path("{adHocId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    public String update(@PathParam("adHocId") @ApiParam(value = "adHocId") final Long adHocId, final String apiRequestBodyAsJson) {
+    public String update(@PathParam("adHocId") @Parameter(description = "adHocId") final Long adHocId, final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateAdHoc(adHocId) //
@@ -160,7 +157,7 @@ public class AdHocApiResource {
     @Path("{adHocId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    public String deleteAdHocQuery(@PathParam("adHocId") @ApiParam(value = "adHocId") final Long adHocId) {
+    public String deleteAdHocQuery(@PathParam("adHocId") @Parameter(description = "adHocId") final Long adHocId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .deleteAdHoc(adHocId) //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java
index 2cf8553..18d47e0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.batch.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.ArrayList;
 import java.util.List;
 import javax.ws.rs.Consumes;
@@ -64,15 +63,13 @@ import org.springframework.stereotype.Component;
 @Path("/batches")
 @Component
 @Scope("singleton")
-@Api(tags = { "Batch API" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Batch API", description = "The Apache Fineract Batch API enables a consumer to access significant amounts of data in a single call or to make changes to several objects at once. Batching allows a consumer to pass instructions for several operations in a single HTTP request. A consumer can also specify dependencies between related operations. Once all operations have been completed, a consolidated response will be passed back and the HTTP connection will be closed.\n"
-                + "\n"
-                + "The Batch API takes in an array of logical HTTP requests represented as JSON arrays - each request has a requestId (the id of a request used to specify the sequence and as a dependency between requests), a method (corresponding to HTTP method GET/PUT/POST/DELETE etc.), a relativeUrl (the portion of the URL after https://example.org/api/v2/), optional headers array (corresponding to HTTP headers), optional reference parameter if a request is dependent on another request [...]
-                + "\n"
-                + "Batch API uses Json Path to handle dependent parameters. For example, if request '2' is referencing request '1' and in the \"body\" or in \"relativeUrl\" of request '2', there is a dependent parameter (which will look like \"$.parameter_name\"), then Batch API will internally substitute this dependent parameter from the response body of request '1'.\n"
-                + "\n"
-                + "Batch API is able to handle deeply nested dependent requests as well nested parameters. As shown in the example, requests are dependent on each other as, 1<--2<--6, i.e a nested dependency, where request '6' is not directly dependent on request '1' but still it is one of the nested child of request '1'. In the same way Batch API could handle a deeply nested dependent value, such as {..[..{..,$.parameter_name,..}..]}.") })
+@Tag(name = "Batch API", description = "The Apache Fineract Batch API enables a consumer to access significant amounts of data in a single call or to make changes to several objects at once. Batching allows a consumer to pass instructions for several operations in a single HTTP request. A consumer can also specify dependencies between related operations. Once all operations have been completed, a consolidated response will be passed back and the HTTP connection will be closed.\n"
+        + "\n"
+        + "The Batch API takes in an array of logical HTTP requests represented as JSON arrays - each request has a requestId (the id of a request used to specify the sequence and as a dependency between requests), a method (corresponding to HTTP method GET/PUT/POST/DELETE etc.), a relativeUrl (the portion of the URL after https://example.org/api/v2/), optional headers array (corresponding to HTTP headers), optional reference parameter if a request is dependent on another request and an  [...]
+        + "\n"
+        + "Batch API uses Json Path to handle dependent parameters. For example, if request '2' is referencing request '1' and in the \"body\" or in \"relativeUrl\" of request '2', there is a dependent parameter (which will look like \"$.parameter_name\"), then Batch API will internally substitute this dependent parameter from the response body of request '1'.\n"
+        + "\n"
+        + "Batch API is able to handle deeply nested dependent requests as well nested parameters. As shown in the example, requests are dependent on each other as, 1<--2<--6, i.e a nested dependency, where request '6' is not directly dependent on request '1' but still it is one of the nested child of request '1'. In the same way Batch API could handle a deeply nested dependent value, such as {..[..{..,$.parameter_name,..}..]}.")
 public class BatchApiResource {
 
     private final PlatformSecurityContext context;
@@ -109,15 +106,15 @@ public class BatchApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Batch requests in a single transaction", httpMethod = "POST", notes = "The Apache Fineract Batch API is also capable of executing all the requests in a single transaction, by setting a Query Parameter, \"enclosingTransaction=true\". So, if one or more of the requests in a batch returns an erroneous response all of the Data base transactions made by other successful requests will be rolled back.\n"
+    @Operation(summary = "Batch requests in a single transaction", description = "The Apache Fineract Batch API is also capable of executing all the requests in a single transaction, by setting a Query Parameter, \"enclosingTransaction=true\". So, if one or more of the requests in a batch returns an erroneous response all of the Data base transactions made by other successful requests will be rolled back.\n"
             + "\n"
             + "If there has been a rollback in a transaction then a single response will be provided, with a '400' status code and a body consisting of the error details of the first failed request.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "BatchRequest", required = true, type = "body", dataTypeClass = BatchApiResourceSwagger.PostBatchesRequest.class, value = "request body") })
-    @ApiResponses({ @ApiResponse(code = 200, message = "Success", response = BatchResponse.class) })
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = BatchApiResourceSwagger.PostBatchesRequest.class, description = "request body")))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "Success", content = @Content(schema = @Schema(implementation = BatchResponse.class))) })
     public String handleBatchRequests(
-            @DefaultValue("false") @QueryParam("enclosingTransaction") @ApiParam(value = "enclosingTransaction", defaultValue = "false") final boolean enclosingTransaction,
-            @ApiParam(hidden = true) final String jsonRequestString, @Context UriInfo uriInfo) {
+            @DefaultValue("false") @QueryParam("enclosingTransaction") @Parameter(description = "enclosingTransaction", required = false) final boolean enclosingTransaction,
+            @Parameter(hidden = true) final String jsonRequestString, @Context UriInfo uriInfo) {
 
         // Handles user authentication
         this.context.authenticatedUser();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java
index c016c3b..3d62f10 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.batch.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Set;
 import org.apache.fineract.batch.domain.Header;
 
@@ -32,7 +31,7 @@ final class BatchApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PostBatchesRequest")
+    @Schema(description = "PostBatchesRequest")
     public static final class PostBatchesRequest {
 
         private PostBatchesRequest() {
@@ -45,35 +44,35 @@ final class BatchApiResourceSwagger {
 
             }
 
-            @ApiModelProperty(example = "1")
+            @Schema(example = "1")
             public Long officeId;
-            @ApiModelProperty(example = "\"Petra\"")
+            @Schema(example = "\"Petra\"")
             public String firstname;
-            @ApiModelProperty(example = "\"Yton\"")
+            @Schema(example = "\"Yton\"")
             public String lastname;
-            @ApiModelProperty(example = "\"ex_externalId1\"")
+            @Schema(example = "\"ex_externalId1\"")
             public String externalId;
-            @ApiModelProperty(example = "\"dd MMMM yyyy\"")
+            @Schema(example = "\"dd MMMM yyyy\"")
             public String dateFormat;
-            @ApiModelProperty(example = "\"en\"")
+            @Schema(example = "\"en\"")
             public String locale;
-            @ApiModelProperty(example = "true")
+            @Schema(example = "true")
             public boolean active;
-            @ApiModelProperty(example = "\"04 March 2009\"")
+            @Schema(example = "\"04 March 2009\"")
             public String activationDate;
-            @ApiModelProperty(example = "\"04 March 2009\"")
+            @Schema(example = "\"04 March 2009\"")
             public String submittedOnDate;
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long requestId;
-        @ApiModelProperty(example = "clients")
+        @Schema(example = "clients")
         public String relativeUrl;
-        @ApiModelProperty(example = "POST")
+        @Schema(example = "POST")
         public String method;
         public Set<Header> headers;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long reference;
         public PostBodyRequestSwagger body;
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java
index f5934b9..06e0276 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java
@@ -18,13 +18,14 @@
  */
 package org.apache.fineract.commands.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -55,13 +56,11 @@ import org.springframework.stereotype.Component;
 @Path("/audits")
 @Component
 @Scope("singleton")
-@Api(tags = { "Audits" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Audits", description = "Every non-read Mifos API request is audited. A fully processed request can not be changed or deleted. See maker checker api for situations where an audit is not fully processed.\n"
-                + "\n"
-                + "Permissions: To search and look at audit entries a user needs to be attached to a role that has one of the ALL_FUNCTIONS, ALL_FUNCTIONS_READ or READ_AUDIT permissions.\n"
-                + "\n"
-                + "Data Scope: A user can only see audits that are within their data scope. However, 'head office' users can see all audits including those that aren't office/branch related e.g. Loan Product changes.\")") })
+@Tag(name = "Audits", description = "Every non-read Mifos API request is audited. A fully processed request can not be changed or deleted. See maker checker api for situations where an audit is not fully processed.\n"
+        + "\n"
+        + "Permissions: To search and look at audit entries a user needs to be attached to a role that has one of the ALL_FUNCTIONS, ALL_FUNCTIONS_READ or READ_AUDIT permissions.\n"
+        + "\n"
+        + "Data Scope: A user can only see audits that are within their data scope. However, 'head office' users can see all audits including those that aren't office/branch related e.g. Loan Product changes.\")")
 public class AuditsApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "actionName", "entityName", "resourceId",
@@ -90,33 +89,33 @@ public class AuditsApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Audits", notes = "Get a 200 list of audits that match the criteria supplied and sorted by audit id in descending order, and are within the requestors' data scope. Also it supports pagination and sorting\n"
+    @Operation(summary = "List Audits", description = "Get a 200 list of audits that match the criteria supplied and sorted by audit id in descending order, and are within the requestors' data scope. Also it supports pagination and sorting\n"
             + "\n" + "Example Requests:\n" + "\n" + "audits\n" + "\n" + "audits?fields=madeOnDate,maker,processingResult\n" + "\n"
             + "audits?makerDateTimeFrom=2013-03-25 08:00:00&makerDateTimeTo=2013-04-04 18:00:00\n" + "\n" + "audits?officeId=1\n" + "\n"
             + "audits?officeId=1&includeJson=true")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = MakercheckersApiResourceSwagger.GetMakerCheckerResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = MakercheckersApiResourceSwagger.GetMakerCheckerResponse.class)))) })
     public String retrieveAuditEntries(@Context final UriInfo uriInfo,
-            @QueryParam("actionName") @ApiParam(value = "actionName") final String actionName,
-            @QueryParam("entityName") @ApiParam(value = "entityName") final String entityName,
-            @QueryParam("resourceId") @ApiParam(value = "resourceId") final Long resourceId,
-            @QueryParam("makerId") @ApiParam(value = "makerId") final Long makerId,
-            @QueryParam("makerDateTimeFrom") @ApiParam(value = "makerDateTimeFrom") final String makerDateTimeFrom,
-            @QueryParam("makerDateTimeTo") @ApiParam(value = "makerDateTimeTo") final String makerDateTimeTo,
-            @QueryParam("checkerId") @ApiParam(value = "checkerId") final Long checkerId,
-            @QueryParam("checkerDateTimeFrom") @ApiParam(value = "checkerDateTimeFrom") final String checkerDateTimeFrom,
-            @QueryParam("checkerDateTimeTo") @ApiParam(value = "checkerDateTimeTo") final String checkerDateTimeTo,
-            @QueryParam("processingResult") @ApiParam(value = "processingResult") final Integer processingResult,
-            @QueryParam("officeId") @ApiParam(value = "officeId") final Integer officeId,
-            @QueryParam("groupId") @ApiParam(value = "groupId") final Integer groupId,
-            @QueryParam("clientId") @ApiParam(value = "clientId") final Integer clientId,
-            @QueryParam("loanid") @ApiParam(value = "loanid") final Integer loanId,
-            @QueryParam("savingsAccountId") @ApiParam(value = "savingsAccountId") final Integer savingsAccountId,
-            @QueryParam("paged") @ApiParam(value = "paged") final Boolean paged,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder) {
+            @QueryParam("actionName") @Parameter(description = "actionName") final String actionName,
+            @QueryParam("entityName") @Parameter(description = "entityName") final String entityName,
+            @QueryParam("resourceId") @Parameter(description = "resourceId") final Long resourceId,
+            @QueryParam("makerId") @Parameter(description = "makerId") final Long makerId,
+            @QueryParam("makerDateTimeFrom") @Parameter(description = "makerDateTimeFrom") final String makerDateTimeFrom,
+            @QueryParam("makerDateTimeTo") @Parameter(description = "makerDateTimeTo") final String makerDateTimeTo,
+            @QueryParam("checkerId") @Parameter(description = "checkerId") final Long checkerId,
+            @QueryParam("checkerDateTimeFrom") @Parameter(description = "checkerDateTimeFrom") final String checkerDateTimeFrom,
+            @QueryParam("checkerDateTimeTo") @Parameter(description = "checkerDateTimeTo") final String checkerDateTimeTo,
+            @QueryParam("processingResult") @Parameter(description = "processingResult") final Integer processingResult,
+            @QueryParam("officeId") @Parameter(description = "officeId") final Integer officeId,
+            @QueryParam("groupId") @Parameter(description = "groupId") final Integer groupId,
+            @QueryParam("clientId") @Parameter(description = "clientId") final Integer clientId,
+            @QueryParam("loanid") @Parameter(description = "loanid") final Integer loanId,
+            @QueryParam("savingsAccountId") @Parameter(description = "savingsAccountId") final Integer savingsAccountId,
+            @QueryParam("paged") @Parameter(description = "paged") final Boolean paged,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
         final PaginationParameters parameters = PaginationParameters.instance(paged, offset, limit, orderBy, sortOrder);
@@ -141,10 +140,11 @@ public class AuditsApiResource {
     @Path("{auditId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve an Audit Entry", notes = "Example Requests:\n" + "\n" + "audits/20\n"
+    @Operation(summary = "Retrieve an Audit Entry", description = "Example Requests:\n" + "\n" + "audits/20\n"
             + "audits/20?fields=madeOnDate,maker,processingResult")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = MakercheckersApiResourceSwagger.GetMakerCheckerResponse.class) })
-    public String retrieveAuditEntry(@PathParam("auditId") @ApiParam(value = "auditId") final Long auditId,
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = MakercheckersApiResourceSwagger.GetMakerCheckerResponse.class))) })
+    public String retrieveAuditEntry(@PathParam("auditId") @Parameter(description = "auditId") final Long auditId,
             @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
@@ -159,10 +159,10 @@ public class AuditsApiResource {
     @Path("/searchtemplate")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Audit Search Template", notes = "This is a convenience resource. It can be useful when building an Audit Search UI. \"appUsers\" are data scoped to the office/branch the requestor is associated with.\n"
+    @Operation(summary = "Audit Search Template", description = "This is a convenience resource. It can be useful when building an Audit Search UI. \"appUsers\" are data scoped to the office/branch the requestor is associated with.\n"
             + "\n" + "Example Requests:\n" + "\n" + "audits/searchtemplate\n" + "audits/searchtemplate?fields=actionNames")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = MakercheckersApiResourceSwagger.GetMakerCheckersSearchTemplateResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = MakercheckersApiResourceSwagger.GetMakerCheckersSearchTemplateResponse.class))) })
     public String retrieveAuditSearchTemplate(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java
index 14edbc9..8b7c45b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java
@@ -18,13 +18,14 @@
  */
 package org.apache.fineract.commands.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -58,8 +59,7 @@ import org.springframework.stereotype.Component;
 @Path("/makercheckers")
 @Component
 @Scope("singleton")
-@Api(tags = { "Maker Checker (or 4-eye) functionality" })
-@SwaggerDefinition(tags = { @Tag(name = "Maker Checker (or 4-eye) functionality") })
+@Tag(name = "Maker Checker (or 4-eye) functionality")
 public class MakercheckersApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "actionName", "entityName", "resourceId",
@@ -88,24 +88,24 @@ public class MakercheckersApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Maker Checker Entries", notes = "Get a list of entries that can be checked by the requestor that match the criteria supplied.\n"
+    @Operation(summary = "List Maker Checker Entries", description = "Get a list of entries that can be checked by the requestor that match the criteria supplied.\n"
             + "\n" + "Example Requests:\n" + "\n" + "makercheckers\n" + "\n" + "makercheckers?fields=madeOnDate,maker,processingResult\n"
             + "\n" + "makercheckers?makerDateTimeFrom=2013-03-25 08:00:00&makerDateTimeTo=2013-04-04 18:00:00\n" + "\n"
             + "makercheckers?officeId=1\n" + "\n" + "makercheckers?officeId=1&includeJson=true")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = MakercheckersApiResourceSwagger.GetMakerCheckerResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = MakercheckersApiResourceSwagger.GetMakerCheckerResponse.class)))) })
     public String retrieveCommands(@Context final UriInfo uriInfo,
-            @QueryParam("actionName") @ApiParam(value = "actionName") final String actionName,
-            @QueryParam("entityName") @ApiParam(value = "entityName") final String entityName,
-            @QueryParam("resourceId") @ApiParam(value = "resourceId") final Long resourceId,
-            @QueryParam("makerId") @ApiParam(value = "makerId") final Long makerId,
-            @QueryParam("makerDateTimeFrom") @ApiParam(value = "makerDateTimeFrom") final String makerDateTimeFrom,
-            @QueryParam("makerDateTimeTo") @ApiParam(value = "makerDateTimeTo") final String makerDateTimeTo,
-            @QueryParam("officeId") @ApiParam(value = "officeId") final Integer officeId,
-            @QueryParam("groupId") @ApiParam(value = "groupId") final Integer groupId,
-            @QueryParam("clientId") @ApiParam(value = "clientId") final Integer clientId,
-            @QueryParam("loanid") @ApiParam(value = "loanid") final Integer loanId,
-            @QueryParam("savingsAccountId") @ApiParam(value = "savingsAccountId") final Integer savingsAccountId) {
+            @QueryParam("actionName") @Parameter(description = "actionName") final String actionName,
+            @QueryParam("entityName") @Parameter(description = "entityName") final String entityName,
+            @QueryParam("resourceId") @Parameter(description = "resourceId") final Long resourceId,
+            @QueryParam("makerId") @Parameter(description = "makerId") final Long makerId,
+            @QueryParam("makerDateTimeFrom") @Parameter(description = "makerDateTimeFrom") final String makerDateTimeFrom,
+            @QueryParam("makerDateTimeTo") @Parameter(description = "makerDateTimeTo") final String makerDateTimeTo,
+            @QueryParam("officeId") @Parameter(description = "officeId") final Integer officeId,
+            @QueryParam("groupId") @Parameter(description = "groupId") final Integer groupId,
+            @QueryParam("clientId") @Parameter(description = "clientId") final Integer clientId,
+            @QueryParam("loanid") @Parameter(description = "loanid") final Integer loanId,
+            @QueryParam("savingsAccountId") @Parameter(description = "savingsAccountId") final Integer savingsAccountId) {
 
         final SQLBuilder extraCriteria = getExtraCriteria(actionName, entityName, resourceId, makerId, makerDateTimeFrom, makerDateTimeTo,
                 officeId, groupId, clientId, loanId, savingsAccountId);
@@ -122,10 +122,10 @@ public class MakercheckersApiResource {
     @Path("/searchtemplate")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Maker Checker Search Template", notes = "This is a convenience resource. It can be useful when building a Checker Inbox UI. \"appUsers\" are data scoped to the office/branch the requestor is associated with. \"actionNames\" and \"entityNames\" returned are those that the requestor has Checker approval permissions for.\n"
+    @Operation(summary = "Maker Checker Search Template", description = "This is a convenience resource. It can be useful when building a Checker Inbox UI. \"appUsers\" are data scoped to the office/branch the requestor is associated with. \"actionNames\" and \"entityNames\" returned are those that the requestor has Checker approval permissions for.\n"
             + "\n" + "Example Requests:\n" + "\n" + "makercheckers/searchtemplate\n" + "makercheckers/searchtemplate?fields=entityNames")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = MakercheckersApiResourceSwagger.GetMakerCheckersSearchTemplateResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = MakercheckersApiResourceSwagger.GetMakerCheckersSearchTemplateResponse.class))) })
     public String retrieveAuditSearchTemplate(@Context final UriInfo uriInfo) {
 
         final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
@@ -141,10 +141,11 @@ public class MakercheckersApiResource {
     @Path("{auditId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Approve Maker Checker Entry | Reject Maker Checker Entry")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = MakercheckersApiResourceSwagger.PostMakerCheckersResponse.class) })
-    public String approveMakerCheckerEntry(@PathParam("auditId") @ApiParam(value = "auditId") final Long auditId,
-            @QueryParam("command") @ApiParam(value = "command") final String commandParam) {
+    @Operation(summary = "Approve Maker Checker Entry | Reject Maker Checker Entry")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = MakercheckersApiResourceSwagger.PostMakerCheckersResponse.class))) })
+    public String approveMakerCheckerEntry(@PathParam("auditId") @Parameter(description = "auditId") final Long auditId,
+            @QueryParam("command") @Parameter(description = "command") final String commandParam) {
 
         CommandProcessingResult result = null;
         if (is(commandParam, "approve")) {
@@ -166,9 +167,10 @@ public class MakercheckersApiResource {
     @Path("{auditId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete Maker Checker Entry")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = MakercheckersApiResourceSwagger.PostMakerCheckersResponse.class) })
-    public String deleteMakerCheckerEntry(@PathParam("auditId") @ApiParam(value = "auditId") final Long auditId) {
+    @Operation(summary = "Delete Maker Checker Entry")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = MakercheckersApiResourceSwagger.PostMakerCheckersResponse.class))) })
+    public String deleteMakerCheckerEntry(@PathParam("auditId") @Parameter(description = "auditId") final Long auditId) {
 
         final Long id = this.writePlatformService.deleteEntry(auditId);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java
index 39b8c9d..c5e30f7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.commands.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import java.util.List;
 import org.apache.fineract.commands.data.ProcessingResultLookup;
@@ -35,7 +34,7 @@ final class MakercheckersApiResourceSwagger {
         // only to initialize swagger documentation
     }
 
-    @ApiModel(value = "GetMakerCheckerResponse")
+    @Schema(description = "GetMakerCheckerResponse")
     public static final class GetMakerCheckerResponse {
 
         private GetMakerCheckerResponse() {
@@ -65,7 +64,7 @@ final class MakercheckersApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetMakerCheckersSearchTemplateResponse")
+    @Schema(description = "GetMakerCheckersSearchTemplateResponse")
     public static final class GetMakerCheckersSearchTemplateResponse {
 
         private GetMakerCheckersSearchTemplateResponse() {
@@ -78,14 +77,14 @@ final class MakercheckersApiResourceSwagger {
         public Collection<ProcessingResultLookup> processingResults;
     }
 
-    @ApiModel(value = "PostMakerCheckersResponse")
+    @Schema(description = "PostMakerCheckersResponse")
     public static final class PostMakerCheckersResponse {
 
         private PostMakerCheckersResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long auditId;
 
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java
index b8cda75..73f8bf1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.accountnumberformat.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -61,9 +61,7 @@ import org.springframework.stereotype.Component;
 @Path(AccountNumberFormatConstants.resourceRelativeURL)
 @Component
 @Scope("singleton")
-@Api(tags = { "Account number format" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Account number format", description = "Account number preferences are used to describe custom formats for account numbers associated with Customer, Loan and Savings accounts.") })
+@Tag(name = "Account number format", description = "Account number preferences are used to describe custom formats for account numbers associated with Customer, Loan and Savings accounts.")
 public class AccountNumberFormatsApiResource {
 
     private final PlatformSecurityContext context;
@@ -93,10 +91,10 @@ public class AccountNumberFormatsApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Account number format Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
+    @Operation(summary = "Retrieve Account number format Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
             + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "\n" + "Example Request:\n" + "\n" + "accountnumberformats/template")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountNumberFormatsApiResourceSwagger.GetAccountNumberFormatsResponseTemplate.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.GetAccountNumberFormatsResponseTemplate.class))) })
     public String retrieveTemplate(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(AccountNumberFormatConstants.ENTITY_NAME);
@@ -111,10 +109,10 @@ public class AccountNumberFormatsApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Account number formats", notes = "Example Requests:\n" + "\n" + "accountnumberformats\n" + "\n" + "\n"
-            + "accountnumberformats?fields=accountType,prefixType", responseContainer = "List")
+    @Operation(summary = "List Account number formats", description = "Example Requests:\n" + "\n" + "accountnumberformats\n" + "\n" + "\n"
+            + "accountnumberformats?fields=accountType,prefixType")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountNumberFormatsApiResourceSwagger.GetAccountNumberFormatsIdResponse.class, responseContainer = "List") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.GetAccountNumberFormatsIdResponse.class)))) })
     public String retrieveAll(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(AccountNumberFormatConstants.ENTITY_NAME);
@@ -130,12 +128,12 @@ public class AccountNumberFormatsApiResource {
     @Path("{accountNumberFormatId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve an Account number format", notes = "Example Requests:\n" + "\n" + "accountnumberformats/1\n" + "\n"
+    @Operation(summary = "Retrieve an Account number format", description = "Example Requests:\n" + "\n" + "accountnumberformats/1\n" + "\n"
             + "\n" + "accountnumberformats/1?template=true\n" + "\n" + "\n" + "accountnumberformats/1?fields=accountType,prefixType")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountNumberFormatsApiResourceSwagger.GetAccountNumberFormatsIdResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.GetAccountNumberFormatsIdResponse.class))) })
     public String retrieveOne(@Context final UriInfo uriInfo,
-            @PathParam("accountNumberFormatId") @ApiParam(value = "accountNumberFormatId") final Long accountNumberFormatId) {
+            @PathParam("accountNumberFormatId") @Parameter(description = "accountNumberFormatId") final Long accountNumberFormatId) {
 
         this.context.authenticatedUser().validateHasReadPermission(AccountNumberFormatConstants.ENTITY_NAME);
 
@@ -155,13 +153,12 @@ public class AccountNumberFormatsApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create an Account number format", notes = "Note: You may associate a single Account number format for a given account type\n"
+    @Operation(summary = "Create an Account number format", description = "Note: You may associate a single Account number format for a given account type\n"
             + "Mandatory Fields for Account number formats\n" + "accountType")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", paramType = "body", dataType = "body", format = "body", dataTypeClass = AccountNumberFormatsApiResourceSwagger.PostAccountNumberFormatsRequest.class) })
+    @RequestBody(content = @Content(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.PostAccountNumberFormatsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountNumberFormatsApiResourceSwagger.PostAccountNumberFormatsResponse.class) })
-    public String create(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.PostAccountNumberFormatsResponse.class))) })
+    public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .createAccountNumberFormat() //
@@ -177,13 +174,13 @@ public class AccountNumberFormatsApiResource {
     @Path("{accountNumberFormatId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update an Account number format")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = AccountNumberFormatsApiResourceSwagger.PutAccountNumberFormatsRequest.class) })
+    @Operation(summary = "Update an Account number format")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.PutAccountNumberFormatsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountNumberFormatsApiResourceSwagger.PutAccountNumberFormatsResponse.class) })
-    public String update(@PathParam("accountNumberFormatId") @ApiParam(value = "accountNumberFormatId") final Long accountNumberFormatId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.PutAccountNumberFormatsResponse.class))) })
+    public String update(
+            @PathParam("accountNumberFormatId") @Parameter(description = "accountNumberFormatId") final Long accountNumberFormatId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateAccountNumberFormat(accountNumberFormatId) //
@@ -199,10 +196,11 @@ public class AccountNumberFormatsApiResource {
     @Path("{accountNumberFormatId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete an Account number format", notes = "Note: Account numbers created while this format was active would remain unchanged.")
+    @Operation(summary = "Delete an Account number format", description = "Note: Account numbers created while this format was active would remain unchanged.")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = AccountNumberFormatsApiResourceSwagger.DeleteAccountNumberFormatsResponse.class) })
-    public String delete(@PathParam("accountNumberFormatId") @ApiParam(value = "accountNumberFormatId") final Long accountNumberFormatId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AccountNumberFormatsApiResourceSwagger.DeleteAccountNumberFormatsResponse.class))) })
+    public String delete(
+            @PathParam("accountNumberFormatId") @Parameter(description = "accountNumberFormatId") final Long accountNumberFormatId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .deleteAccountNumberFormat(accountNumberFormatId) //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java
index 2de81f9..d1dfaec 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.accountnumberformat.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import java.util.Map;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
@@ -33,7 +32,7 @@ final class AccountNumberFormatsApiResourceSwagger {
         // this class is only for Swagger implementation for Live Documentation
     }
 
-    @ApiModel(value = "GetAccountNumberFormatsResponse")
+    @Schema(description = "GetAccountNumberFormatsResponse")
     public static final class GetAccountNumberFormatsResponse {
 
         private GetAccountNumberFormatsResponse() {
@@ -43,14 +42,14 @@ final class AccountNumberFormatsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetAccountNumberFormatsIdResponse")
+    @Schema(description = "GetAccountNumberFormatsIdResponse")
     public static final class GetAccountNumberFormatsIdResponse {
 
         private GetAccountNumberFormatsIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long id;
         public EnumOptionData accountType;
 
@@ -58,7 +57,7 @@ final class AccountNumberFormatsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetAccountNumberFormatsResponseTemplate")
+    @Schema(description = "GetAccountNumberFormatsResponseTemplate")
     public static final class GetAccountNumberFormatsResponseTemplate {
 
         private GetAccountNumberFormatsResponseTemplate() {
@@ -70,45 +69,45 @@ final class AccountNumberFormatsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PostAccountNumberFormatsRequest")
+    @Schema(description = "PostAccountNumberFormatsRequest")
     public static final class PostAccountNumberFormatsRequest {
 
         private PostAccountNumberFormatsRequest() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long accountType;
-        @ApiModelProperty(example = "101")
+        @Schema(example = "101")
         public Long prefixType;
 
     }
 
-    @ApiModel(value = "PostAccountNumberFormatsResponse")
+    @Schema(description = "PostAccountNumberFormatsResponse")
     public static final class PostAccountNumberFormatsResponse {
 
         private PostAccountNumberFormatsResponse() {
 
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
 
     }
 
-    @ApiModel(value = "PutAccountNumberFormatsRequest")
+    @Schema(description = "PutAccountNumberFormatsRequest")
     public static final class PutAccountNumberFormatsRequest {
 
         private PutAccountNumberFormatsRequest() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long prefixType;
 
     }
 
-    @ApiModel(value = "PutAccountNumberFormatsResponse")
+    @Schema(description = "PutAccountNumberFormatsResponse")
     public static final class PutAccountNumberFormatsResponse {
 
         private PutAccountNumberFormatsResponse() {
@@ -121,24 +120,24 @@ final class AccountNumberFormatsApiResourceSwagger {
 
             }
 
-            @ApiModelProperty(example = "OFFICE_NAME")
+            @Schema(example = "OFFICE_NAME")
             public Long prefixType;
         }
 
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long resourceId;
         public PutAccountNumberFormatschangesSwagger changes;
 
     }
 
-    @ApiModel(value = "DeleteAccountNumberFormatsResponse")
+    @Schema(description = "DeleteAccountNumberFormatsResponse")
     public static final class DeleteAccountNumberFormatsResponse {
 
         private DeleteAccountNumberFormatsResponse() {
 
         }
 
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long resourceId;
 
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResource.java
index 2d29731..95ee3e2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.cache.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -59,11 +59,9 @@ import org.springframework.stereotype.Component;
 @Produces({ MediaType.APPLICATION_JSON })
 @Component
 @Scope("singleton")
-@Api(tags = { "Cache" })
-@SwaggerDefinition(tags = { @Tag(name = "Cache", description = "The following settings are possible for cache:\n" + "\n"
-        + "No Caching: caching turned off\n"
+@Tag(name = "Cache", description = "The following settings are possible for cache:\n" + "\n" + "No Caching: caching turned off\n"
         + "Single node: caching on for single instance deployments of platorm (works for multiple tenants but only one tomcat)\n"
-        + "By default caching is set to No Caching. Switching between caches results in the cache been clear e.g. from Single node to No cache and back again would clear down the single node cache.") })
+        + "By default caching is set to No Caching. Switching between caches results in the cache been clear e.g. from Single node to No cache and back again would clear down the single node cache.")
 public class CacheApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id"));
@@ -88,9 +86,10 @@ public class CacheApiResource {
     }
 
     @GET
-    @ApiOperation(value = "Retrieve Cache Types", notes = "Returns the list of caches.\n" + "\n" + "Example Requests:\n" + "\n" + "caches")
+    @Operation(summary = "Retrieve Cache Types", description = "Returns the list of caches.\n" + "\n" + "Example Requests:\n" + "\n"
+            + "caches")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = CacheApiResourceSwagger.GetCachesResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = CacheApiResourceSwagger.GetCachesResponse.class)))) })
     public String retrieveAll(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
@@ -102,11 +101,11 @@ public class CacheApiResource {
     }
 
     @PUT
-    @ApiOperation(value = "Switch Cache", notes = "Switches the cache to chosen one.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CacheApiResourceSwagger.PutCachesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CacheApiResourceSwagger.PutCachesResponse.class) })
-    public String switchCache(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Switch Cache", description = "Switches the cache to chosen one.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CacheApiResourceSwagger.PutCachesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CacheApiResourceSwagger.PutCachesResponse.class))) })
+    public String switchCache(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateCache().withJson(apiRequestBodyAsJson).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResourceSwagger.java
index 7e03822..8bce43c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/api/CacheApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.cache.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 /**
@@ -31,7 +30,7 @@ final class CacheApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetCachesResponse")
+    @Schema(description = "GetCachesResponse")
     public static final class GetCachesResponse {
 
         private GetCachesResponse() {
@@ -42,19 +41,19 @@ final class CacheApiResourceSwagger {
         public boolean enabled;
     }
 
-    @ApiModel(value = "PutCachesRequest")
+    @Schema(description = "PutCachesRequest")
     public static final class PutCachesRequest {
 
         private PutCachesRequest() {
 
         }
 
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long cacheType;
 
     }
 
-    @ApiModel(value = "PutCachesResponse")
+    @Schema(description = "PutCachesResponse")
     public static final class PutCachesResponse {
 
         private PutCachesResponse() {
@@ -67,7 +66,7 @@ final class CacheApiResourceSwagger {
 
             }
 
-            @ApiModelProperty(example = "2")
+            @Schema(example = "2")
             public Long cacheType;
 
         }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/api/SmsCampaignApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/api/SmsCampaignApiResource.java
index 0000105..2575805 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/api/SmsCampaignApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/api/SmsCampaignApiResource.java
@@ -19,12 +19,12 @@
 package org.apache.fineract.infrastructure.campaigns.sms.api;
 
 import com.google.gson.JsonElement;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
+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;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import java.util.HashSet;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -64,7 +64,6 @@ import org.springframework.stereotype.Component;
 @Path("/smscampaigns")
 @Component
 @Scope("singleton")
-@Api(value = "SMS Campaigns")
 public class SmsCampaignApiResource {
 
     private final PlatformSecurityContext platformSecurityContext;
@@ -100,9 +99,9 @@ public class SmsCampaignApiResource {
 
     @GET
     @Path("template")
-    @ApiOperation(value = "Retrieve a SMS Campaign", notes = "Example Requests:\n" + "\n" + "smscampaigns/1\n" + "\n" + "\n"
+    @Operation(summary = "Retrieve a SMS Campaign", description = "Example Requests:\n" + "\n" + "smscampaigns/1\n" + "\n" + "\n"
             + "smscampaigns/1?template=true\n" + "\n" + "\n" + "smscampaigns/template")
-    @ApiResponse(code = 200, message = "", response = SmsCampaignData.class)
+    @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SmsCampaignData.class)))
     public String template(@Context final UriInfo uriInfo) {
         this.platformSecurityContext.authenticatedUser().validateHasReadPermission(SmsCampaignConstants.RESOURCE_NAME);
         final SmsCampaignData smsCampaignData = this.smsCampaignReadPlatformService.retrieveTemplate(CampaignType.SMS.name());
@@ -113,13 +112,12 @@ public class SmsCampaignApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a SMS Campaign", notes = "Mandatory Fields\n"
+    @Operation(summary = "Create a SMS Campaign", description = "Mandatory Fields\n"
             + "campaignName, campaignType, triggerType, providerId, runReportId, message\n" + "\n"
             + "Mandatory Fields for Cash based on selected report id\n" + "paramValue in json format")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CommandWrapper.class) })
-    @ApiResponse(code = 200, message = "", response = CommandProcessingResult.class)
-    public String createCampaign(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CommandWrapper.class)))
+    @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CommandProcessingResult.class)))
+    public String createCampaign(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
         this.platformSecurityContext.authenticatedUser();
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createSmsCampaign().withJson(apiRequestBodyAsJson).build();
         final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
@@ -129,8 +127,8 @@ public class SmsCampaignApiResource {
     @GET
     @Path("{resourceId}")
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a SMS Campaign", notes = "Example Requests:\n" + "\n" + "smscampaigns/1\n")
-    @ApiResponse(code = 200, message = "", response = SmsCampaignData.class)
+    @Operation(summary = "Retrieve a SMS Campaign", description = "Example Requests:\n" + "\n" + "smscampaigns/1\n")
+    @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SmsCampaignData.class)))
     public String retrieveCampaign(@PathParam("resourceId") final Long resourceId, @Context final UriInfo uriInfo) {
         this.platformSecurityContext.authenticatedUser().validateHasReadPermission(SmsCampaignConstants.RESOURCE_NAME);
         SmsCampaignData smsCampaignData = this.smsCampaignReadPlatformService.retrieveOne(resourceId);
@@ -141,8 +139,8 @@ public class SmsCampaignApiResource {
 
     @GET
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List SMS Campaigns", notes = "Example Requests:\n" + "\n" + "smscampaigns")
-    @ApiResponse(code = 200, message = "", response = SmsCampaignData.class)
+    @Operation(summary = "List SMS Campaigns", description = "Example Requests:\n" + "\n" + "smscampaigns")
+    @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SmsCampaignData.class)))
     public String retrieveAllEmails(@QueryParam("sqlSearch") final String sqlSearch, @QueryParam("offset") final Integer offset,
             @QueryParam("limit") final Integer limit, @QueryParam("orderBy") final String orderBy,
             @QueryParam("sortOrder") final String sortOrder, @Context final UriInfo uriInfo) {
@@ -157,12 +155,11 @@ public class SmsCampaignApiResource {
     @Path("{campaignId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Campaign")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CommandWrapper.class) })
-    @ApiResponse(code = 200, message = "", response = CommandProcessingResult.class)
+    @Operation(summary = "Update a Campaign")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CommandWrapper.class)))
+    @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CommandProcessingResult.class)))
     public String updateCampaign(@PathParam("campaignId") final Long campaignId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateSmsCampaign(campaignId).withJson(apiRequestBodyAsJson)
                 .build();
         final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
@@ -173,10 +170,10 @@ public class SmsCampaignApiResource {
     @Path("{campaignId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "SMS Campaign", notes = "Activates | Deactivates | Reactivates")
-    @ApiResponse(code = 200, message = "", response = CommandProcessingResult.class)
+    @Operation(summary = "SMS Campaign", description = "Activates | Deactivates | Reactivates")
+    @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CommandProcessingResult.class)))
     public String handleCommands(@PathParam("campaignId") final Long campaignId, @QueryParam("command") final String commandParam,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
         final CommandWrapperBuilder builder = new CommandWrapperBuilder().withJson(apiRequestBodyAsJson);
         CommandProcessingResult result = null;
         CommandWrapper commandRequest = null;
@@ -211,8 +208,8 @@ public class SmsCampaignApiResource {
 
     @DELETE
     @Path("{campaignId}")
-    @ApiOperation(value = "Delete a SMS Campaign", notes = "Note: Only closed SMS Campaigns can be deleted")
-    @ApiResponse(code = 200, message = "", response = CommandProcessingResult.class)
+    @Operation(summary = "Delete a SMS Campaign", description = "Note: Only closed SMS Campaigns can be deleted")
+    @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CommandProcessingResult.class)))
     public String delete(@PathParam("campaignId") final Long campaignId) {
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteSmsCampaign(campaignId).build();
         final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java
index 75c162c..caa95f9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.codes.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -61,11 +61,9 @@ import org.springframework.stereotype.Component;
 @Path("/codes/{codeId}/codevalues")
 @Component
 @Scope("singleton")
-@Api(tags = { "Code Values" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Code Values", description = "Code and code values: Codes represent a specific category of data, their code values are a specific instance of that category.\n"
-                + "\n"
-                + "Codes are mostly system defined which means the code itself comes out of the box and cannot be modified however its code values can be. e.g. 'Customer Identifier', it defaults to a code value of 'Passport' but could be 'Drivers License, National Id' etc") })
+@Tag(name = "Code Values", description = "Code and code values: Codes represent a specific category of data, their code values are a specific instance of that category.\n"
+        + "\n"
+        + "Codes are mostly system defined which means the code itself comes out of the box and cannot be modified however its code values can be. e.g. 'Customer Identifier', it defaults to a code value of 'Passport' but could be 'Drivers License, National Id' etc")
 public class CodeValuesApiResource {
 
     /**
@@ -96,12 +94,12 @@ public class CodeValuesApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Code Values", notes = "Returns the list of Code Values for a given Code\n" + "\n" + "Example Requests:\n"
-            + "\n" + "codes/1/codevalues")
+    @Operation(summary = "List Code Values", description = "Returns the list of Code Values for a given Code\n" + "\n"
+            + "Example Requests:\n" + "\n" + "codes/1/codevalues")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "A List of Given response", response = CodeValuesApiResourceSwagger.GetCodeValuesDataResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "A List of code values for a given code", content = @Content(array = @ArraySchema(schema = @Schema(implementation = CodeValuesApiResourceSwagger.GetCodeValuesDataResponse.class)))) })
     public String retrieveAllCodeValues(@Context final UriInfo uriInfo,
-            @PathParam("codeId") @ApiParam(value = "codeId") final Long codeId) {
+            @PathParam("codeId") @Parameter(description = "codeId") final Long codeId) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -115,11 +113,12 @@ public class CodeValuesApiResource {
     @Path("{codeValueId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Code Value", notes = "Returns the details of a Code Value\n" + "\n" + "Example Requests:\n" + "\n"
-            + "codes/1/codevalues/1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodeValuesApiResourceSwagger.GetCodeValuesDataResponse.class) })
+    @Operation(summary = "Retrieve a Code description", description = "Returns the details of a Code Value\n" + "\n" + "Example Requests:\n"
+            + "\n" + "codes/1/codevalues/1")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.GetCodeValuesDataResponse.class))) })
     public String retrieveCodeValue(@Context final UriInfo uriInfo,
-            @PathParam("codeValueId") @ApiParam(value = "codeValueId") final Long codeValueId) {
+            @PathParam("codeValueId") @Parameter(description = "codeValueId") final Long codeValueId) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -132,12 +131,12 @@ public class CodeValuesApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a Code Value", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CodeValuesApiResourceSwagger.PostCodeValuesDataRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodeValuesApiResourceSwagger.PostCodeValueDataResponse.class) })
-    public String createCodeValue(@PathParam("codeId") @ApiParam(value = "codeId") final Long codeId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Create a Code description", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PostCodeValuesDataRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PostCodeValueDataResponse.class))) })
+    public String createCodeValue(@PathParam("codeId") @Parameter(description = "codeId") final Long codeId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createCodeValue(codeId).withJson(apiRequestBodyAsJson).build();
 
@@ -151,13 +150,13 @@ public class CodeValuesApiResource {
     @Path("{codeValueId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Code Value", notes = "Updates the details of a code value.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CodeValuesApiResourceSwagger.PutCodeValuesDataRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodeValuesApiResourceSwagger.PutCodeValueDataResponse.class) })
-    public String updateCodeValue(@PathParam("codeId") @ApiParam(value = "codeId") final Long codeId,
-            @PathParam("codeValueId") @ApiParam(value = "codeValueId") final Long codeValueId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update a Code description", description = "Updates the details of a code description.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PutCodeValuesDataRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.PutCodeValueDataResponse.class))) })
+    public String updateCodeValue(@PathParam("codeId") @Parameter(description = "codeId") final Long codeId,
+            @PathParam("codeValueId") @Parameter(description = "codeValueId") final Long codeValueId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateCodeValue(codeId, codeValueId)
                 .withJson(apiRequestBodyAsJson).build();
@@ -171,10 +170,11 @@ public class CodeValuesApiResource {
     @Path("{codeValueId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete a Code Value", notes = "Deletes a code value")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodeValuesApiResourceSwagger.DeleteCodeValueDataResponse.class) })
-    public String deleteCodeValue(@PathParam("codeId") @ApiParam(value = "codeId") final Long codeId,
-            @PathParam("codeValueId") @ApiParam(value = "codeValueId") final Long codeValueId) {
+    @Operation(summary = "Delete a Code description", description = "Deletes a code description")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodeValuesApiResourceSwagger.DeleteCodeValueDataResponse.class))) })
+    public String deleteCodeValue(@PathParam("codeId") @Parameter(description = "codeId") final Long codeId,
+            @PathParam("codeValueId") @Parameter(description = "codeValueId") final Long codeValueId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteCodeValue(codeId, codeValueId).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java
index 7684a81..ee8e48a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.codes.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 30/7/17.
@@ -30,65 +29,65 @@ final class CodeValuesApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetCodeValuesDataResponse")
+    @Schema(description = "GetCodeValuesDataResponse")
     public static final class GetCodeValuesDataResponse {
 
         private GetCodeValuesDataResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "Passport")
+        @Schema(example = "Passport")
         public String name;
-        @ApiModelProperty(example = "Passport information")
+        @Schema(example = "Passport information")
         public String description;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Integer position;
     }
 
-    @ApiModel(value = "PostCodeValuesDataRequest")
+    @Schema(description = "PostCodeValuesDataRequest")
     public static final class PostCodeValuesDataRequest {
 
         private PostCodeValuesDataRequest() {
 
         }
 
-        @ApiModelProperty(example = "Passport")
+        @Schema(example = "Passport")
         public String name;
-        @ApiModelProperty(example = "Passport information")
+        @Schema(example = "Passport information")
         public String description;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Integer position;
     }
 
-    @ApiModel(value = "PostCodeValueDataResponse")
+    @Schema(description = "PostCodeValueDataResponse")
     public static final class PostCodeValueDataResponse {
 
         private PostCodeValueDataResponse() {
 
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutCodeValuesDataRequest")
+    @Schema(description = "PutCodeValuesDataRequest")
     public static final class PutCodeValuesDataRequest {
 
         private PutCodeValuesDataRequest() {
 
         }
 
-        @ApiModelProperty(example = "Passport")
+        @Schema(example = "Passport")
         public String name;
-        @ApiModelProperty(example = "Passport information")
+        @Schema(example = "Passport information")
         public String description;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Integer position;
     }
 
-    @ApiModel(value = "PutCodeValueDataResponse")
+    @Schema(description = "PutCodeValueDataResponse")
     public static final class PutCodeValueDataResponse {
 
         private PutCodeValueDataResponse() {
@@ -99,27 +98,27 @@ final class CodeValuesApiResourceSwagger {
 
             private PutCodeValuechangesSwagger() {}
 
-            @ApiModelProperty(example = "Passport")
+            @Schema(example = "Passport")
             public String name;
-            @ApiModelProperty(example = "Passport information")
+            @Schema(example = "Passport information")
             public String description;
-            @ApiModelProperty(example = "0")
+            @Schema(example = "0")
             public Integer position;
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
         public PutCodeValuechangesSwagger changes;
     }
 
-    @ApiModel(value = "DeleteCodeValueDataResponse")
+    @Schema(description = "DeleteCodeValueDataResponse")
     public static final class DeleteCodeValueDataResponse {
 
         private DeleteCodeValueDataResponse() {
 
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResource.java
index 5f59030..761a77a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.codes.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -59,11 +59,9 @@ import org.springframework.stereotype.Component;
 @Path("/codes")
 @Component
 @Scope("singleton")
-@Api(tags = { "Codes" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Codes", description = "Code and code values: Codes represent a specific category of data, their code values are a specific instance of that category.\n"
-                + "\n"
-                + "Codes are mostly system defined which means the code itself comes out of the box and cannot be modified however its code values can be. e.g. 'Customer Identifier', it defaults to a code value of 'Passport' but could be 'Drivers License, National Id' etc") })
+@Tag(name = "Codes", description = "Code and code values: Codes represent a specific category of data, their code values are a specific instance of that category.\n"
+        + "\n"
+        + "Codes are mostly system defined which means the code itself comes out of the box and cannot be modified however its code values can be. e.g. 'Customer Identifier', it defaults to a code value of 'Passport' but could be 'Drivers License, National Id' etc")
 public class CodesApiResource {
 
     /**
@@ -92,9 +90,9 @@ public class CodesApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Codes", notes = "Returns the list of codes.\n" + "\n" + "Example Requests:\n" + "\n" + "codes")
+    @Operation(summary = "Retrieve Codes", description = "Returns the list of codes.\n" + "\n" + "Example Requests:\n" + "\n" + "codes")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = CodesApiResourceSwagger.GetCodesResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = CodesApiResourceSwagger.GetCodesResponse.class)))) })
     public String retrieveCodes(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
@@ -108,11 +106,11 @@ public class CodesApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a Code", notes = "Creates a code. Codes created through api are always 'user defined' and so system defined is marked as false.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CodesApiResourceSwagger.PostCodesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodesApiResourceSwagger.PostCodesResponse.class) })
-    public String createCode(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Create a Code", description = "Creates a code. Codes created through api are always 'user defined' and so system defined is marked as false.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CodesApiResourceSwagger.PostCodesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodesApiResourceSwagger.PostCodesResponse.class))) })
+    public String createCode(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createCode().withJson(apiRequestBodyAsJson).build();
 
@@ -125,9 +123,11 @@ public class CodesApiResource {
     @Path("{codeId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Code", notes = "Returns the details of a Code.\n" + "\n" + "Example Requests:\n" + "\n" + "codes/1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodesApiResourceSwagger.GetCodesResponse.class) })
-    public String retrieveCode(@PathParam("codeId") @ApiParam(value = "codeId") final Long codeId, @Context final UriInfo uriInfo) {
+    @Operation(summary = "Retrieve a Code", description = "Returns the details of a Code.\n" + "\n" + "Example Requests:\n" + "\n"
+            + "codes/1")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodesApiResourceSwagger.GetCodesResponse.class))) })
+    public String retrieveCode(@PathParam("codeId") @Parameter(description = "codeId") final Long codeId, @Context final UriInfo uriInfo) {
 
         final CodeData code = this.readPlatformService.retrieveCode(codeId);
 
@@ -139,12 +139,12 @@ public class CodesApiResource {
     @Path("{codeId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Code", notes = "Updates the details of a code if it is not system defined.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CodesApiResourceSwagger.PutCodesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodesApiResourceSwagger.PutCodesResponse.class) })
-    public String updateCode(@PathParam("codeId") @ApiParam(value = "codeId") final Long codeId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update a Code", description = "Updates the details of a code if it is not system defined.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CodesApiResourceSwagger.PutCodesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodesApiResourceSwagger.PutCodesResponse.class))) })
+    public String updateCode(@PathParam("codeId") @Parameter(description = "codeId") final Long codeId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateCode(codeId).withJson(apiRequestBodyAsJson).build();
 
@@ -157,9 +157,10 @@ public class CodesApiResource {
     @Path("{codeId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete a Code", notes = "Deletes a code if it is not system defined.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CodesApiResourceSwagger.DeleteCodesResponse.class) })
-    public String deleteCode(@PathParam("codeId") @ApiParam(value = "codeId") final Long codeId) {
+    @Operation(summary = "Delete a Code", description = "Deletes a code if it is not system defined.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CodesApiResourceSwagger.DeleteCodesResponse.class))) })
+    public String deleteCode(@PathParam("codeId") @Parameter(description = "codeId") final Long codeId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteCode(codeId).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java
index 9241966..92dbfe0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.codes.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 29/7/17.
@@ -30,55 +29,55 @@ final class CodesApiResourceSwagger {
         // this class is only for Swagger Live Documentation
     }
 
-    @ApiModel(value = "GetCodesResponse")
+    @Schema(description = "GetCodesResponse")
     public static final class GetCodesResponse {
 
         private GetCodesResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "Education")
+        @Schema(example = "Education")
         public String name;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean systemDefined;
     }
 
-    @ApiModel(value = "PostCodesRequest")
+    @Schema(description = "PostCodesRequest")
     public static final class PostCodesRequest {
 
         private PostCodesRequest() {
 
         }
 
-        @ApiModelProperty(example = "MyNewCode")
+        @Schema(example = "MyNewCode")
         public String name;
     }
 
-    @ApiModel(value = "PostCodesResponse")
+    @Schema(description = "PostCodesResponse")
     public static final class PostCodesResponse {
 
         private PostCodesResponse() {
 
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutCodesRequest")
+    @Schema(description = "PutCodesRequest")
     public static final class PutCodesRequest {
 
         private PutCodesRequest() {
 
         }
 
-        @ApiModelProperty(example = "MyNewCode(changed)")
+        @Schema(example = "MyNewCode(changed)")
         public String name;
     }
 
-    @ApiModel(value = "PutCodesResponse")
+    @Schema(description = "PutCodesResponse")
     public static final class PutCodesResponse {
 
         private PutCodesResponse() {
@@ -89,23 +88,23 @@ final class CodesApiResourceSwagger {
 
             private PutCodesApichangesSwagger() {}
 
-            @ApiModelProperty(example = "MyNewCode(changed)")
+            @Schema(example = "MyNewCode(changed)")
             public String name;
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
         public PutCodesApichangesSwagger changes;
     }
 
-    @ApiModel(value = "DeleteCodesResponse")
+    @Schema(description = "DeleteCodesResponse")
     public static final class DeleteCodesResponse {
 
         private DeleteCodesResponse() {
 
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResource.java
index bddbbc2..a27a6aa 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResource.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.infrastructure.configuration.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collection;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -54,11 +53,9 @@ import org.springframework.stereotype.Component;
 @Path("/externalservice")
 @Component
 @Scope("singleton")
-@Api(tags = { "External Services" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "External Services", description = "External Services Configuration related to set of supported configurations for third party services like Amazon S3 and SMTP:\n"
-                + "\n" + "S3 (Amazon S3):\n" + "s3_access_key -\n" + "s3_bucket_name -\n" + "s3_secret_key -\n" + "\n" + "\n"
-                + "SMTP (Email Service):\n" + "username -\n" + "password -\n" + "host -\n" + "port -\n" + "useTLS -") })
+@Tag(name = "External Services", description = "External Services Configuration related to set of supported configurations for third party services like Amazon S3 and SMTP:\n"
+        + "\n" + "S3 (Amazon S3):\n" + "s3_access_key -\n" + "s3_bucket_name -\n" + "s3_secret_key -\n" + "\n" + "\n"
+        + "SMTP (Email Service):\n" + "username -\n" + "password -\n" + "host -\n" + "port -\n" + "useTLS -")
 public class ExternalServicesConfigurationApiResource {
 
     private final PlatformSecurityContext context;
@@ -87,10 +84,11 @@ public class ExternalServicesConfigurationApiResource {
     @Path("{servicename}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve External Services Configuration", notes = "Returns a external Service configurations based on the Service Name.\n"
+    @Operation(summary = "Retrieve External Services Configuration", description = "Returns a external Service configurations based on the Service Name.\n"
             + "\n" + "Service Names supported are S3 and SMTP.\n" + "\n" + "Example Requests:\n" + "\n" + "externalservice/SMTP")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ExternalServicesPropertiesData.class) })
-    public String retrieveOne(@PathParam("servicename") @ApiParam(value = "servicename") final String serviceName,
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ExternalServicesPropertiesData.class))) })
+    public String retrieveOne(@PathParam("servicename") @Parameter(description = "servicename") final String serviceName,
             @Context final UriInfo uriInfo) {
         this.context.authenticatedUser().validateHasReadPermission(ExternalServiceConfigurationApiConstant.EXTERNAL_SERVICE_RESOURCE_NAME);
         final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
@@ -104,13 +102,13 @@ public class ExternalServicesConfigurationApiResource {
     @Path("{servicename}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update External Service", notes = "Updates the external Service Configuration for a Service Name.\n" + "\n"
+    @Operation(summary = "Update External Service", description = "Updates the external Service Configuration for a Service Name.\n" + "\n"
             + "Example: \n" + "\n" + "externalservice/S3")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ExternalServicesConfigurationApiResourceSwagger.PutExternalServiceRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "") })
-    public String updateExternalServiceProperties(@PathParam("servicename") @ApiParam(value = "servicename") final String serviceName,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ExternalServicesConfigurationApiResourceSwagger.PutExternalServiceRequest.class)))
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "") })
+    public String updateExternalServiceProperties(
+            @PathParam("servicename") @Parameter(description = "servicename") final String serviceName,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
         // ExternalServicesData external =
         // this.externalServiceReadPlatformService.getExternalServiceDetailsByServiceName(serviceName);
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateExternalServiceProperties(serviceName)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResourceSwagger.java
index e435191..60b4fc7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServicesConfigurationApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.configuration.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 30/7/17.
@@ -30,16 +29,16 @@ final class ExternalServicesConfigurationApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PutExternalServiceRequest")
+    @Schema(description = "PutExternalServiceRequest")
     public static final class PutExternalServiceRequest {
 
         private PutExternalServiceRequest() {
 
         }
 
-        @ApiModelProperty(example = "test@mifos.org")
+        @Schema(example = "test@mifos.org")
         public String username;
-        @ApiModelProperty(example = "XXXX")
+        @Schema(example = "XXXX")
         public String password;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java
index 6d65348..5001776 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.configuration.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -59,17 +59,15 @@ import org.springframework.stereotype.Component;
 @Path("/configurations")
 @Component
 @Scope("singleton")
-@Api(tags = { "Global Configuration" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Global Configuration", description = "Global configuration related to set of supported enable/disable configurations:\n"
-                + "\n" + "maker-checker - defaults to false - if true turns on maker-checker functionality\n"
-                + "reschedule-future-repayments - defaults to false - if true reschedules repayemnts which falls on a non-working day to configured repayment rescheduling rule\n"
-                + "allow-transactions-on-non_workingday - defaults to false - if true allows transactions on non-working days\n"
-                + "reschedule-repayments-on-holidays - defaults to false - if true reschedules repayemnts which falls on a non-working day to defined reschedule date\n"
-                + "allow-transactions-on-holiday - defaults to false - if true allows transactions on holidays\n"
-                + "savings-interest-posting-current-period-end - Set it at the database level before any savings interest is posted. When set as false(default), interest will be posted on the first date of next period. If set as true, interest will be posted on last date of current period. There is no difference in the interest amount posted.\n"
-                + "financial-year-beginning-month - Set it at the database level before any savings interest is posted. Allowed values 1 - 12 (January - December). Interest posting periods are evaluated based on this configuration.\n"
-                + "meetings-mandatory-for-jlg-loans - if set to true, enforces all JLG loans to follow a meeting schedule belonging to either the parent group or Center.") })
+@Tag(name = "Global Configuration", description = "Global configuration related to set of supported enable/disable configurations:\n" + "\n"
+        + "maker-checker - defaults to false - if true turns on maker-checker functionality\n"
+        + "reschedule-future-repayments - defaults to false - if true reschedules repayemnts which falls on a non-working day to configured repayment rescheduling rule\n"
+        + "allow-transactions-on-non_workingday - defaults to false - if true allows transactions on non-working days\n"
+        + "reschedule-repayments-on-holidays - defaults to false - if true reschedules repayemnts which falls on a non-working day to defined reschedule date\n"
+        + "allow-transactions-on-holiday - defaults to false - if true allows transactions on holidays\n"
+        + "savings-interest-posting-current-period-end - Set it at the database level before any savings interest is posted. When set as false(default), interest will be posted on the first date of next period. If set as true, interest will be posted on last date of current period. There is no difference in the interest amount posted.\n"
+        + "financial-year-beginning-month - Set it at the database level before any savings interest is posted. Allowed values 1 - 12 (January - December). Interest posting periods are evaluated based on this configuration.\n"
+        + "meetings-mandatory-for-jlg-loans - if set to true, enforces all JLG loans to follow a meeting schedule belonging to either the parent group or Center.")
 public class GlobalConfigurationApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("globalConfiguration"));
@@ -100,14 +98,14 @@ public class GlobalConfigurationApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Global Configuration | Retrieve Global Configuration for surveys", notes = "Returns the list global enable/disable configurations.\n"
+    @Operation(summary = "Retrieve Global Configuration | Retrieve Global Configuration for surveys", description = "Returns the list global enable/disable configurations.\n"
             + "\n" + "Example Requests:\n" + "\n" + "configurations\n\n" + "\n"
             + "Returns the list global enable/disable survey configurations.\n" + "\n" + "Example Requests:\n" + "\n"
             + "configurations/survey")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "List of example \n response \nsurveys response   \ngiven below", response = GlobalConfigurationApiResourceSwagger.GetGlobalConfigurationsResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "List of example \\n response \\nsurveys response   \\ngiven below", content = @Content(array = @ArraySchema(schema = @Schema(implementation = GlobalConfigurationApiResourceSwagger.GetGlobalConfigurationsResponse.class)))) })
     public String retrieveConfiguration(@Context final UriInfo uriInfo,
-            @DefaultValue("false") @QueryParam("survey") @ApiParam(value = "survey") final boolean survey) {
+            @DefaultValue("false") @QueryParam("survey") @Parameter(description = "survey") final boolean survey) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -121,11 +119,12 @@ public class GlobalConfigurationApiResource {
     @Path("{configId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Global Configuration", notes = "Returns a global enable/disable configurations.\n" + "\n"
+    @Operation(summary = "Retrieve Global Configuration", description = "Returns a global enable/disable configurations.\n" + "\n"
             + "Example Requests:\n" + "\n" + "configurations/1")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = GlobalConfigurationApiResourceSwagger.GetGlobalConfigurationsResponse.class) })
-    public String retrieveOne(@PathParam("configId") @ApiParam(value = "configId") final Long configId, @Context final UriInfo uriInfo) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GlobalConfigurationApiResourceSwagger.GetGlobalConfigurationsResponse.class))) })
+    public String retrieveOne(@PathParam("configId") @Parameter(description = "configId") final Long configId,
+            @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -139,13 +138,12 @@ public class GlobalConfigurationApiResource {
     @Path("{configId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update Global Configuration", notes = "Updates an enable/disable global configuration item.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = GlobalConfigurationApiResourceSwagger.PutGlobalConfigurationsRequest.class) })
+    @Operation(summary = "Update Global Configuration", description = "Updates an enable/disable global configuration item.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = GlobalConfigurationApiResourceSwagger.PutGlobalConfigurationsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = GlobalConfigurationApiResourceSwagger.PutGlobalConfigurationsResponse.class) })
-    public String updateConfiguration(@PathParam("configId") @ApiParam(value = "configId") final Long configId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = GlobalConfigurationApiResourceSwagger.PutGlobalConfigurationsResponse.class))) })
+    public String updateConfiguration(@PathParam("configId") @Parameter(description = "configId") final Long configId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateGlobalConfiguration(configId) //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java
index bb50dd8..cd1cdd2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.configuration.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.fineract.infrastructure.configuration.data.GlobalConfigurationPropertyData;
 
@@ -32,7 +31,7 @@ final class GlobalConfigurationApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetGlobalConfigurationsResponse")
+    @Schema(description = "GetGlobalConfigurationsResponse")
     public static final class GetGlobalConfigurationsResponse {
 
         private GetGlobalConfigurationsResponse() {}
@@ -40,18 +39,18 @@ final class GlobalConfigurationApiResourceSwagger {
         public List<GlobalConfigurationPropertyData> globalConfiguration;
     }
 
-    @ApiModel(value = "PutGlobalConfigurationsRequest")
+    @Schema(description = "PutGlobalConfigurationsRequest")
     public static final class PutGlobalConfigurationsRequest {
 
         private PutGlobalConfigurationsRequest() {}
 
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean enabled;
-        @ApiModelProperty(example = "2")
-        public Long value;
+        @Schema(example = "2")
+        public Long description;
     }
 
-    @ApiModel(value = "PutGlobalConfigurationsResponse")
+    @Schema(description = "PutGlobalConfigurationsResponse")
     public static final class PutGlobalConfigurationsResponse {
 
         private PutGlobalConfigurationsResponse() {}
@@ -60,11 +59,11 @@ final class GlobalConfigurationApiResourceSwagger {
 
             private PutGlobalConfigurationsResponsechangesSwagger() {}
 
-            @ApiModelProperty(example = "true")
+            @Schema(example = "true")
             public boolean enabled;
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
         public PutGlobalConfigurationsResponsechangesSwagger changes;
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/api/CreditBureauConfigurationAPI.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/api/CreditBureauConfigurationAPI.java
index a799396..f5c1e24 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/api/CreditBureauConfigurationAPI.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/api/CreditBureauConfigurationAPI.java
@@ -19,7 +19,6 @@
 
 package org.apache.fineract.infrastructure.creditbureau.api;
 
-import io.swagger.annotations.Api;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -57,7 +56,6 @@ import org.springframework.stereotype.Component;
 @Path("/CreditBureauConfiguration")
 @Component
 @Scope("singleton")
-@Api(value = "CreditBureau Configuration")
 public class CreditBureauConfigurationAPI {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java
index c4829a0..c5759d9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -57,16 +57,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-//import org.slf4j.Logger;
-
 @Path("/datatables")
 @Component
 @Scope("singleton")
-@Api(tags = { "Data Tables" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Data Tables", description = "The datatables API allows you to plug-in your own tables (MySql) that have a relationship to a Apache Fineract core table. For example, you might want to add some extra client fields and record information about each of the clients' family members. Via the API you can create, read, update and delete entries for each 'plugged-in' table. The API checks for permission and for 'data scoping' (only data within the users' office hierarchy can b [...]
-                + "\n"
-                + "The Apache Fineract Reference App uses a JQuery plug-in called stretchydatatables (which in turn uses this datatables resource) to provide a pretty flexible CRUD (Create, Read, Update, Delete) User Interface.") })
+@Tag(name = "Data Tables", description = "The datatables API allows you to plug-in your own tables (MySql) that have a relationship to a Apache Fineract core table. For example, you might want to add some extra client fields and record information about each of the clients' family members. Via the API you can create, read, update and delete entries for each 'plugged-in' table. The API checks for permission and for 'data scoping' (only data within the users' office hierarchy can be manage [...]
+        + "\n"
+        + "The Apache Fineract Reference App uses a JQuery plug-in called stretchydatatables (which in turn uses this datatables resource) to provide a pretty flexible CRUD (Create, Read, Update, Delete) User Interface.")
 public class DatatablesApiResource {
 
     private final PlatformSecurityContext context;
@@ -91,13 +87,12 @@ public class DatatablesApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Data Tables", notes = "Lists registered data tables and the Apache Fineract Core application table they are registered to.\n"
+    @Operation(summary = "List Data Tables", description = "Lists registered data tables and the Apache Fineract Core application table they are registered to.\n"
             + "\n" + "ARGUMENTS\n" + "\n" + "apptable  - optional" + "\n" + "The Apache Fineract core application table.\n" + "\n"
-            + "Example Requests:\n" + "\n" + "datatables?apptable=m_client\n" + "\n" + "\n"
-            + "datatables", responseContainer = "List", response = DatatablesApiResourceSwagger.GetDataTablesResponse.class)
+            + "Example Requests:\n" + "\n" + "datatables?apptable=m_client\n" + "\n" + "\n" + "datatables")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.GetDataTablesResponse.class, responseContainer = "list") })
-    public String getDatatables(@QueryParam("apptable") @ApiParam(value = "apptable") final String apptable,
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = DatatablesApiResourceSwagger.GetDataTablesResponse.class)))) })
+    public String getDatatables(@QueryParam("apptable") @Parameter(description = "apptable") final String apptable,
             @Context final UriInfo uriInfo) {
 
         final List<DatatableData> result = this.readWriteNonCoreDataService.retrieveDatatableNames(apptable);
@@ -109,7 +104,7 @@ public class DatatablesApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create Data Table", notes = "Create a new data table and registers it with the Apache Fineract Core application table.\n"
+    @Operation(summary = "Create Data Table", description = "Create a new data table and registers it with the Apache Fineract Core application table.\n"
             + "\n" + "Field Descriptions\n" + "\n" + "Mandatory - datatableName : \n" + "\nThe name of the Data Table.\n" + "\n"
             + "Mandatory - apptableName\n" + "\n" + "Application table name. Must be one of the following:\n" + "\n" + "m_client\n" + "\n"
             + "m_group" + "\n" + "\n" + "m_loan" + "\n" + "\n" + "m_office" + "\n" + "\n" + "m_saving_account" + "\n" + "\n"
@@ -121,15 +116,15 @@ public class DatatablesApiResource {
             + "\n" + "\n" + "Mandatory - type" + "\n" + "\n" + "Column type. Must be one of the following:" + "\n" + "\n" + "Boolean" + "\n"
             + "\n" + "Date" + "\n" + "\n" + "DateTime" + "\n" + "\n" + "Decimal" + "\n" + "\n" + "Dropdown" + "\n" + "\n" + "\n" + "Number"
             + "\n" + "\n" + "String" + "\n" + "\n" + "Text" + "\n" + "\n" + "Mandatory [type = Dropdown] - code" + "\n" + "\n"
-            + "Used in Code Value fields. Column name becomes: code_cd_name. Mandatory if using type Dropdown, otherwise an error is returned."
+            + "Used in Code description fields. Column name becomes: code_cd_name. Mandatory if using type Dropdown, otherwise an error is returned."
             + "\n" + "\n" + "Optional - mandatory" + "\n" + "\n"
             + "Determines whether this column must have a value in every entry. Optional, defaults to false." + "\n" + "\n"
             + "Mandatory [type = String] - length" + "\n" + "\n"
             + "Length of the text field. Mandatory if type String is used, otherwise an error is returned.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = DatatablesApiResourceSwagger.PostDataTablesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.PostDataTablesResponse.class) })
-    public String createDatatable(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PostDataTablesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PostDataTablesResponse.class))) })
+    public String createDatatable(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createDBDatatable(apiRequestBodyAsJson).build();
 
@@ -141,12 +136,12 @@ public class DatatablesApiResource {
     @Path("{datatableName}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update Data Table", notes = "Modifies fields of a data table. If the apptableName parameter is passed, data table is deregistered and registered with the new application table.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = DatatablesApiResourceSwagger.PutDataTablesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.PutDataTablesResponse.class) })
-    public String updateDatatable(@PathParam("datatableName") @ApiParam(value = "datatableName") final String datatableName,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update Data Table", description = "Modifies fields of a data table. If the apptableName parameter is passed, data table is deregistered and registered with the new application table.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesResponse.class))) })
+    public String updateDatatable(@PathParam("datatableName") @Parameter(description = "datatableName") final String datatableName,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateDBDatatable(datatableName, apiRequestBodyAsJson).build();
 
@@ -158,10 +153,11 @@ public class DatatablesApiResource {
     @Path("{datatableName}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete Data Table", notes = "Deletes a data table and deregisters it from the Apache Fineract Core application table.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.DeleteDataTablesResponse.class) })
-    public String deleteDatatable(@PathParam("datatableName") @ApiParam(value = "datatableName") final String datatableName,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Delete Data Table", description = "Deletes a data table and deregisters it from the Apache Fineract Core application table.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.DeleteDataTablesResponse.class))) })
+    public String deleteDatatable(@PathParam("datatableName") @Parameter(description = "datatableName") final String datatableName,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteDBDatatable(datatableName, apiRequestBodyAsJson).build();
 
@@ -173,13 +169,13 @@ public class DatatablesApiResource {
     @Path("register/{datatable}/{apptable}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Register Data Table", notes = "Registers a data table with the Apache Fineract Core application table. This allows the data table to be maintained through the API. In case the datatable is a PPI (survey table), a parameter category should be pass along with the request. The API currently support one category (200)")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", paramType = "body", dataType = "body", format = "body", dataTypeClass = DatatablesApiResourceSwagger.PostDataTablesRegisterDatatableAppTable.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.PutDataTablesResponse.class) })
-    public String registerDatatable(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable,
-            @PathParam("apptable") @ApiParam(value = "apptable") final String apptable,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Register Data Table", description = "Registers a data table with the Apache Fineract Core application table. This allows the data table to be maintained through the API. In case the datatable is a PPI (survey table), a parameter category should be pass along with the request. The API currently support one category (200)")
+    @RequestBody(content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PostDataTablesRegisterDatatableAppTable.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesResponse.class))) })
+    public String registerDatatable(@PathParam("datatable") @Parameter(description = "datatable") final String datatable,
+            @PathParam("apptable") @Parameter(description = "apptable") final String apptable,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().registerDBDatatable(datatable, apptable)
                 .withJson(apiRequestBodyAsJson).build();
@@ -193,9 +189,10 @@ public class DatatablesApiResource {
     @Path("deregister/{datatable}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Deregister Data Table", notes = "Deregisters a data table. It will no longer be available through the API.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.PutDataTablesResponse.class) })
-    public String deregisterDatatable(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable) {
+    @Operation(summary = "Deregister Data Table", description = "Deregisters a data table. It will no longer be available through the API.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesResponse.class))) })
+    public String deregisterDatatable(@PathParam("datatable") @Parameter(description = "datatable") final String datatable) {
 
         this.readWriteNonCoreDataService.deregisterDatatable(datatable);
 
@@ -208,9 +205,10 @@ public class DatatablesApiResource {
     @Path("{datatable}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Data Table Details", notes = "Lists a registered data table details and the Apache Fineract Core application table they are registered to.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.GetDataTablesResponse.class) })
-    public String getDatatable(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable,
+    @Operation(summary = "Retrieve Data Table Details", description = "Lists a registered data table details and the Apache Fineract Core application table they are registered to.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.GetDataTablesResponse.class))) })
+    public String getDatatable(@PathParam("datatable") @Parameter(description = "datatable") final String datatable,
             @Context final UriInfo uriInfo) {
 
         final DatatableData result = this.readWriteNonCoreDataService.retrieveDatatable(datatable);
@@ -223,17 +221,18 @@ public class DatatablesApiResource {
     @Path("{datatable}/{apptableId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Entry(s) from Data Table", notes = "Gets the entry (if it exists) for data tables that are one to one with the application table. \n"
+    @Operation(summary = "Retrieve Entry(s) from Data Table", description = "Gets the entry (if it exists) for data tables that are one to one with the application table. \n"
             + "Gets the entries (if they exist) for data tables that are one to many with the application table.\n" + "\n"
             + "Note: The 'fields' parameter is not available for datatables.\n" + "\n" + "ARGUMENTS\n"
             + "orderoptional Specifies the order in which data is returned.genericResultSetoptional, defaults to false If 'true' an optimised JSON format is returned suitable for tabular display of data. This format is used by the default data tables UI functionality.\n"
             + "Example Requests:\n" + "\n" + "datatables/extra_client_details/1\n" + "\n" + "\n"
             + "datatables/extra_family_details/1?order=`Date of Birth` desc\n" + "\n" + "\n"
             + "datatables/extra_client_details/1?genericResultSet=true")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.GetDataTablesAppTableIdResponse.class) })
-    public String getDatatable(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable,
-            @PathParam("apptableId") @ApiParam(value = "apptableId") final Long apptableId,
-            @QueryParam("order") @ApiParam(value = "order") final String order, @Context final UriInfo uriInfo) {
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.GetDataTablesAppTableIdResponse.class))) })
+    public String getDatatable(@PathParam("datatable") @Parameter(description = "datatable") final String datatable,
+            @PathParam("apptableId") @Parameter(description = "apptableId") final Long apptableId,
+            @QueryParam("order") @Parameter(description = "order") final String order, @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasDatatableReadPermission(datatable);
 
@@ -282,15 +281,14 @@ public class DatatablesApiResource {
     @Path("{datatable}/{apptableId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create Entry in Data Table", notes = "Adds a row to the data table.\n" + "\n"
+    @Operation(summary = "Create Entry in Data Table", description = "Adds a row to the data table.\n" + "\n"
             + "Note that the default datatable UI functionality converts any field name containing spaces to underscores when using the API. This means the field name \"Business Description\" is considered the same as \"Business_Description\". So you shouldn't have both \"versions\" in any data table.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = DatatablesApiResourceSwagger.PostDataTablesAppTableIdRequest.class) })
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PostDataTablesAppTableIdRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.PostDataTablesAppTableIdResponse.class) })
-    public String createDatatableEntry(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable,
-            @PathParam("apptableId") @ApiParam(value = "apptableId") final Long apptableId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PostDataTablesAppTableIdResponse.class))) })
+    public String createDatatableEntry(@PathParam("datatable") @Parameter(description = "datatable") final String datatable,
+            @PathParam("apptableId") @Parameter(description = "apptableId") final Long apptableId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .createDatatable(datatable, apptableId, null) //
@@ -306,13 +304,13 @@ public class DatatablesApiResource {
     @Path("{datatable}/{apptableId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update Entry in Data Table (One to One)", notes = "Updates the row (if it exists) of the data table.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = DatatablesApiResourceSwagger.PutDataTablesAppTableIdRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.PutDataTablesAppTableIdResponse.class) })
-    public String updateDatatableEntryOnetoOne(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable,
-            @PathParam("apptableId") @ApiParam(value = "apptableId") final Long apptableId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update Entry in Data Table (One to One)", description = "Updates the row (if it exists) of the data table.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesAppTableIdRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesAppTableIdResponse.class))) })
+    public String updateDatatableEntryOnetoOne(@PathParam("datatable") @Parameter(description = "datatable") final String datatable,
+            @PathParam("apptableId") @Parameter(description = "apptableId") final Long apptableId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateDatatable(datatable, apptableId, null) //
@@ -328,15 +326,14 @@ public class DatatablesApiResource {
     @Path("{datatable}/{apptableId}/{datatableId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update Entry in Data Table (One to Many)", notes = "Updates the row (if it exists) of the data table.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = DatatablesApiResourceSwagger.PutDataTablesAppTableIdDatatableIdRequest.class) })
+    @Operation(summary = "Update Entry in Data Table (One to Many)", description = "Updates the row (if it exists) of the data table.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesAppTableIdDatatableIdRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.PutDataTablesAppTableIdDatatableIdResponse.class) })
-    public String updateDatatableEntryOneToMany(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable,
-            @PathParam("apptableId") @ApiParam(value = "apptableId") final Long apptableId,
-            @PathParam("datatableId") @ApiParam(value = "datatableId") final Long datatableId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.PutDataTablesAppTableIdDatatableIdResponse.class))) })
+    public String updateDatatableEntryOneToMany(@PathParam("datatable") @Parameter(description = "datatable") final String datatable,
+            @PathParam("apptableId") @Parameter(description = "apptableId") final Long apptableId,
+            @PathParam("datatableId") @Parameter(description = "datatableId") final Long datatableId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateDatatable(datatable, apptableId, datatableId) //
@@ -352,12 +349,12 @@ public class DatatablesApiResource {
     @Path("{datatable}/{apptableId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete Entry(s) in Data Table", notes = "Deletes the entry (if it exists) for data tables that are one-to-one with the application table. \n"
+    @Operation(summary = "Delete Entry(s) in Data Table", description = "Deletes the entry (if it exists) for data tables that are one-to-one with the application table. \n"
             + "Deletes the entries (if they exist) for data tables that are one-to-many with the application table.")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.DeleteDataTablesDatatableAppTableIdResponse.class) })
-    public String deleteDatatableEntries(@PathParam("datatable") @ApiParam(value = "datatable") final String datatable,
-            @PathParam("apptableId") @ApiParam(value = "apptableId") final Long apptableId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.DeleteDataTablesDatatableAppTableIdResponse.class))) })
+    public String deleteDatatableEntries(@PathParam("datatable") @Parameter(description = "datatable") final String datatable,
+            @PathParam("apptableId") @Parameter(description = "apptableId") final Long apptableId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .deleteDatatable(datatable, apptableId, null) //
@@ -372,14 +369,14 @@ public class DatatablesApiResource {
     @Path("{datatable}/{apptableId}/{datatableId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete Entry in Datatable (One to Many)", notes = "Deletes the entry (if it exists) for data tables that are one to many with the application table.\n"
+    @Operation(summary = "Delete Entry in Datatable (One to Many)", description = "Deletes the entry (if it exists) for data tables that are one to many with the application table.\n"
             + "\n")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DatatablesApiResourceSwagger.DeleteDataTablesDatatableAppTableIdDatatableIdResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DatatablesApiResourceSwagger.DeleteDataTablesDatatableAppTableIdDatatableIdResponse.class))) })
     public String deleteDatatableEntries(
-            @PathParam("datatable") @ApiParam(value = "datatable", type = "body", example = "{}") final String datatable,
-            @PathParam("apptableId") @ApiParam(value = "apptableId") final Long apptableId,
-            @PathParam("datatableId") @ApiParam(value = "datatableId") final Long datatableId) {
+            @PathParam("datatable") @Parameter(description = "datatable", example = "{}") final String datatable,
+            @PathParam("apptableId") @Parameter(description = "apptableId") final Long apptableId,
+            @PathParam("datatableId") @Parameter(description = "datatableId") final Long datatableId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .deleteDatatable(datatable, apptableId, datatableId) //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java
index 6bbceaf..4e4facf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.fineract.infrastructure.dataqueries.data.ResultsetColumnHeaderData;
 import org.apache.fineract.infrastructure.dataqueries.data.ResultsetRowData;
@@ -33,48 +32,48 @@ final class DatatablesApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetDataTablesResponse")
+    @Schema(description = "GetDataTablesResponse")
     public static final class GetDataTablesResponse {
 
         private GetDataTablesResponse() {
 
         }
 
-        @ApiModelProperty(example = "m_client")
+        @Schema(example = "m_client")
         public String appTableName;
-        @ApiModelProperty(example = "extra_client_details")
+        @Schema(example = "extra_client_details")
         public String datatableName;
         public List<ResultsetColumnHeaderData> column;
     }
 
-    @ApiModel(value = "PostDataTablesRequest")
+    @Schema(description = "PostDataTablesRequest")
     public static final class PostDataTablesRequest {
 
         private PostDataTablesRequest() {
 
         }
 
-        @ApiModelProperty(example = "m_client")
+        @Schema(example = "m_client")
         public String applicationTableName;
-        @ApiModelProperty(example = "extra_client_details")
+        @Schema(example = "extra_client_details")
         public String registeredTableName;
-        @ApiModelProperty(example = "true")
+        @Schema(required = false, description = "Allows to create multiple entries in the Data Table. Optional, defaults to false. If this property is not provided Data Table will allow only one entry.", example = "true")
         public boolean multiRow;
         public List<ResultsetColumnHeaderData> columnHeaderData;
     }
 
-    @ApiModel(value = "PostDataTablesResponse")
+    @Schema(description = "PostDataTablesResponse")
     public static final class PostDataTablesResponse {
 
         private PostDataTablesResponse() {
 
         }
 
-        @ApiModelProperty(example = "extra_client_details")
+        @Schema(example = "extra_client_details")
         public String resourceIdentifier;
     }
 
-    @ApiModel(value = "PutDataTablesRequest")
+    @Schema(description = "PutDataTablesRequest")
     public static final class PutDataTablesRequest {
 
         private PutDataTablesRequest() {
@@ -85,7 +84,7 @@ final class DatatablesApiResourceSwagger {
 
             private PutDataTablesRequestDropColumns() {}
 
-            @ApiModelProperty(example = "Gender_cd_Question")
+            @Schema(example = "Gender_cd_Question")
             public String name;
         }
 
@@ -93,13 +92,13 @@ final class DatatablesApiResourceSwagger {
 
             private PutDataTablesRequestAddColumns() {}
 
-            @ApiModelProperty(example = "Question")
+            @Schema(example = "Question")
             public String name;
-            @ApiModelProperty(example = "Dropdown")
+            @Schema(example = "Dropdown")
             public String type;
-            @ApiModelProperty(example = "Gender")
+            @Schema(example = "Gender")
             public String code;
-            @ApiModelProperty(example = "true")
+            @Schema(example = "true")
             public boolean mandatory;
         }
 
@@ -107,92 +106,92 @@ final class DatatablesApiResourceSwagger {
 
             private PutDataTablesRequestChangeColumns() {}
 
-            @ApiModelProperty(example = "Question")
+            @Schema(example = "Question")
             public String name;
-            @ApiModelProperty(example = "Question 2")
+            @Schema(example = "Question 2")
             public String newName;
-            @ApiModelProperty(example = "Gender")
+            @Schema(example = "Gender")
             public String code;
-            @ApiModelProperty(example = "Gender2")
+            @Schema(example = "Gender2")
             public String newCode;
-            @ApiModelProperty(example = "true")
+            @Schema(example = "true")
             public boolean mandatory;
         }
 
-        @ApiModelProperty(example = "m_client")
+        @Schema(example = "m_client")
         public String appTableName;
         public List<PutDataTablesRequestDropColumns> dropColumns;
         public List<PutDataTablesRequestAddColumns> addColumns;
         public List<PutDataTablesRequestChangeColumns> ChangeColumns;
     }
 
-    @ApiModel(value = "PutDataTablesResponse")
+    @Schema(description = "PutDataTablesResponse")
     public static final class PutDataTablesResponse {
 
         private PutDataTablesResponse() {
 
         }
 
-        @ApiModelProperty(example = "extra_client_details")
+        @Schema(example = "extra_client_details")
         public String resourceIdentifier;
     }
 
-    @ApiModel(value = "DeleteDataTablesResponse")
+    @Schema(description = "DeleteDataTablesResponse")
     public static final class DeleteDataTablesResponse {
 
         private DeleteDataTablesResponse() {
 
         }
 
-        @ApiModelProperty(example = "extra_client_details")
+        @Schema(example = "extra_client_details")
         public String resourceIdentifier;
     }
 
-    @ApiModel(value = "PostDataTablesRegisterDatatableAppTable")
+    @Schema(description = "PostDataTablesRegisterDatatableAppTable")
     public static final class PostDataTablesRegisterDatatableAppTable {
 
         private PostDataTablesRegisterDatatableAppTable() {}
     }
 
-    @ApiModel(value = "PostDataTablesAppTableIdRequest")
+    @Schema(description = "PostDataTablesAppTableIdRequest")
     public static final class PostDataTablesAppTableIdRequest {
 
         private PostDataTablesAppTableIdRequest() {
 
         }
 
-        @ApiModelProperty(example = "Livestock sales")
+        @Schema(example = "Livestock sales")
         public String BusinessDescription;
-        @ApiModelProperty(example = "First comment made")
+        @Schema(example = "First comment made")
         public String Comment;
-        @ApiModelProperty(example = "Primary")
+        @Schema(example = "Primary")
         public String Education_cv;
-        @ApiModelProperty(example = "6")
+        @Schema(example = "6")
         public Long Gender_cd;
-        @ApiModelProperty(example = "8.5")
+        @Schema(example = "8.5")
         public Double HighestRatePaid;
-        @ApiModelProperty(example = "01 October 2012")
+        @Schema(example = "01 October 2012")
         public String NextVisit;
-        @ApiModelProperty(example = "5")
+        @Schema(example = "5")
         public Long YearsinBusiness;
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
     }
 
-    @ApiModel(value = "PostDataTablesAppTableIdResponse ")
+    @Schema(description = "PostDataTablesAppTableIdResponse ")
     public static final class PostDataTablesAppTableIdResponse {
 
         private PostDataTablesAppTableIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "GetDataTablesAppTableIdResponse")
+    @Schema(description = "GetDataTablesAppTableIdResponse")
     public static final class GetDataTablesAppTableIdResponse {
 
         private GetDataTablesAppTableIdResponse() {
@@ -203,18 +202,18 @@ final class DatatablesApiResourceSwagger {
         public List<ResultsetRowData> data;
     }
 
-    @ApiModel(value = "PutDataTablesAppTableIdRequest")
+    @Schema(description = "PutDataTablesAppTableIdRequest")
     public static final class PutDataTablesAppTableIdRequest {
 
         private PutDataTablesAppTableIdRequest() {
 
         }
 
-        @ApiModelProperty(example = "Livestock sales updated")
+        @Schema(example = "Livestock sales updated")
         public String BusinessDescription;
     }
 
-    @ApiModel(value = "PutDataTablesAppTableIdResponse")
+    @Schema(description = "PutDataTablesAppTableIdResponse")
     public static final class PutDataTablesAppTableIdResponse {
 
         private PutDataTablesAppTableIdResponse() {
@@ -225,68 +224,68 @@ final class DatatablesApiResourceSwagger {
 
             private PutDataTablesAppTableIdResponseChanges() {}
 
-            @ApiModelProperty(example = "Livestock sales updated")
+            @Schema(example = "Livestock sales updated")
             public String BusinessDescription;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
         public PutDataTablesAppTableIdResponseChanges changes;
     }
 
-    @ApiModel(value = "PutDataTablesAppTableIdDatatableIdRequest")
+    @Schema(description = "PutDataTablesAppTableIdDatatableIdRequest")
     public static final class PutDataTablesAppTableIdDatatableIdRequest {
 
         private PutDataTablesAppTableIdDatatableIdRequest() {
 
         }
 
-        @ApiModelProperty(example = "01 June 1982")
+        @Schema(example = "01 June 1982")
         public String DateOfBirth;
-        @ApiModelProperty(example = "5")
+        @Schema(example = "5")
         public Long Education_cdHighest;
-        @ApiModelProperty(example = "June")
+        @Schema(example = "June")
         public String Name;
-        @ApiModelProperty(example = "More notes")
+        @Schema(example = "More notes")
         public String OtherNotes;
-        @ApiModelProperty(example = "20")
+        @Schema(example = "20")
         public Long PointsScore;
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
     }
 
-    @ApiModel(value = "PutDataTablesAppTableIdDatatableIdResponse ")
+    @Schema(description = "PutDataTablesAppTableIdDatatableIdResponse ")
     public static final class PutDataTablesAppTableIdDatatableIdResponse {
 
         private PutDataTablesAppTableIdDatatableIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "DeleteDataTablesDatatableAppTableIdResponse ")
+    @Schema(description = "DeleteDataTablesDatatableAppTableIdResponse ")
     public static final class DeleteDataTablesDatatableAppTableIdResponse {
 
         private DeleteDataTablesDatatableAppTableIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "DeleteDataTablesDatatableAppTableIdDatatableIdResponse ")
+    @Schema(description = "DeleteDataTablesDatatableAppTableIdDatatableIdResponse ")
     public static final class DeleteDataTablesDatatableAppTableIdDatatableIdResponse {
 
         private DeleteDataTablesDatatableAppTableIdDatatableIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java
index 6ef8329..4a8d61f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -60,8 +60,7 @@ import org.springframework.stereotype.Component;
 @Path("/entityDatatableChecks")
 @Component
 @Scope("singleton")
-@Api(tags = { "Entity Datatable Check" })
-@SwaggerDefinition(tags = { @Tag(name = "Entity Data Table", description = "This defines Entity-Datatable Check.") })
+@Tag(name = "Entity Data Table", description = "This defines Entity-Datatable Check.")
 public class EntityDatatableChecksApiResource {
 
     private final PlatformSecurityContext context;
@@ -86,17 +85,17 @@ public class EntityDatatableChecksApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Entity-Datatable Checks", notes = "The list capability of Entity-Datatable Checks can support pagination.\n"
+    @Operation(summary = "List Entity-Datatable Checks", description = "The list capability of Entity-Datatable Checks can support pagination.\n"
             + "\n" + "OPTIONAL ARGUMENTS\n"
             + "offset Integer optional, defaults to 0 Indicates the result from which pagination startslimit Integer optional, defaults to 200 Restricts the size of results returned. To override the default and return all entries you must explicitly pass a non-positive integer value for limit e.g. limit=0, or limit=-1\n"
             + "Example Request:\n" + "\n" + "entityDatatableChecks?offset=0&limit=15")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = EntityDatatableChecksApiResourceSwagger.GetEntityDatatableChecksResponse.class, responseContainer = "list") })
-    public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("status") @ApiParam(value = "status") final Long status,
-            @QueryParam("entity") @ApiParam(value = "entity") final String entity,
-            @QueryParam("productId") @ApiParam(value = "productId") final Long productId,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = EntityDatatableChecksApiResourceSwagger.GetEntityDatatableChecksResponse.class)))) })
+    public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("status") @Parameter(description = "status") final Long status,
+            @QueryParam("entity") @Parameter(description = "entity") final String entity,
+            @QueryParam("productId") @Parameter(description = "productId") final Long productId,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit) {
         final SearchParameters searchParameters = SearchParameters.forPagination(offset, limit);
         final Page<EntityDataTableChecksData> result = this.readEntityDatatableChecksService.retrieveAll(searchParameters, status, entity,
                 productId);
@@ -109,10 +108,10 @@ public class EntityDatatableChecksApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Entity-Datatable Checks Template", notes = "This is a convenience resource useful for building maintenance user interface screens for Entity-Datatable Checks applications. The template data returned consists of:\n"
-            + "\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "entityDatatableChecks/template")
+    @Operation(summary = "Retrieve Entity-Datatable Checks Template", description = "This is a convenience resource useful for building maintenance user interface screens for Entity-Datatable Checks applications. The template data returned consists of:\n"
+            + "\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "entityDatatableChecks/template")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = EntityDatatableChecksApiResourceSwagger.GetEntityDatatableChecksTemplateResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = EntityDatatableChecksApiResourceSwagger.GetEntityDatatableChecksTemplateResponse.class))) })
     public String getTemplate(@Context final UriInfo uriInfo) {
 
         final EntityDataTableChecksTemplateData result = this.readEntityDatatableChecksService.retrieveTemplate();
@@ -124,13 +123,12 @@ public class EntityDatatableChecksApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create Entity-Datatable Checks", notes = "Mandatory Fields : \n" + "entity, status, datatableName\n" + "\n"
+    @Operation(summary = "Create Entity-Datatable Checks", description = "Mandatory Fields : \n" + "entity, status, datatableName\n" + "\n"
             + "Non-Mandatory Fields : \n" + "productId")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = EntityDatatableChecksApiResourceSwagger.PostEntityDatatableChecksTemplateRequest.class) })
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = EntityDatatableChecksApiResourceSwagger.PostEntityDatatableChecksTemplateRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = EntityDatatableChecksApiResourceSwagger.PostEntityDatatableChecksTemplateResponse.class) })
-    public String createEntityDatatableCheck(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = EntityDatatableChecksApiResourceSwagger.PostEntityDatatableChecksTemplateResponse.class))) })
+    public String createEntityDatatableCheck(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createEntityDatatableChecks(apiRequestBodyAsJson).build();
         final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
@@ -141,11 +139,11 @@ public class EntityDatatableChecksApiResource {
     @Path("{entityDatatableCheckId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete Entity-Datatable Checks", notes = "Deletes an existing Entity-Datatable Check")
+    @Operation(summary = "Delete Entity-Datatable Checks", description = "Deletes an existing Entity-Datatable Check")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = EntityDatatableChecksApiResourceSwagger.DeleteEntityDatatableChecksTemplateResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = EntityDatatableChecksApiResourceSwagger.DeleteEntityDatatableChecksTemplateResponse.class))) })
     public String deleteDatatable(
-            @PathParam("entityDatatableCheckId") @ApiParam(value = "entityDatatableCheckId") final long entityDatatableCheckId,
+            @PathParam("entityDatatableCheckId") @Parameter(description = "entityDatatableCheckId") final long entityDatatableCheckId,
             final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder()
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResourceSwagger.java
index aa2ef20..00eb785 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import java.util.List;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
@@ -37,7 +36,7 @@ final class EntityDatatableChecksApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetEntityDatatableChecksResponse")
+    @Schema(description = "GetEntityDatatableChecksResponse")
     public static final class GetEntityDatatableChecksResponse {
 
         private GetEntityDatatableChecksResponse() {}
@@ -52,7 +51,7 @@ final class EntityDatatableChecksApiResourceSwagger {
         public String productName;
     }
 
-    @ApiModel(value = "GetEntityDatatableChecksTemplateResponse")
+    @Schema(description = "GetEntityDatatableChecksTemplateResponse")
     public static final class GetEntityDatatableChecksTemplateResponse {
 
         private GetEntityDatatableChecksTemplateResponse() {}
@@ -67,42 +66,42 @@ final class EntityDatatableChecksApiResourceSwagger {
         public Collection<SavingsProductData> savingsProductDatas;
     }
 
-    @ApiModel(value = "PostEntityDatatableChecksTemplateRequest")
+    @Schema(description = "PostEntityDatatableChecksTemplateRequest")
     public static final class PostEntityDatatableChecksTemplateRequest {
 
         private PostEntityDatatableChecksTemplateRequest() {
 
         }
 
-        @ApiModelProperty(example = "m_loan")
+        @Schema(example = "m_loan")
         public String entity;
-        @ApiModelProperty(example = "100")
+        @Schema(example = "100")
         public Long status;
-        @ApiModelProperty(example = "Additional Details")
+        @Schema(example = "Additional Details")
         public String datatableName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long productId;
     }
 
-    @ApiModel(value = "PostEntityDatatableChecksTemplateResponse")
+    @Schema(description = "PostEntityDatatableChecksTemplateResponse")
     public static final class PostEntityDatatableChecksTemplateResponse {
 
         private PostEntityDatatableChecksTemplateResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "DeleteEntityDatatableChecksTemplateResponse")
+    @Schema(description = "DeleteEntityDatatableChecksTemplateResponse")
     public static final class DeleteEntityDatatableChecksTemplateResponse {
 
         private DeleteEntityDatatableChecksTemplateResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResource.java
index d244745..1f13ab5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -59,8 +59,7 @@ import org.springframework.stereotype.Component;
 @Path("/reports")
 @Component
 @Scope("singleton")
-@Api(tags = { "Reports" })
-@SwaggerDefinition(tags = { @Tag(name = "Reports", description = "Non-core reports can be added, updated and deleted.") })
+@Tag(name = "Reports", description = "Non-core reports can be added, updated and deleted.")
 public class ReportsApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "reportName", "reportType", "reportSubType",
@@ -88,9 +87,9 @@ public class ReportsApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Reports", notes = "Lists all reports and their parameters.\n" + "\n" + "Example Request:\n" + "\n"
-            + "reports", responseContainer = "List", response = ReportsApiResourceSwagger.GetReportsResponse.class)
-    @ApiResponses({ @ApiResponse(code = 200, message = "") })
+    @Operation(summary = "List Reports", description = "Lists all reports and their parameters.\n" + "\n" + "Example Request:\n" + "\n"
+            + "reports")
+    @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ReportsApiResourceSwagger.GetReportsResponse.class))))
     public String retrieveReportList(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
@@ -105,10 +104,11 @@ public class ReportsApiResource {
     @Path("{id}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Report\n", notes = "Example Requests:\n" + "\n" + "reports/1\n" + "\n" + "\n"
+    @Operation(summary = "Retrieve a Report\n", description = "Example Requests:\n" + "\n" + "reports/1\n" + "\n" + "\n"
             + "reports/1?template=true")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ReportsApiResourceSwagger.GetReportsResponse.class) })
-    public String retrieveReport(@PathParam("id") @ApiParam(value = "id") final Long id, @Context final UriInfo uriInfo) {
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportsApiResourceSwagger.GetReportsResponse.class))) })
+    public String retrieveReport(@PathParam("id") @Parameter(description = "id") final Long id, @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -126,9 +126,10 @@ public class ReportsApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Report Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
-            + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "\n" + "Example Request : \n" + "\n" + "reports/template")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ReportsApiResourceSwagger.GetReportsTemplateResponse.class) })
+    @Operation(summary = "Retrieve Report Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
+            + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "\n" + "Example Request : \n" + "\n" + "reports/template")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportsApiResourceSwagger.GetReportsTemplateResponse.class))) })
     public String retrieveOfficeTemplate(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
@@ -143,11 +144,11 @@ public class ReportsApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a Report", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ReportsApiResourceSwagger.PostRepostRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ReportsApiResourceSwagger.PostReportsResponse.class) })
-    public String createReport(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Create a Report", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ReportsApiResourceSwagger.PostRepostRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportsApiResourceSwagger.PostReportsResponse.class))) })
+    public String createReport(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createReport().withJson(apiRequestBodyAsJson).build();
 
@@ -160,12 +161,12 @@ public class ReportsApiResource {
     @Path("{id}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Report", notes = "Only the useReport value can be updated for core reports.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ReportsApiResourceSwagger.PutReportRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ReportsApiResourceSwagger.PutReportResponse.class) })
-    public String updateReport(@PathParam("id") @ApiParam(value = "id") final Long id,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update a Report", description = "Only the useReport description can be updated for core reports.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ReportsApiResourceSwagger.PutReportRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportsApiResourceSwagger.PutReportResponse.class))) })
+    public String updateReport(@PathParam("id") @Parameter(description = "id") final Long id,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateReport(id).withJson(apiRequestBodyAsJson).build();
 
@@ -178,9 +179,10 @@ public class ReportsApiResource {
     @Path("{id}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete a Report", notes = "Only non-core reports can be deleted.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ReportsApiResourceSwagger.DeleteReportsResponse.class) })
-    public String deleteReport(@PathParam("id") @ApiParam(value = "id") final Long id) {
+    @Operation(summary = "Delete a Report", description = "Only non-core reports can be deleted.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportsApiResourceSwagger.DeleteReportsResponse.class))) })
+    public String deleteReport(@PathParam("id") @Parameter(description = "id") final Long id) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteReport(id).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java
index 248b567..5b60662 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import java.util.List;
 import org.apache.fineract.infrastructure.dataqueries.data.ReportParameterData;
@@ -33,35 +32,35 @@ final class ReportsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetReportsResponse")
+    @Schema(description = "GetReportsResponse")
     public static final class GetReportsResponse {
 
         private GetReportsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "Client Listing")
+        @Schema(example = "Client Listing")
         public String reportName;
-        @ApiModelProperty(example = "Table")
+        @Schema(example = "Table")
         public String reportType;
         public String reportSubType;
-        @ApiModelProperty(example = "Client")
+        @Schema(example = "Client")
         public String reportCategory;
-        @ApiModelProperty(example = "Individual Client Report Lists the small number of defined fields on the client table.  Would expect to copy this report and add any one to one additional data for specific tenant needs. Can be run for any size MFI but you expect it only to be run within a branch for larger ones.  Depending on how many columns are displayed, there is probably is a limit of about 20/50k clients returned for html display (export to excel doesnt have that client browser/ [...]
+        @Schema(example = "Individual Client Report Lists the small number of defined fields on the client table.  Would expect to copy this report and add any one to one additional data for specific tenant needs. Can be run for any size MFI but you expect it only to be run within a branch for larger ones.  Depending on how many columns are displayed, there is probably is a limit of about 20/50k clients returned for html display (export to excel doesnt have that client browser/memory impact).")
         public String description;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String reportSql;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean coreReport;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean useReport;
         public Collection<ReportParameterData> reportParameters;
 
     }
 
-    @ApiModel(value = "GetReportsTemplateResponse")
+    @Schema(description = "GetReportsTemplateResponse")
     public static final class GetReportsTemplateResponse {
 
         private GetReportsTemplateResponse() {
@@ -73,53 +72,53 @@ final class ReportsApiResourceSwagger {
         public Collection<ReportParameterData> allowedParameters;
     }
 
-    @ApiModel(value = "PostRepostRequest")
+    @Schema(description = "PostRepostRequest")
     public static final class PostRepostRequest {
 
         private PostRepostRequest() {
 
         }
 
-        @ApiModelProperty(example = "Completely New Report")
+        @Schema(example = "Completely New Report")
         public String reportName;
-        @ApiModelProperty(example = "Table")
+        @Schema(example = "Table")
         public String reportType;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String reportSubType;
-        @ApiModelProperty(example = "Loan")
+        @Schema(example = "Loan")
         public String reportCategory;
-        @ApiModelProperty(example = "Just An Example")
+        @Schema(example = "Just An Example")
         public String description;
-        @ApiModelProperty(example = "select 'very good sql' as AComment")
+        @Schema(example = "select 'very good sql' as AComment")
         public String reportSql;
         public Collection<ReportParameterData> reportParameters;
     }
 
-    @ApiModel(value = "PostReportsResponse")
+    @Schema(description = "PostReportsResponse")
     public static final class PostReportsResponse {
 
         private PostReportsResponse() {
 
         }
 
-        @ApiModelProperty(example = "132")
+        @Schema(example = "132")
         public long resourceId;
     }
 
-    @ApiModel(value = "PutReportRequest")
+    @Schema(description = "PutReportRequest")
     public static final class PutReportRequest {
 
         private PutReportRequest() {
 
         }
 
-        @ApiModelProperty(example = "Completely New Report")
+        @Schema(example = "Completely New Report")
         public String reportName;
         public Collection<ReportParameterData> reportParameters;
 
     }
 
-    @ApiModel(value = "PutReportResponse")
+    @Schema(description = "PutReportResponse")
     public static final class PutReportResponse {
 
         private PutReportResponse() {
@@ -132,24 +131,24 @@ final class ReportsApiResourceSwagger {
 
             }
 
-            @ApiModelProperty(example = "Changed New Report")
+            @Schema(example = "Changed New Report")
             public String reportName;
             public Collection<ReportParameterData> reportParameters;
         }
 
-        @ApiModelProperty(example = "132")
+        @Schema(example = "132")
         public long resourceId;
         public PutReportResponseChanges changes;
     }
 
-    @ApiModel(value = "DeleteReportsResponse")
+    @Schema(description = "DeleteReportsResponse")
     public static final class DeleteReportsResponse {
 
         private DeleteReportsResponse() {
 
         }
 
-        @ApiModelProperty(example = "132")
+        @Schema(example = "132")
         public long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
index d82042a..ee05b1b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResource.java
@@ -18,13 +18,13 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
@@ -62,8 +62,7 @@ import org.springframework.stereotype.Component;
 @Path("/runreports")
 @Component
 @Scope("singleton")
-@Api(tags = { "Run Reports" })
-@SwaggerDefinition(tags = { @Tag(name = "Run Reports", description = "") })
+@Tag(name = "Run Reports", description = "")
 public class RunreportsApiResource {
 
     private final PlatformSecurityContext context;
@@ -87,7 +86,7 @@ public class RunreportsApiResource {
     @Path("{reportName}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON, "text/csv", "application/vnd.ms-excel", "application/pdf", "text/html" })
-    @ApiOperation(value = "Running a Report", notes = "This resource allows you to run and receive output from pre-defined Apache Fineract reports.\n"
+    @Operation(summary = "Running a Report", description = "This resource allows you to run and receive output from pre-defined Apache Fineract reports.\n"
             + "\n" + "Reports can also be used to provide data for searching and workflow functionality.\n" + "\n"
             + "The default output is a JSON formatted \"Generic Resultset\". The Generic Resultset contains Column Heading as well as Data information. However, you can export to CSV format by simply adding \"&exportCSV=true\" to the end of your URL.\n"
             + "\n"
@@ -105,10 +104,11 @@ public class RunreportsApiResource {
             + "runreports/Expected%20Payments%20By%20Date%20-%20Formatted?R_endDate=2013-04-30&R_loanOfficerId=-1&R_officeId=1&R_startDate=2013-04-16&output-type=CSV&R_officeId=1\n"
             + "\n" + "\n"
             + "runreports/Expected%20Payments%20By%20Date%20-%20Formatted?R_endDate=2013-04-30&R_loanOfficerId=-1&R_officeId=1&R_startDate=2013-04-16&output-type=PDF&R_officeId=1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = RunreportsApiResourceSwagger.GetReportNameResponse.class) })
-    public Response runReport(@PathParam("reportName") @ApiParam(value = "reportName") final String reportName,
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = RunreportsApiResourceSwagger.GetReportNameResponse.class))) })
+    public Response runReport(@PathParam("reportName") @Parameter(description = "reportName") final String reportName,
             @Context final UriInfo uriInfo,
-            @DefaultValue("false") @QueryParam("isSelfServiceUserReport") @ApiParam(value = "isSelfServiceUserReport") final boolean isSelfServiceUserReport) {
+            @DefaultValue("false") @QueryParam("isSelfServiceUserReport") @Parameter(description = "isSelfServiceUserReport") final boolean isSelfServiceUserReport) {
 
         final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResourceSwagger.java
index 7d4393a..63fb562 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/RunreportsApiResourceSwagger.java
@@ -18,7 +18,7 @@
  */
 package org.apache.fineract.infrastructure.dataqueries.api;
 
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.apache.fineract.infrastructure.dataqueries.data.ResultsetColumnHeaderData;
 import org.apache.fineract.infrastructure.dataqueries.data.ResultsetRowData;
 
@@ -31,7 +31,7 @@ final class RunreportsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetReportNameResponse")
+    @Schema(description = "GetReportNameResponse")
     public static final class GetReportNameResponse {
 
         private GetReportNameResponse() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java
index 2aa88d3..da99120 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java
@@ -21,13 +21,14 @@ package org.apache.fineract.infrastructure.documentmanagement.api;
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataBodyPart;
 import com.sun.jersey.multipart.FormDataParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
@@ -64,12 +65,10 @@ import org.springframework.stereotype.Component;
 @Path("{entityType}/{entityId}/documents")
 @Component
 @Scope("singleton")
-@Api(tags = { "Documents" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Documents", description = "Multiple Documents (a combination of a name, description and a file) may be attached to different Entities like Clients, Groups, Staff, Loans, Savings and Client Identifiers in the system\n"
-                + "\n" + "Note: The currently allowed Entities are\n" + "\n" + "Clients: URL Pattern as clients\n"
-                + "Staff: URL Pattern as staff\n" + "Loans: URL Pattern as loans\n" + "Savings: URL Pattern as savings\n"
-                + "Client Identifiers: URL Pattern as client_identifiers\n" + "Groups: URL Pattern as groups") })
+@Tag(name = "Documents", description = "Multiple Documents (a combination of a name, description and a file) may be attached to different Entities like Clients, Groups, Staff, Loans, Savings and Client Identifiers in the system\n"
+        + "\n" + "Note: The currently allowed Entities are\n" + "\n" + "Clients: URL Pattern as clients\n" + "Staff: URL Pattern as staff\n"
+        + "Loans: URL Pattern as loans\n" + "Savings: URL Pattern as savings\n" + "Client Identifiers: URL Pattern as client_identifiers\n"
+        + "Groups: URL Pattern as groups")
 public class DocumentManagementApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
@@ -97,13 +96,13 @@ public class DocumentManagementApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List documents", notes = "Example Requests:\n" + "\n" + "clients/1/documents\n" + "\n"
+    @Operation(summary = "List documents", description = "Example Requests:\n" + "\n" + "clients/1/documents\n" + "\n"
             + "client_identifiers/1/documents\n" + "\n" + "loans/1/documents?fields=name,description")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DocumentManagementApiResourceSwagger.GetEntityTypeEntityIdDocumentsResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = DocumentManagementApiResourceSwagger.GetEntityTypeEntityIdDocumentsResponse.class)))) })
     public String retreiveAllDocuments(@Context final UriInfo uriInfo,
-            @PathParam("entityType") @ApiParam(value = "entityType") final String entityType,
-            @PathParam("entityId") @ApiParam(value = "entityId") final Long entityId) {
+            @PathParam("entityType") @Parameter(description = "entityType") final String entityType,
+            @PathParam("entityId") @Parameter(description = "entityId") final Long entityId) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.SystemEntityType);
 
@@ -116,20 +115,20 @@ public class DocumentManagementApiResource {
     @POST
     @Consumes({ MediaType.MULTIPART_FORM_DATA })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a Document", notes = "Note: A document is created using a Multi-part form upload \n" + "\n"
+    @Operation(summary = "Create a Document", description = "Note: A document is created using a Multi-part form upload \n" + "\n"
             + "Body Parts\n" + "\n" + "name : \n" + "Name or summary of the document\n" + "\n" + "description : \n"
             + "Description of the document\n" + "\n" + "file : \n" + "The file to be uploaded\n" + "\n" + "Mandatory Fields : \n"
             + "file and description")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "Not Shown (multi-part form data)", response = DocumentManagementApiResourceSwagger.PostEntityTypeEntityIdDocumentsResponse.class) })
-    public String createDocument(@PathParam("entityType") @ApiParam(value = "entityType") final String entityType,
-            @PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
-            @HeaderParam("Content-Length") @ApiParam(value = "Content-Length") final Long fileSize,
-            @FormDataParam("file") @ApiParam(value = "file") final InputStream inputStream,
-            @FormDataParam("file") final @ApiParam(value = "file") FormDataContentDisposition fileDetails,
-            @FormDataParam("file") @ApiParam(value = "file") final FormDataBodyPart bodyPart,
-            @FormDataParam("name") @ApiParam(value = "name") final String name,
-            @FormDataParam("description") @ApiParam(value = "description") final String description) {
+            @ApiResponse(responseCode = "200", description = "Not Shown (multi-part form data)", content = @Content(schema = @Schema(implementation = DocumentManagementApiResourceSwagger.PostEntityTypeEntityIdDocumentsResponse.class))) })
+    public String createDocument(@PathParam("entityType") @Parameter(description = "entityType") final String entityType,
+            @PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
+            @HeaderParam("Content-Length") @Parameter(description = "Content-Length") final Long fileSize,
+            @FormDataParam("file") @Parameter(description = "file") final InputStream inputStream,
+            @FormDataParam("file") final @Parameter(description = "file") FormDataContentDisposition fileDetails,
+            @FormDataParam("file") @Parameter(description = "file") final FormDataBodyPart bodyPart,
+            @FormDataParam("name") @Parameter(description = "name") final String name,
+            @FormDataParam("description") @Parameter(description = "description") final String description) {
 
         /**
          * TODO: also need to have a backup and stop reading from stream after max size is reached to protect against
@@ -151,20 +150,20 @@ public class DocumentManagementApiResource {
     @Path("{documentId}")
     @Consumes({ MediaType.MULTIPART_FORM_DATA })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Document", notes = "Note: A document is updated using a Multi-part form upload \n" + "Body Parts\n"
+    @Operation(summary = "Update a Document", description = "Note: A document is updated using a Multi-part form upload \n" + "Body Parts\n"
             + "name\n" + "Name or summary of the document\n" + "description\n" + "Description of the document\n" + "file\n"
             + "The file to be uploaded")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "Not Shown (multi-part form data)", response = DocumentManagementApiResourceSwagger.PutEntityTypeEntityIdDocumentsResponse.class) })
-    public String updateDocument(@PathParam("entityType") @ApiParam(value = "entityType") final String entityType,
-            @PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
-            @PathParam("documentId") @ApiParam(value = "documentId") final Long documentId,
-            @HeaderParam("Content-Length") @ApiParam(value = "Content-Length") final Long fileSize,
-            @FormDataParam("file") @ApiParam(value = "file") final InputStream inputStream,
-            @FormDataParam("file") @ApiParam(value = "file") final FormDataContentDisposition fileDetails,
-            @FormDataParam("file") @ApiParam(value = "file") final FormDataBodyPart bodyPart,
-            @FormDataParam("name") @ApiParam(value = "name") final String name,
-            @FormDataParam("description") @ApiParam(value = "description") final String description) {
+            @ApiResponse(responseCode = "200", description = "Not Shown (multi-part form data)", content = @Content(schema = @Schema(implementation = DocumentManagementApiResourceSwagger.PutEntityTypeEntityIdDocumentsResponse.class))) })
+    public String updateDocument(@PathParam("entityType") @Parameter(description = "entityType") final String entityType,
+            @PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
+            @PathParam("documentId") @Parameter(description = "documentId") final Long documentId,
+            @HeaderParam("Content-Length") @Parameter(description = "Content-Length") final Long fileSize,
+            @FormDataParam("file") @Parameter(description = "file") final InputStream inputStream,
+            @FormDataParam("file") @Parameter(description = "file") final FormDataContentDisposition fileDetails,
+            @FormDataParam("file") @Parameter(description = "file") final FormDataBodyPart bodyPart,
+            @FormDataParam("name") @Parameter(description = "name") final String name,
+            @FormDataParam("description") @Parameter(description = "description") final String description) {
 
         final Set<String> modifiedParams = new HashSet<>();
         modifiedParams.add("name");
@@ -197,13 +196,13 @@ public class DocumentManagementApiResource {
     @Path("{documentId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Document", notes = "Example Requests:\n" + "\n" + "clients/1/documents/1\n" + "\n" + "\n"
+    @Operation(summary = "Retrieve a Document", description = "Example Requests:\n" + "\n" + "clients/1/documents/1\n" + "\n" + "\n"
             + "loans/1/documents/1\n" + "\n" + "\n" + "client_identifiers/1/documents/1?fields=name,description")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DocumentManagementApiResourceSwagger.GetEntityTypeEntityIdDocumentsResponse.class) })
-    public String getDocument(@PathParam("entityType") @ApiParam(value = "entityType") final String entityType,
-            @PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
-            @PathParam("documentId") @ApiParam(value = "documentId") final Long documentId, @Context final UriInfo uriInfo) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DocumentManagementApiResourceSwagger.GetEntityTypeEntityIdDocumentsResponse.class))) })
+    public String getDocument(@PathParam("entityType") @Parameter(description = "entityType") final String entityType,
+            @PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
+            @PathParam("documentId") @Parameter(description = "documentId") final Long documentId, @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.SystemEntityType);
 
@@ -217,12 +216,12 @@ public class DocumentManagementApiResource {
     @Path("{documentId}/attachment")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_OCTET_STREAM })
-    @ApiOperation(value = "Retrieve Binary File associated with Document", notes = "Request used to download the file associated with the document\n"
+    @Operation(summary = "Retrieve Binary File associated with Document", description = "Request used to download the file associated with the document\n"
             + "\n" + "Example Requests:\n" + "\n" + "clients/1/documents/1/attachment\n" + "\n" + "\n" + "loans/1/documents/1/attachment")
-    @ApiResponses({ @ApiResponse(code = 200, message = "Not Shown: The corresponding Binary file") })
-    public Response downloadFile(@PathParam("entityType") @ApiParam(value = "entityType") final String entityType,
-            @PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
-            @PathParam("documentId") @ApiParam(value = "documentId") final Long documentId) {
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "Not Shown: The corresponding Binary file") })
+    public Response downloadFile(@PathParam("entityType") @Parameter(description = "entityType") final String entityType,
+            @PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
+            @PathParam("documentId") @Parameter(description = "documentId") final Long documentId) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.SystemEntityType);
 
@@ -238,12 +237,12 @@ public class DocumentManagementApiResource {
     @Path("{documentId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Remove a Document", notes = "")
+    @Operation(summary = "Remove a Document", description = "")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = DocumentManagementApiResourceSwagger.DeleteEntityTypeEntityIdDocumentsResponse.class) })
-    public String deleteDocument(@PathParam("entityType") @ApiParam(value = "entityType") final String entityType,
-            @PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
-            @PathParam("documentId") @ApiParam(value = "documentId") final Long documentId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = DocumentManagementApiResourceSwagger.DeleteEntityTypeEntityIdDocumentsResponse.class))) })
+    public String deleteDocument(@PathParam("entityType") @Parameter(description = "entityType") final String entityType,
+            @PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
+            @PathParam("documentId") @Parameter(description = "documentId") final Long documentId) {
 
         final DocumentCommand documentCommand = new DocumentCommand(null, documentId, entityType, entityId, null, null, null, null, null,
                 null);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
index 94dd175..0d9dc4e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.documentmanagement.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 7/8/17.
@@ -31,49 +30,49 @@ final class DocumentManagementApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetEntityTypeEntityIdDocumentsResponse")
+    @Schema(description = "GetEntityTypeEntityIdDocumentsResponse")
     public static final class GetEntityTypeEntityIdDocumentsResponse {
 
         private GetEntityTypeEntityIdDocumentsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "clients")
+        @Schema(example = "clients")
         public String parentEntityType;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long parentEntityId;
-        @ApiModelProperty(example = "Client Details Form")
+        @Schema(example = "Client Details Form")
         public String name;
-        @ApiModelProperty(example = "CGAP.pdf")
+        @Schema(example = "CGAP.pdf")
         public String fileName;
-        @ApiModelProperty(example = "5246719")
+        @Schema(example = "5246719")
         public Long size;
-        @ApiModelProperty(example = "application/pdf")
+        @Schema(example = "application/pdf")
         public String type;
-        @ApiModelProperty(example = "A signed form signed by new member")
+        @Schema(example = "A signed form signed by new member")
         public String description;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String location;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public Integer storageType;
     }
 
-    @ApiModel(value = "PostEntityTypeEntityIdDocumentsResponse")
+    @Schema(description = "PostEntityTypeEntityIdDocumentsResponse")
     public static final class PostEntityTypeEntityIdDocumentsResponse {
 
         private PostEntityTypeEntityIdDocumentsResponse() {
 
         }
 
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long resourceId;
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public String resourceIdentifier;
     }
 
-    @ApiModel(value = "PutEntityTypeEntityIdDocumentsResponse")
+    @Schema(description = "PutEntityTypeEntityIdDocumentsResponse")
     public static final class PutEntityTypeEntityIdDocumentsResponse {
 
         private PutEntityTypeEntityIdDocumentsResponse() {
@@ -88,14 +87,14 @@ final class DocumentManagementApiResourceSwagger {
 
         }
 
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long resourceId;
         public PutEntityTypeEntityIdDocumentsResponse.PutEntityTypeEntityIdDocumentsResponseChangesSwagger changes;
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public String resourceIdentifier;
     }
 
-    @ApiModel(value = "DeleteEntityTypeEntityIdDocumentsResponse")
+    @Schema(description = "DeleteEntityTypeEntityIdDocumentsResponse")
     public static final class DeleteEntityTypeEntityIdDocumentsResponse {
 
         private DeleteEntityTypeEntityIdDocumentsResponse() {
@@ -110,10 +109,10 @@ final class DocumentManagementApiResourceSwagger {
 
         }
 
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long resourceId;
         public DeleteEntityTypeEntityIdDocumentsResponse.PutEntityTypeEntityIdDocumentsResponseChangesSwagger changes;
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public String resourceIdentifier;
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java
index d587b7b..1d681fc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java
@@ -21,7 +21,6 @@ package org.apache.fineract.infrastructure.documentmanagement.api;
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataBodyPart;
 import com.sun.jersey.multipart.FormDataParam;
-import io.swagger.annotations.Api;
 import java.io.InputStream;
 import java.util.Base64;
 import javax.ws.rs.Consumes;
@@ -56,7 +55,7 @@ import org.springframework.stereotype.Component;
 @Path("{entity}/{entityId}/images")
 @Component
 @Scope("singleton")
-@Api(value = "DomainName//api//v1//{entity}//{entityId}//images", description = "")
+
 public class ImagesApiResource {
 
     private final PlatformSecurityContext context;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResource.java
index 74d3715..0462137 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResource.java
@@ -18,7 +18,6 @@
  */
 package org.apache.fineract.infrastructure.entityaccess.api;
 
-import io.swagger.annotations.Api;
 import java.util.Collection;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -51,7 +50,7 @@ import org.springframework.stereotype.Component;
 @Produces({ MediaType.APPLICATION_JSON })
 @Component
 @Scope("singleton")
-@Api(value = "DomainName/api/v1/entitytoentitymapping", description = "") // https://github.com/swagger-api/swagger-ui/issues/1655
+
 public class FineractEntityApiResource {
 
     private final PlatformSecurityContext context;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResource.java
index 1d6f001..3be9552 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResource.java
@@ -21,15 +21,15 @@ package org.apache.fineract.infrastructure.hooks.api;
 import static org.apache.fineract.infrastructure.hooks.api.HookApiConstants.HOOK_RESOURCE_NAME;
 import static org.apache.fineract.infrastructure.hooks.api.HookApiConstants.RESPONSE_DATA_PARAMETERS;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collection;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -61,9 +61,7 @@ import org.springframework.stereotype.Component;
 @Produces({ MediaType.APPLICATION_JSON })
 @Component
 @Scope("singleton")
-@Api(tags = { "Hooks" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Hooks", description = "Hooks are a mechanism to trigger custom code on the occurence of events. ") })
+@Tag(name = "Hooks", description = "Hooks are a mechanism to trigger custom code on the occurence of events. ")
 public class HookApiResource {
 
     private final PlatformSecurityContext context;
@@ -84,10 +82,9 @@ public class HookApiResource {
     }
 
     @GET
-    @ApiOperation(value = "Retrieve Hooks", notes = "Returns the list of hooks.\n" + "\n" + "Example Requests:\n" + "\n"
-            + "hooks", responseContainer = "List", response = HookApiResourceSwagger.GetHookResponse.class)
+    @Operation(summary = "Retrieve Hooks", description = "Returns the list of hooks.\n" + "\n" + "Example Requests:\n" + "\n" + "hooks")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = HookApiResourceSwagger.GetHookResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = HookApiResourceSwagger.GetHookResponse.class)))) })
     public String retrieveHooks(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(HOOK_RESOURCE_NAME);
@@ -100,9 +97,11 @@ public class HookApiResource {
 
     @GET
     @Path("{hookId}")
-    @ApiOperation(value = "Retrieve a Hook", notes = "Returns the details of a Hook.\n" + "\n" + "Example Requests:\n" + "\n" + "hooks/1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HookApiResourceSwagger.GetHookResponse.class) })
-    public String retrieveHook(@PathParam("hookId") @ApiParam(value = "hookId") final Long hookId, @Context final UriInfo uriInfo) {
+    @Operation(summary = "Retrieve a Hook", description = "Returns the details of a Hook.\n" + "\n" + "Example Requests:\n" + "\n"
+            + "hooks/1")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HookApiResourceSwagger.GetHookResponse.class))) })
+    public String retrieveHook(@PathParam("hookId") @Parameter(description = "hookId") final Long hookId, @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(HOOK_RESOURCE_NAME);
 
@@ -119,9 +118,10 @@ public class HookApiResource {
 
     @GET
     @Path("template")
-    @ApiOperation(value = "Retrieve Hooks Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
-            + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "hooks/template")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HookApiResourceSwagger.GetHookTemplateResponse.class) })
+    @Operation(summary = "Retrieve Hooks Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
+            + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "hooks/template")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HookApiResourceSwagger.GetHookTemplateResponse.class))) })
     public String template(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(HOOK_RESOURCE_NAME);
@@ -133,16 +133,16 @@ public class HookApiResource {
     }
 
     @POST
-    @ApiOperation(value = "Create a Hook", notes = "The following parameters can be passed for the creation of a hook :-\n" + "\n"
+    @Operation(summary = "Create a Hook", description = "The following parameters can be passed for the creation of a hook :-\n" + "\n"
             + "name - string - Required. The name of the template that is being called. (See /hooks/template for the list of valid hook names.)\n"
             + "\n" + "isActive - boolean - Determines whether the hook is actually triggered.\n" + "\n"
             + "events - array - Determines what events the hook is triggered for.\n" + "\n"
             + "config - hash - Required. Key/value pairs to provide settings for this hook. These settings vary between the templates.\n"
             + "\n" + "templateId - Optional. The UGD template ID associated with the same entity (client or loan).")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "body", required = true, type = "body", dataTypeClass = HookApiResourceSwagger.PostHookRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HookApiResourceSwagger.PostHookResponse.class) })
-    public String createHook(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = HookApiResourceSwagger.PostHookRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HookApiResourceSwagger.PostHookResponse.class))) })
+    public String createHook(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createHook().withJson(apiRequestBodyAsJson).build();
 
@@ -153,12 +153,12 @@ public class HookApiResource {
 
     @PUT
     @Path("{hookId}")
-    @ApiOperation(value = "Update a Hook", notes = "Updates the details of a hook.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "body", required = true, type = "body", dataTypeClass = HookApiResourceSwagger.PutHookRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HookApiResourceSwagger.PutHookResponse.class) })
-    public String updateHook(@PathParam("hookId") @ApiParam(value = "hookId") final Long hookId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update a Hook", description = "Updates the details of a hook.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = HookApiResourceSwagger.PutHookRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HookApiResourceSwagger.PutHookResponse.class))) })
+    public String updateHook(@PathParam("hookId") @Parameter(description = "hookId") final Long hookId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateHook(hookId).withJson(apiRequestBodyAsJson).build();
 
@@ -169,9 +169,10 @@ public class HookApiResource {
 
     @DELETE
     @Path("{hookId}")
-    @ApiOperation(value = "Delete a Hook", notes = "Deletes a hook.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HookApiResourceSwagger.DeleteHookResponse.class) })
-    public String deleteHook(@PathParam("hookId") @ApiParam(value = "hookId") final Long hookId) {
+    @Operation(summary = "Delete a Hook", description = "Deletes a hook.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HookApiResourceSwagger.DeleteHookResponse.class))) })
+    public String deleteHook(@PathParam("hookId") @Parameter(description = "hookId") final Long hookId) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteHook(hookId).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java
index 0c4703f..383cd9e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.hooks.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.fineract.infrastructure.hooks.data.Event;
 import org.apache.fineract.infrastructure.hooks.data.Field;
@@ -37,64 +36,64 @@ final class HookApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PostHookRequest")
+    @Schema(description = "PostHookRequest")
     public static final class PostHookRequest {
 
         private PostHookRequest() {
 
         }
 
-        @ApiModelProperty(example = "Web")
+        @Schema(example = "Web")
         public String name;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isActive;
-        @ApiModelProperty(example = "Kremlin")
+        @Schema(example = "Kremlin")
         public String displayName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long templateId;
         public List<Event> events;
         public List<Field> config;
     }
 
-    @ApiModel(value = "PostHookResponse")
+    @Schema(description = "PostHookResponse")
     public static final class PostHookResponse {
 
         private PostHookResponse() {
 
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
     }
 
-    @ApiModel(value = "GetHookResponse")
+    @Schema(description = "GetHookResponse")
     public static final class GetHookResponse {
 
         private GetHookResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "Web")
+        @Schema(example = "Web")
         public String name;
-        @ApiModelProperty(example = "Kremlin")
+        @Schema(example = "Kremlin")
         public String displayName;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isActive;
-        @ApiModelProperty(example = "[2014, 9, 16]")
+        @Schema(example = "[2014, 9, 16]")
         public LocalDate createdAt;
-        @ApiModelProperty(example = "[2014, 9, 16]")
+        @Schema(example = "[2014, 9, 16]")
         public LocalDate updatedAt;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long templateId;
-        @ApiModelProperty(example = "My UGD")
+        @Schema(example = "My UGD")
         public String templateName;
         public List<Event> events;
         public List<Field> config;
     }
 
-    @ApiModel(value = "GetHookTemplateResponse")
+    @Schema(description = "GetHookTemplateResponse")
     public static final class GetHookTemplateResponse {
 
         private GetHookTemplateResponse() {
@@ -105,37 +104,37 @@ final class HookApiResourceSwagger {
         public List<Grouping> groupings;
     }
 
-    @ApiModel(value = "DeleteHookResponse")
+    @Schema(description = "DeleteHookResponse")
     public static final class DeleteHookResponse {
 
         private DeleteHookResponse() {
 
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutHookRequest")
+    @Schema(description = "PutHookRequest")
     public static final class PutHookRequest {
 
         private PutHookRequest() {
 
         }
 
-        @ApiModelProperty(example = "Web")
+        @Schema(example = "Web")
         public String name;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isActive;
-        @ApiModelProperty(example = "Kremlin")
+        @Schema(example = "Kremlin")
         public String displayName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long templateId;
         public List<Event> events;
         public List<Field> config;
     }
 
-    @ApiModel(value = "PutHookResponse")
+    @Schema(description = "PutHookResponse")
     public static final class PutHookResponse {
 
         private PutHookResponse() {
@@ -146,14 +145,14 @@ final class HookApiResourceSwagger {
 
             private PutHookResponseChangesSwagger() {}
 
-            @ApiModelProperty(example = "Kremlin")
+            @Schema(example = "Kremlin")
             public String displayName;
-            @ApiModelProperty(example = "1")
+            @Schema(example = "1")
             public List<Event> events;
             public List<Field> config;
         }
 
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long resourceId;
         public PutHookResponseChangesSwagger changes;
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResource.java
index 448c4fd..af877d5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResource.java
@@ -18,13 +18,13 @@
  */
 package org.apache.fineract.infrastructure.jobs.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -49,8 +49,8 @@ import org.springframework.stereotype.Component;
 
 @Path("/scheduler")
 @Component
-@Api(tags = { "Scheduler" })
-@SwaggerDefinition(tags = { @Tag(name = "Scheduler", description = "") })
+
+@Tag(name = "Scheduler", description = "")
 public class SchedulerApiResource {
 
     private final PlatformSecurityContext context;
@@ -70,9 +70,10 @@ public class SchedulerApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Scheduler Status", notes = "Returns the scheduler status.\n" + "\n" + "Example Requests:\n" + "\n"
+    @Operation(summary = "Retrieve Scheduler Status", description = "Returns the scheduler status.\n" + "\n" + "Example Requests:\n" + "\n"
             + "scheduler")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = SchedulerApiResourceSwagger.GetSchedulerResponse.class) })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SchedulerApiResourceSwagger.GetSchedulerResponse.class))) })
     public String retrieveStatus(@Context final UriInfo uriInfo) {
         this.context.authenticatedUser().validateHasReadPermission(SchedulerJobApiConstants.SCHEDULER_RESOURCE_NAME);
         final boolean isSchedulerRunning = this.jobRegisterService.isSchedulerRunning();
@@ -85,10 +86,11 @@ public class SchedulerApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Activate Scheduler Jobs | Suspend Scheduler Jobs", notes = "Activates the scheduler job service. | Suspends the scheduler job service.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "POST :  scheduler?command=start\n\n" + "\n" + "POST : scheduler?command=stop") })
+    @Operation(summary = "Activate Scheduler Jobs | Suspend Scheduler Jobs", description = "Activates the scheduler job service. | Suspends the scheduler job service.")
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "POST :  scheduler?command=start\n\n" + "\n"
+            + "POST : scheduler?command=stop") })
     public Response changeSchedulerStatus(
-            @QueryParam(SchedulerJobApiConstants.COMMAND) @ApiParam(value = "command") final String commandParam) {
+            @QueryParam(SchedulerJobApiConstants.COMMAND) @Parameter(description = "command") final String commandParam) {
         // check the logged in user have permissions to update scheduler status
         final boolean hasNotPermission = this.context.authenticatedUser().hasNotPermissionForAnyOf("ALL_FUNCTIONS", "UPDATE_SCHEDULER");
         if (hasNotPermission) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResourceSwagger.java
index 3b462ed..1d9960f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.jobs.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 /**
  * Created by sanyam on 12/8/17.
@@ -30,14 +29,14 @@ final class SchedulerApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetSchedulerResponse")
+    @Schema(description = "GetSchedulerResponse")
     public static final class GetSchedulerResponse {
 
         private GetSchedulerResponse() {
 
         }
 
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean active;
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java
index e9635fb..3967c8f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.jobs.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -64,9 +64,7 @@ import org.springframework.stereotype.Component;
 @Consumes({ MediaType.APPLICATION_JSON })
 @Produces({ MediaType.APPLICATION_JSON })
 @Component
-@Api(tags = { "MIFOSX-BATCH JOBS" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "MIFOSX-BATCH JOBS", description = "Batch jobs (also known as cron jobs on Unix-based systems) are a series of back-end jobs executed on a computer at a particular time defined in job's cron expression.\n\n At any point, you can view the list of batch jobs scheduled to run along with other details specific to each job. Manually you can execute the jobs at any point of time.\n\n The scheduler status can be either \"Active\" or \"Standby\". If the scheduler status is Ac [...]
+@Tag(name = "MIFOSX-BATCH JOBS", description = "Batch jobs (also known as cron jobs on Unix-based systems) are a series of back-end jobs executed on a computer at a particular time defined in job's cron expression.\n\n At any point, you can view the list of batch jobs scheduled to run along with other details specific to each job. Manually you can execute the jobs at any point of time.\n\n The scheduler status can be either \"Active\" or \"Standby\". If the scheduler status is Active, it [...]
 public class SchedulerJobApiResource {
 
     private final SchedulerJobRunnerReadService schedulerJobRunnerReadService;
@@ -93,9 +91,10 @@ public class SchedulerJobApiResource {
     }
 
     @GET
-    @ApiOperation(value = "Retrieve Scheduler Jobs", notes = "Returns the list of jobs.\n" + "\n" + "Example Requests:\n" + "\n" + "jobs")
+    @Operation(summary = "Retrieve Scheduler Jobs", description = "Returns the list of jobs.\n" + "\n" + "Example Requests:\n" + "\n"
+            + "jobs")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = SchedulerJobApiResourceSwagger.GetJobsResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = SchedulerJobApiResourceSwagger.GetJobsResponse.class)))) })
     public String retrieveAll(@Context final UriInfo uriInfo) {
         this.context.authenticatedUser().validateHasReadPermission(SchedulerJobApiConstants.SCHEDULER_RESOURCE_NAME);
         final List<JobDetailData> jobDetailDatas = this.schedulerJobRunnerReadService.findAllJobDeatils();
@@ -105,9 +104,10 @@ public class SchedulerJobApiResource {
 
     @GET
     @Path("{" + SchedulerJobApiConstants.JOB_ID + "}")
-    @ApiOperation(value = "Retrieve a Job", notes = "Returns the details of a Job.\n" + "\n" + "Example Requests:\n" + "\n" + "jobs/5")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = SchedulerJobApiResourceSwagger.GetJobsResponse.class) })
-    public String retrieveOne(@PathParam(SchedulerJobApiConstants.JOB_ID) @ApiParam(value = "jobId") final Long jobId,
+    @Operation(summary = "Retrieve a Job", description = "Returns the details of a Job.\n" + "\n" + "Example Requests:\n" + "\n" + "jobs/5")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SchedulerJobApiResourceSwagger.GetJobsResponse.class))) })
+    public String retrieveOne(@PathParam(SchedulerJobApiConstants.JOB_ID) @Parameter(description = "jobId") final Long jobId,
             @Context final UriInfo uriInfo) {
         this.context.authenticatedUser().validateHasReadPermission(SchedulerJobApiConstants.SCHEDULER_RESOURCE_NAME);
         final JobDetailData jobDetailData = this.schedulerJobRunnerReadService.retrieveOne(jobId);
@@ -117,15 +117,15 @@ public class SchedulerJobApiResource {
 
     @GET
     @Path("{" + SchedulerJobApiConstants.JOB_ID + "}/" + SchedulerJobApiConstants.JOB_RUN_HISTORY)
-    @ApiOperation(value = "Retrieve Job Run History", notes = "Example Requests:\n" + "\n" + "jobs/5/runhistory?offset=0&limit=200")
+    @Operation(summary = "Retrieve Job Run History", description = "Example Requests:\n" + "\n" + "jobs/5/runhistory?offset=0&limit=200")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = SchedulerJobApiResourceSwagger.GetJobsJobIDJobRunHistoryResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SchedulerJobApiResourceSwagger.GetJobsJobIDJobRunHistoryResponse.class))) })
     public String retrieveHistory(@Context final UriInfo uriInfo,
-            @PathParam(SchedulerJobApiConstants.JOB_ID) @ApiParam(value = "jobId") final Long jobId,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder) {
+            @PathParam(SchedulerJobApiConstants.JOB_ID) @Parameter(description = "jobId") final Long jobId,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder) {
         this.context.authenticatedUser().validateHasReadPermission(SchedulerJobApiConstants.SCHEDULER_RESOURCE_NAME);
         final SearchParameters searchParameters = SearchParameters.forPagination(offset, limit, orderBy, sortOrder);
         final Page<JobDetailHistoryData> jobhistoryDetailData = this.schedulerJobRunnerReadService.retrieveJobHistory(jobId,
@@ -137,10 +137,10 @@ public class SchedulerJobApiResource {
 
     @POST
     @Path("{" + SchedulerJobApiConstants.JOB_ID + "}")
-    @ApiOperation(value = "Run a Job", notes = "Manually Execute Specific Job.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "POST: jobs/1?command=executeJob") })
-    public Response executeJob(@PathParam(SchedulerJobApiConstants.JOB_ID) @ApiParam(value = "jobId") final Long jobId,
-            @QueryParam(SchedulerJobApiConstants.COMMAND) @ApiParam(value = "command") final String commandParam) {
+    @Operation(summary = "Run a Job", description = "Manually Execute Specific Job.")
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "POST: jobs/1?command=executeJob") })
+    public Response executeJob(@PathParam(SchedulerJobApiConstants.JOB_ID) @Parameter(description = "jobId") final Long jobId,
+            @QueryParam(SchedulerJobApiConstants.COMMAND) @Parameter(description = "command") final String commandParam) {
         // check the logged in user have permissions to execute scheduler jobs
         final boolean hasNotPermission = this.context.authenticatedUser().hasNotPermissionForAnyOf("ALL_FUNCTIONS", "EXECUTEJOB_SCHEDULER");
         if (hasNotPermission) {
@@ -159,12 +159,11 @@ public class SchedulerJobApiResource {
 
     @PUT
     @Path("{" + SchedulerJobApiConstants.JOB_ID + "}")
-    @ApiOperation(value = "Update a Job", notes = "Updates the details of a job.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = SchedulerJobApiResourceSwagger.PutJobsJobIDRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "") })
-    public String updateJobDetail(@PathParam(SchedulerJobApiConstants.JOB_ID) @ApiParam(value = "jobId") final Long jobId,
-            @ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(summary = "Update a Job", description = "Updates the details of a job.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = SchedulerJobApiResourceSwagger.PutJobsJobIDRequest.class)))
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "") })
+    public String updateJobDetail(@PathParam(SchedulerJobApiConstants.JOB_ID) @Parameter(description = "jobId") final Long jobId,
+            @Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateJobDetail(jobId) //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java
index 641debd..1224abe 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.jobs.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Date;
 import java.util.List;
 import org.apache.fineract.infrastructure.jobs.data.JobDetailHistoryData;
@@ -33,47 +32,47 @@ final class SchedulerJobApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetJobsResponse")
+    @Schema(description = "GetJobsResponse")
     public static final class GetJobsResponse {
 
         private GetJobsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long jobId;
-        @ApiModelProperty(example = "Update loan Summary")
+        @Schema(example = "Update loan Summary")
         public String displayName;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public Date nextRunTime;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String initializingError;
-        @ApiModelProperty(example = "0 0 22 1/1 * ? *")
+        @Schema(example = "0 0 22 1/1 * ? *")
         public String cronExpression;
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public boolean active;
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public boolean currentlyRunning;
         public JobDetailHistoryData lastRunHistory;
     }
 
-    @ApiModel(value = "PutJobsJobsIDRequest")
+    @Schema(description = "PutJobsJobsIDRequest")
     public static final class PutJobsJobIDRequest {
 
         private PutJobsJobIDRequest() {
 
         }
 
-        @ApiModelProperty(example = "Update loan Summary")
+        @Schema(example = "Update loan Summary")
         public String displayName;
-        @ApiModelProperty(example = "0 0 22 1/1 * ? *")
+        @Schema(example = "0 0 22 1/1 * ? *")
         public String cronExpression;
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public boolean active;
 
     }
 
-    @ApiModel(value = "GetJobsJobIDJobRunHistoryResponse")
+    @Schema(description = "GetJobsJobIDJobRunHistoryResponse")
     public static final class GetJobsJobIDJobRunHistoryResponse {
 
         private GetJobsJobIDJobRunHistoryResponse() {
@@ -84,19 +83,19 @@ final class SchedulerJobApiResourceSwagger {
 
             private JobDetailHistoryDataSwagger() {}
 
-            @ApiModelProperty(example = "1")
+            @Schema(example = "1")
             public Long version;
-            @ApiModelProperty(example = "Jul 16, 2013 12:00:00 PM")
+            @Schema(example = "Jul 16, 2013 12:00:00 PM")
             public Date jobRunStartTime;
-            @ApiModelProperty(example = "Jul 16, 2013 12:00:00 PM")
+            @Schema(example = "Jul 16, 2013 12:00:00 PM")
             public Date jobRunEndTime;
-            @ApiModelProperty(example = "success")
+            @Schema(example = "success")
             public String status;
-            @ApiModelProperty(example = "cron")
+            @Schema(example = "cron")
             public String triggerType;
         }
 
-        @ApiModelProperty(example = "8")
+        @Schema(example = "8")
         public int totalFilteredRecords;
         public List<JobDetailHistoryDataSwagger> pageItems;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResource.java
index 076fc65..577f47f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.infrastructure.reportmailingjob.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -59,9 +59,7 @@ import org.springframework.stereotype.Component;
 @Path("/" + ReportMailingJobConstants.REPORT_MAILING_JOB_RESOURCE_NAME)
 @Component
 @Scope("singleton")
-@Api(tags = { "Report Mailing Jobs" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Report Mailing Jobs", description = "This resource allows you to create a scheduled job that runs a report and sents it by email to specified email addresses.\n\nThe scheduled job can be configured to run once or on a regular basis (once a day, twice a week, etc)") })
+@Tag(name = "Report Mailing Jobs", description = "This resource allows you to create a scheduled job that runs a report and sents it by email to specified email addresses.\n\nThe scheduled job can be configured to run once or on a regular basis (once a day, twice a week, etc)")
 public class ReportMailingJobApiResource {
 
     private final PlatformSecurityContext platformSecurityContext;
@@ -86,14 +84,13 @@ public class ReportMailingJobApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a Report Mailing Job", notes = "Mandatory Fields: "
+    @Operation(summary = "Create a Report Mailing Job", description = "Mandatory Fields: "
             + "name, startDateTime, stretchyReportId, emailRecipients, emailSubject, emailMessage, emailAttachmentFileFormatId, recurrence, isActive\n"
             + "\n" + "Optional Fields: " + "description, stretchyReportParamMap")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ReportMailingJobApiResourceSwagger.PostReportMailingJobsRequest.class) })
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.PostReportMailingJobsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ReportMailingJobApiResourceSwagger.PostReportMailingJobsResponse.class) })
-    public String createReportMailingJob(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.PostReportMailingJobsResponse.class))) })
+    public String createReportMailingJob(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
         final CommandWrapper commandWrapper = new CommandWrapperBuilder()
                 .createReportMailingJob(ReportMailingJobConstants.REPORT_MAILING_JOB_ENTITY_NAME).withJson(apiRequestBodyAsJson).build();
 
@@ -106,13 +103,12 @@ public class ReportMailingJobApiResource {
     @Path("{entityId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Report Mailing Job\n", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ReportMailingJobApiResourceSwagger.PutReportMailingJobsRequest.class) })
+    @Operation(summary = "Update a Report Mailing Job\n", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.PutReportMailingJobsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ReportMailingJobApiResourceSwagger.PutReportMailingJobsResponse.class) })
-    public String updateReportMailingJob(@PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.PutReportMailingJobsResponse.class))) })
+    public String updateReportMailingJob(@PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
         final CommandWrapper commandWrapper = new CommandWrapperBuilder()
                 .updateReportMailingJob(ReportMailingJobConstants.REPORT_MAILING_JOB_ENTITY_NAME, entityId).withJson(apiRequestBodyAsJson)
                 .build();
@@ -126,13 +122,12 @@ public class ReportMailingJobApiResource {
     @Path("{entityId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete a Report Mailing Job", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ReportMailingJobApiResourceSwagger.DeleteReportMailingJobsRequest.class) })
+    @Operation(summary = "Delete a Report Mailing Job", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.DeleteReportMailingJobsRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ReportMailingJobApiResourceSwagger.DeleteReportMailingJobsResponse.class) })
-    public String deleteReportMailingJob(@PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.DeleteReportMailingJobsResponse.class))) })
+    public String deleteReportMailingJob(@PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
         final CommandWrapper commandWrapper = new CommandWrapperBuilder()
                 .deleteReportMailingJob(ReportMailingJobConstants.REPORT_MAILING_JOB_ENTITY_NAME, entityId).withJson(apiRequestBodyAsJson)
                 .build();
@@ -146,11 +141,11 @@ public class ReportMailingJobApiResource {
     @Path("{entityId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Report Mailing Job", notes = "Example Requests:\n" + "\n" + "reportmailingjobs/1\n" + "\n" + "\n"
+    @Operation(summary = "Retrieve a Report Mailing Job", description = "Example Requests:\n" + "\n" + "reportmailingjobs/1\n" + "\n" + "\n"
             + "reportmailingjobs/1?template=true")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ReportMailingJobApiResourceSwagger.GetReportMailingJobsResponse.class) })
-    public String retrieveReportMailingJob(@PathParam("entityId") @ApiParam(value = "entityId") final Long entityId,
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.GetReportMailingJobsResponse.class))) })
+    public String retrieveReportMailingJob(@PathParam("entityId") @Parameter(description = "entityId") final Long entityId,
             @Context final UriInfo uriInfo) {
         this.platformSecurityContext.authenticatedUser()
                 .validateHasReadPermission(ReportMailingJobConstants.REPORT_MAILING_JOB_ENTITY_NAME);
@@ -172,10 +167,10 @@ public class ReportMailingJobApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Report Mailing Job Details Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for report mailing job applications. The template data returned consists of any or all of:\n"
-            + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "reportmailingjobs/template")
+    @Operation(summary = "Retrieve Report Mailing Job Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for report mailing job applications. The template data returned consists of any or all of:\n"
+            + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "reportmailingjobs/template")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ReportMailingJobApiResourceSwagger.GetReportMailingJobsTemplate.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.GetReportMailingJobsTemplate.class))) })
     public String retrieveReportMailingJobTemplate(@Context final UriInfo uriInfo) {
         this.platformSecurityContext.authenticatedUser()
                 .validateHasReadPermission(ReportMailingJobConstants.REPORT_MAILING_JOB_ENTITY_NAME);
@@ -191,14 +186,14 @@ public class ReportMailingJobApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Report Mailing Jobs", notes = "Example Requests:\n" + "\n" + "reportmailingjobs")
+    @Operation(summary = "List Report Mailing Jobs", description = "Example Requests:\n" + "\n" + "reportmailingjobs")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ReportMailingJobApiResourceSwagger.GetReportMailingJobsResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ReportMailingJobApiResourceSwagger.GetReportMailingJobsResponse.class)))) })
     public String retrieveAllReportMailingJobs(@Context final UriInfo uriInfo,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder) {
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder) {
         this.platformSecurityContext.authenticatedUser()
                 .validateHasReadPermission(ReportMailingJobConstants.REPORT_MAILING_JOB_ENTITY_NAME);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java
index 189ca90..93349bf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.reportmailingjob.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.infrastructure.dataqueries.data.ReportData;
@@ -35,120 +34,120 @@ final class ReportMailingJobApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetReportMailingJobsTemplate")
+    @Schema(description = "GetReportMailingJobsTemplate")
     public static final class GetReportMailingJobsTemplate {
 
         private GetReportMailingJobsTemplate() {
 
         }
 
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean isActive;
         public List<EnumOptionData> emailAttachmentFileFormatOptions;
         public List<EnumOptionData> stretchyReportParamDateOptions;
     }
 
-    @ApiModel(value = "GetReportMailingJobsResponse")
+    @Schema(description = "GetReportMailingJobsResponse")
     public static final class GetReportMailingJobsResponse {
 
         private GetReportMailingJobsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String name;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String description;
-        @ApiModelProperty(example = "1469627093000")
+        @Schema(example = "1469627093000")
         public DateTime startDateTime;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String recurrence;
         public ReportMailingJobTimelineData timeline;
-        @ApiModelProperty(example = "info@musonisystem.com")
+        @Schema(example = "info@musonisystem.com")
         public String emailRecipients;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String emailSubject;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String emailMessage;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public EnumOptionData emailAttachmentFileFormat;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public ReportData stretchyReport;
-        @ApiModelProperty(example = "{\"startDate\":\"2016-07-01\",\"endDate\":\"2016-08-02\",\"selectOffice\":\"1\",\"environementUrl\":\"environementUrl\"}")
+        @Schema(example = "{\"startDate\":\"2016-07-01\",\"endDate\":\"2016-08-02\",\"selectOffice\":\"1\",\"environementUrl\":\"environementUrl\"}")
         public String stretchyReportParamMap;
-        @ApiModelProperty(example = "1469627093000")
+        @Schema(example = "1469627093000")
         public DateTime nextRunDateTime;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Integer numberOfRuns;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean isActive;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long runAsUserId;
     }
 
-    @ApiModel(value = "PostReportMailingJobsRequest")
+    @Schema(description = "PostReportMailingJobsRequest")
     public static final class PostReportMailingJobsRequest {
 
         private PostReportMailingJobsRequest() {
 
         }
 
-        @ApiModelProperty(example = "en_GB")
+        @Schema(example = "en_GB")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy HH:mm:ss")
+        @Schema(example = "dd-MM-yyyy HH:mm:ss")
         public String dateFormat;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String name;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String description;
-        @ApiModelProperty(example = "1469627093000")
+        @Schema(example = "1469627093000")
         public DateTime startDateTime;
-        @ApiModelProperty(example = "120")
+        @Schema(example = "120")
         public Long stretchyReportId;
-        @ApiModelProperty(example = "info@musonisystem.com")
+        @Schema(example = "info@musonisystem.com")
         public String emailRecipients;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String emailSubject;
-        @ApiModelProperty(example = "Client Numbers Report")
+        @Schema(example = "Client Numbers Report")
         public String emailMessage;
-        @ApiModelProperty(example = "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR")
+        @Schema(example = "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR")
         public String recurrence;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean isActive;
-        @ApiModelProperty(example = "{\"startDate\":\"2016-07-01\",\"endDate\":\"2016-08-02\",\"selectOffice\":\"1\",\"environementUrl\":\"environementUrl\"}")
+        @Schema(example = "{\"startDate\":\"2016-07-01\",\"endDate\":\"2016-08-02\",\"selectOffice\":\"1\",\"environementUrl\":\"environementUrl\"}")
         public String stretchyReportParamMap;
 
     }
 
-    @ApiModel(value = "PostReportMailingJobsResponse")
+    @Schema(description = "PostReportMailingJobsResponse")
     public static final class PostReportMailingJobsResponse {
 
         private PostReportMailingJobsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutReportMailingJobsRequest")
+    @Schema(description = "PutReportMailingJobsRequest")
     public static final class PutReportMailingJobsRequest {
 
         private PutReportMailingJobsRequest() {
 
         }
 
-        @ApiModelProperty(example = "en_GB")
+        @Schema(example = "en_GB")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy HH:mm:ss")
+        @Schema(example = "dd-MM-yyyy HH:mm:ss")
         public String dateFormat;
-        @ApiModelProperty(example = "10-08-2016 23:30:00")
+        @Schema(example = "10-08-2016 23:30:00")
         public DateTime startDateTime;
     }
 
-    @ApiModel(value = "PutReportMailingJobsResponse")
+    @Schema(description = "PutReportMailingJobsResponse")
     public static final class PutReportMailingJobsResponse {
 
         private PutReportMailingJobsResponse() {
@@ -159,16 +158,16 @@ final class ReportMailingJobApiResourceSwagger {
 
             private PutReportMailingJobsResponseChanges() {}
 
-            @ApiModelProperty(example = "10-08-2016 23:30:00")
+            @Schema(example = "10-08-2016 23:30:00")
             public DateTime startDateTime;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
         public PutReportMailingJobsResponseChanges changes;
     }
 
-    @ApiModel(value = "DeleteReportMailingJobsRequest ")
+    @Schema(description = "DeleteReportMailingJobsRequest ")
     public static final class DeleteReportMailingJobsRequest {
 
         private DeleteReportMailingJobsRequest() {
@@ -176,14 +175,14 @@ final class ReportMailingJobApiResourceSwagger {
         }
     }
 
-    @ApiModel(value = "DeleteReportMailingJobsResponse")
+    @Schema(description = "DeleteReportMailingJobsResponse")
     public static final class DeleteReportMailingJobsResponse {
 
         private DeleteReportMailingJobsResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResource.java
index 7bd2e5a..9d9cb5b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResource.java
@@ -18,13 +18,13 @@
  */
 package org.apache.fineract.infrastructure.reportmailingjob.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -47,8 +47,8 @@ import org.springframework.stereotype.Component;
 
 @Path("/" + ReportMailingJobConstants.REPORT_MAILING_JOB_RUN_HISTORY_RESOURCE_NAME)
 @Component
-@Api(tags = { "List Report Mailing Job History" })
-@SwaggerDefinition(tags = { @Tag(name = "List Report Mailing Job History", description = "") })
+
+@Tag(name = "List Report Mailing Job History", description = "")
 public class ReportMailingJobRunHistoryApiResource {
 
     private final PlatformSecurityContext platformSecurityContext;
@@ -70,15 +70,16 @@ public class ReportMailingJobRunHistoryApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Report Mailing Job History", notes = "The list capability of report mailing job history can support pagination and sorting.\n"
+    @Operation(summary = "List Report Mailing Job History", description = "The list capability of report mailing job history can support pagination and sorting.\n"
             + "\n" + "Example Requests:\n" + "\n" + "reportmailingjobrunhistory/1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = ReportMailingJobRunHistoryData.class) })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ReportMailingJobRunHistoryData.class))) })
     public String retrieveAllByReportMailingJobId(@Context final UriInfo uriInfo,
-            @QueryParam("reportMailingJobId") @ApiParam(value = "reportMailingJobId") final Long reportMailingJobId,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder) {
+            @QueryParam("reportMailingJobId") @Parameter(description = "reportMailingJobId") final Long reportMailingJobId,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder) {
         this.platformSecurityContext.authenticatedUser()
                 .validateHasReadPermission(ReportMailingJobConstants.REPORT_MAILING_JOB_ENTITY_NAME);
         final SearchParameters searchParameters = SearchParameters.fromReportMailingJobRunHistory(offset, limit, orderBy, sortOrder);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResourceSwagger.java
index 3e0ce98..c864787 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobRunHistoryApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.reportmailingjob.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.joda.time.DateTime;
 
 /**
@@ -31,26 +30,26 @@ final class ReportMailingJobRunHistoryApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetReportMailingJobRunHistoryResponse")
+    @Schema(description = "GetReportMailingJobRunHistoryResponse")
     public static final class GetReportMailingJobRunHistoryResponse {
 
         private GetReportMailingJobRunHistoryResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long reportMailingJobId;
-        @ApiModelProperty(example = "1469627093050")
+        @Schema(example = "1469627093050")
         public DateTime startDateTime;
-        @ApiModelProperty(example = "1469627093050")
+        @Schema(example = "1469627093050")
         public DateTime endDateTime;
-        @ApiModelProperty(example = "success")
+        @Schema(example = "success")
         public String status;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String errorMessage;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String errorLog;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResource.java
index d3ed864..977f442 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResource.java
@@ -20,12 +20,12 @@ package org.apache.fineract.infrastructure.security.api;
 
 import com.google.gson.Gson;
 import com.sun.jersey.core.util.Base64;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -58,9 +58,7 @@ import org.springframework.stereotype.Component;
 @Scope("singleton")
 @Profile("basicauth")
 @Path("/authentication")
-@Api(tags = { "Authentication HTTP Basic" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Authentication HTTP Basic", description = "An API capability that allows client applications to verify authentication details using HTTP Basic Authentication.") })
+@Tag(name = "Authentication HTTP Basic", description = "An API capability that allows client applications to verify authentication details using HTTP Basic Authentication.")
 public class AuthenticationApiResource {
 
     public static class AuthenticateRequest {
@@ -88,9 +86,10 @@ public class AuthenticationApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Verify authentication", notes = "Authenticates the credentials provided and returns the set roles and permissions allowed.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = AuthenticationApiResourceSwagger.PostAuthenticationResponse.class),
-            @ApiResponse(code = 400, message = "Unauthenticated. Please login") })
+    @Operation(summary = "Verify authentication", description = "Authenticates the credentials provided and returns the set roles and permissions allowed.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = AuthenticationApiResourceSwagger.PostAuthenticationResponse.class))),
+            @ApiResponse(responseCode = "400", description = "Unauthenticated. Please login") })
     public String authenticate(final String apiRequestBodyAsJson) {
         // TODO FINERACT-819: sort out Jersey so JSON conversion does not have
         // to be done explicitly via GSON here, but implicit by arg
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResourceSwagger.java
index 7b511fe..efc5559 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/AuthenticationApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.security.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.useradministration.data.RoleData;
@@ -33,32 +32,32 @@ final class AuthenticationApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PostAuthenticationResponse")
+    @Schema(description = "PostAuthenticationResponse")
     public static final class PostAuthenticationResponse {
 
         private PostAuthenticationResponse() {
 
         }
 
-        @ApiModelProperty(example = "mifos")
+        @Schema(example = "mifos")
         public String username;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long userId;
-        @ApiModelProperty(example = "bWlmb3M6cGFzc3dvcmQ=")
+        @Schema(example = "bWlmb3M6cGFzc3dvcmQ=")
         public String base64EncodedAuthenticationKey;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean authenticated;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long staffId;
-        @ApiModelProperty(example = "Director, Program")
+        @Schema(example = "Director, Program")
         public String staffDisplayName;
         public EnumOptionData organisationalRole;
         public Collection<RoleData> roles;
-        @ApiModelProperty(example = "ALL_FUNCTIONS")
+        @Schema(example = "ALL_FUNCTIONS")
         public Collection<String> permissions;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResource.java
index 3dd768b..d6b7c97 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResource.java
@@ -18,13 +18,13 @@
  */
 package org.apache.fineract.infrastructure.security.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Set;
@@ -58,8 +58,8 @@ import org.springframework.stereotype.Component;
 @Component
 @Profile("oauth")
 @Scope("singleton")
-@Api(tags = { "Fetch authenticated user details" })
-@SwaggerDefinition(tags = { @Tag(name = "Fetch authenticated user details", description = "") })
+
+@Tag(name = "Fetch authenticated user details", description = "")
 @SuppressWarnings("deprecation") // TODO FINERACT-1012
 public class UserDetailsApiResource {
 
@@ -80,9 +80,11 @@ public class UserDetailsApiResource {
 
     @GET
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Fetch authenticated user details\n", notes = "checks the Authentication and returns the set roles and permissions allowed.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = UserDetailsApiResourceSwagger.GetUserDetailsResponse.class) })
-    public String fetchAuthenticatedUserData(@QueryParam("access_token") @ApiParam(value = "access_token") final String accessToken) {
+    @Operation(summary = "Fetch authenticated user details\n", description = "checks the Authentication and returns the set roles and permissions allowed.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = UserDetailsApiResourceSwagger.GetUserDetailsResponse.class))) })
+    public String fetchAuthenticatedUserData(
+            @QueryParam("access_token") @Parameter(description = "access_token") final String accessToken) {
 
         final Authentication authentication = this.tokenServices.loadAuthentication(accessToken);
         if (authentication.isAuthenticated()) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResourceSwagger.java
index 72cd272..5b6fabb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/api/UserDetailsApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.security.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.useradministration.data.RoleData;
@@ -33,32 +32,32 @@ final class UserDetailsApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetUserDetailsResponse")
+    @Schema(description = "GetUserDetailsResponse")
     public static final class GetUserDetailsResponse {
 
         private GetUserDetailsResponse() {
 
         }
 
-        @ApiModelProperty(example = "mifos")
+        @Schema(example = "mifos")
         public String username;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long userId;
-        @ApiModelProperty(example = "bWlmb3M6cGFzc3dvcmQ=")
+        @Schema(example = "bWlmb3M6cGFzc3dvcmQ=")
         public String accessToken;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public boolean authenticated;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long staffId;
-        @ApiModelProperty(example = "mifosStaffDisplayName")
+        @Schema(example = "mifosStaffDisplayName")
         public String staffDisplayName;
         public EnumOptionData organisationalRole;
         public Collection<RoleData> roles;
-        @ApiModelProperty(example = "ALL_FUNCTIONS")
+        @Schema(example = "ALL_FUNCTIONS")
         public Collection<String> permissions;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/api/SmsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/api/SmsApiResource.java
index 3d0025f..c071345 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/api/SmsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/api/SmsApiResource.java
@@ -18,7 +18,6 @@
  */
 package org.apache.fineract.infrastructure.sms.api;
 
-import io.swagger.annotations.Api;
 import java.util.Collection;
 import java.util.Date;
 import javax.ws.rs.Consumes;
@@ -55,7 +54,7 @@ import org.springframework.stereotype.Component;
 @Produces({ MediaType.APPLICATION_JSON })
 @Component
 @Scope("singleton")
-@Api(value = "SMS", description = "")
+
 public class SmsApiResource {
 
     private final String resourceNameForPermissions = "SMS";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiResource.java
index a5aa6a7..9f6dc57 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiResource.java
@@ -18,7 +18,6 @@
  */
 package org.apache.fineract.infrastructure.survey.api;
 
-import io.swagger.annotations.Api;
 import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -45,7 +44,7 @@ import org.springframework.stereotype.Component;
 @Path("/likelihood")
 @Component
 @Scope("singleton")
-@Api(value = "Likelihood")
+
 public class LikelihoodApiResource {
 
     private final DefaultToApiJsonSerializer<LikelihoodData> toApiJsonSerializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiResource.java
index 3aaca69..ee098b2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiResource.java
@@ -18,7 +18,6 @@
  */
 package org.apache.fineract.infrastructure.survey.api;
 
-import io.swagger.annotations.Api;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -37,7 +36,7 @@ import org.springframework.stereotype.Component;
 @Path("/povertyLine")
 @Component
 @Scope("singleton")
-@Api(value = "Poverty Line")
+
 public class PovertyLineApiResource {
 
     private final DefaultToApiJsonSerializer<PpiPovertyLineData> toApiJsonSerializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResource.java
index 9d8b463..5733527 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResource.java
@@ -18,13 +18,14 @@
  */
 package org.apache.fineract.infrastructure.survey.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import java.util.List;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -57,7 +58,7 @@ import org.springframework.stereotype.Component;
 @Path("/survey")
 @Component
 @Scope("singleton")
-@Api(value = "Survey", description = "")
+
 public class SurveyApiResource {
 
     private final DefaultToApiJsonSerializer<SurveyData> toApiJsonSerializer;
@@ -84,9 +85,9 @@ public class SurveyApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve surveys", notes = "Retrieve surveys. This allows to retrieve the list of survey tables registered .")
+    @Operation(summary = "Retrieve surveys", description = "Retrieve surveys. This allows to retrieve the list of survey tables registered .")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = SurveyApiResourceSwagger.GetSurveyResponse.class, responseContainer = "List") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = SurveyApiResourceSwagger.GetSurveyResponse.class)))) })
     public String retrieveSurveys() {
 
         this.context.authenticatedUser().validateHasReadPermission(SurveyApiConstants.SURVEY_RESOURCE_NAME);
@@ -99,9 +100,10 @@ public class SurveyApiResource {
     @Path("{surveyName}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve survey", notes = "Lists a registered survey table details and the Apache Fineract Core application table they are registered to.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = SurveyApiResourceSwagger.GetSurveyResponse.class) })
-    public String retrieveSurvey(@PathParam("surveyName") @ApiParam(value = "surveyName") final String surveyName) {
+    @Operation(summary = "Retrieve survey", description = "Lists a registered survey table details and the Apache Fineract Core application table they are registered to.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SurveyApiResourceSwagger.GetSurveyResponse.class))) })
+    public String retrieveSurvey(@PathParam("surveyName") @Parameter(description = "surveyName") final String surveyName) {
 
         this.context.authenticatedUser().validateHasReadPermission(SurveyApiConstants.SURVEY_RESOURCE_NAME);
 
@@ -115,14 +117,14 @@ public class SurveyApiResource {
     @Path("{surveyName}/{apptableId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create an entry in the survey table", notes = "Insert and entry in a survey table (full fill the survey)." + "\n"
-            + "\n" + "Refer Link for sample Body:  [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#survey_create ] ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = SurveyApiResourceSwagger.PostSurveySurveyNameApptableIdRequest.class) })
+    @Operation(summary = "Create an entry in the survey table", description = "Insert and entry in a survey table (full fill the survey)."
+            + "\n" + "\n"
+            + "Refer Link for sample Body:  [ https://demo.fineract.dev/fineract-provider/api-docs/apiLive.htm#survey_create ] ")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = SurveyApiResourceSwagger.PostSurveySurveyNameApptableIdRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = SurveyApiResourceSwagger.PostSurveySurveyNameApptableIdResponse.class) })
-    public String createDatatableEntry(@PathParam("surveyName") @ApiParam(value = "surveyName") final String datatable,
-            @PathParam("apptableId") @ApiParam(value = "apptableId") final Long apptableId, final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = SurveyApiResourceSwagger.PostSurveySurveyNameApptableIdResponse.class))) })
+    public String createDatatableEntry(@PathParam("surveyName") @Parameter(description = "surveyName") final String datatable,
+            @PathParam("apptableId") @Parameter(description = "apptableId") final Long apptableId, final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .fullFilSurvey(datatable, apptableId) //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java
index 34709a8..1f34c05 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.infrastructure.survey.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.fineract.infrastructure.dataqueries.data.ResultsetColumnHeaderData;
 import org.joda.time.DateTime;
@@ -33,7 +32,7 @@ final class SurveyApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetSurveyResponse")
+    @Schema(description = "GetSurveyResponse")
     public static final class GetSurveyResponse {
 
         private GetSurveyResponse() {
@@ -46,65 +45,65 @@ final class SurveyApiResourceSwagger {
 
             }
 
-            @ApiModelProperty(example = "m_client")
+            @Schema(example = "m_client")
             public String applicationTableName;
-            @ApiModelProperty(example = "ppi_kenya_2005")
+            @Schema(example = "ppi_kenya_2005")
             public String registeredTableName;
             public List<ResultsetColumnHeaderData> columnHeaderData;
         }
 
         public GetSurveyResponseDatatableData datatableData;
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public boolean enabled;
     }
 
-    @ApiModel(value = "PostSurveySurveyNameApptableIdRequest")
+    @Schema(description = "PostSurveySurveyNameApptableIdRequest")
     public static final class PostSurveySurveyNameApptableIdRequest {
 
         private PostSurveySurveyNameApptableIdRequest() {
 
         }
 
-        @ApiModelProperty(example = "167")
+        @Schema(example = "167")
         public Long ppi_household_members_cd_q1_householdmembers;
-        @ApiModelProperty(example = "174")
+        @Schema(example = "174")
         public Long ppi_highestschool_cd_q2_highestschool;
-        @ApiModelProperty(example = "180")
+        @Schema(example = "180")
         public Long ppi_businessoccupation_cd_q3_businessoccupation;
-        @ApiModelProperty(example = "184")
+        @Schema(example = "184")
         public Long ppi_habitablerooms_cd_q4_habitablerooms;
-        @ApiModelProperty(example = "188")
+        @Schema(example = "188")
         public Long ppi_floortype_cd_q5_floortype;
-        @ApiModelProperty(example = "190")
+        @Schema(example = "190")
         public Long ppi_lightingsource_cd_q6_lightingsource;
-        @ApiModelProperty(example = "193")
+        @Schema(example = "193")
         public Long ppi_irons_cd_q7_irons;
-        @ApiModelProperty(example = "195")
+        @Schema(example = "195")
         public Long ppi_mosquitonets_cd_q8_mosquitonets;
-        @ApiModelProperty(example = "198")
+        @Schema(example = "198")
         public Long ppi_towels_cd_q9_towels;
-        @ApiModelProperty(example = "201")
+        @Schema(example = "201")
         public Long ppi_fryingpans_cd_q10_fryingpans;
-        @ApiModelProperty(example = "2014-12-02 20:30:00")
+        @Schema(example = "2014-12-02 20:30:00")
         public DateTime Date;
-        @ApiModelProperty(example = "Y-m-d H:i:s")
+        @Schema(example = "Y-m-d H:i:s")
         public DateTime dateFormat;
-        @ApiModelProperty(example = "en_GB")
+        @Schema(example = "en_GB")
         public String locale;
     }
 
-    @ApiModel(value = "PostSurveySurveyNameApptableIdResponse")
+    @Schema(description = "PostSurveySurveyNameApptableIdResponse")
     public static final class PostSurveySurveyNameApptableIdResponse {
 
         private PostSurveySurveyNameApptableIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long officeId;
-        @ApiModelProperty(example = "87")
+        @Schema(example = "87")
         public Long clientId;
-        @ApiModelProperty(example = "87")
+        @Schema(example = "87")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/api/InteropApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/api/InteropApiResource.java
index 2e0abe0..10684bd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/api/InteropApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/api/InteropApiResource.java
@@ -20,15 +20,14 @@ package org.apache.fineract.interoperation.api;
 
 import static org.apache.fineract.interoperation.util.InteropUtil.ENTITY_NAME_QUOTE;
 import static org.apache.fineract.interoperation.util.InteropUtil.ENTITY_NAME_REQUEST;
-import static org.apache.fineract.interoperation.util.InteropUtil.ROOT_PATH;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+
+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;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import javax.ws.rs.Consumes;
@@ -71,7 +70,7 @@ import org.springframework.stereotype.Component;
 @Path("/interoperation") // api/v1/
 @Component
 @Scope
-@Api(value = ROOT_PATH, description = "")
+
 public class InteropApiResource {
 
     private PlatformSecurityContext context;
@@ -97,8 +96,8 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("health")
-    @ApiOperation(value = "Query Interoperation Health Request", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK") })
+    @Operation(summary = "Query Interoperation Health Request", description = "")
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "OK") })
     public String health(@Context UriInfo uriInfo) {
         return "OK";
     }
@@ -107,9 +106,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("accounts/{accountId}")
-    @ApiOperation(value = "Query Interoperation Account details", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropAccountData.class) })
-    public String getAccountDetails(@PathParam("accountId") @ApiParam(value = "accountId") String accountId, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query Interoperation Account details", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropAccountData.class))) })
+    public String getAccountDetails(@PathParam("accountId") @Parameter(description = "accountId") String accountId,
+            @Context UriInfo uriInfo) {
         InteropAccountData result = interopService.getAccountDetails(accountId);
         ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
 
@@ -120,13 +121,15 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("accounts/{accountId}/transactions")
-    @ApiOperation(value = "Query transactions by Account Id", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropTransactionsData.class) })
-    public String getAccountTransactions(@PathParam("accountId") @ApiParam(value = "accountId") String accountId,
-            @DefaultValue("true") @QueryParam("debit") @ApiParam(value = "debit") boolean debit,
-            @DefaultValue("false") @QueryParam("credit") @ApiParam(value = "credit") boolean credit,
-            @QueryParam("fromBookingDateTime") @ApiParam(value = "fromBookingDateTime") String fromBookingDateTime,
-            @QueryParam("toBookingDateTime") @ApiParam(value = "toBookingDateTime") String toBookingDateTime, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query transactions by Account Id", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropTransactionsData.class))) })
+    public String getAccountTransactions(@PathParam("accountId") @Parameter(description = "accountId") String accountId,
+            @DefaultValue("true") @QueryParam("debit") @Parameter(description = "debit") boolean debit,
+            @DefaultValue("false") @QueryParam("credit") @Parameter(description = "credit") boolean credit,
+            @QueryParam("fromBookingDateTime") @Parameter(description = "fromBookingDateTime") String fromBookingDateTime,
+            @QueryParam("toBookingDateTime") @Parameter(description = "toBookingDateTime") String toBookingDateTime,
+            @Context UriInfo uriInfo) {
         LocalDateTime transactionsFrom = fromBookingDateTime == null ? null
                 : LocalDateTime.parse(fromBookingDateTime, DateTimeFormatter.ISO_LOCAL_DATE_TIME);
         LocalDateTime transactionsTo = toBookingDateTime == null ? null
@@ -142,9 +145,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("accounts/{accountId}/identifiers")
-    @ApiOperation(value = "Query Interoperation secondary identifiers by Account Id", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropIdentifiersResponseData.class) })
-    public String getAccountIdentifiers(@PathParam("accountId") @ApiParam(value = "accountId") String accountId, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query Interoperation secondary identifiers by Account Id", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropIdentifiersResponseData.class))) })
+    public String getAccountIdentifiers(@PathParam("accountId") @Parameter(description = "accountId") String accountId,
+            @Context UriInfo uriInfo) {
         InteropIdentifiersResponseData result = interopService.getAccountIdentifiers(accountId);
         ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
 
@@ -155,10 +160,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("parties/{idType}/{idValue}")
-    @ApiOperation(value = "Query Interoperation Account by secondary identifier", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropIdentifierAccountResponseData.class) })
-    public String getAccountByIdentifier(@PathParam("idType") @ApiParam(value = "idType") InteropIdentifierType idType,
-            @PathParam("idValue") @ApiParam(value = "idValue") String idValue, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query Interoperation Account by secondary identifier", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropIdentifierAccountResponseData.class))) })
+    public String getAccountByIdentifier(@PathParam("idType") @Parameter(description = "idType") InteropIdentifierType idType,
+            @PathParam("idValue") @Parameter(description = "idValue") String idValue, @Context UriInfo uriInfo) {
         InteropIdentifierAccountResponseData result = interopService.getAccountByIdentifier(idType, idValue, null);
         ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
 
@@ -169,11 +175,12 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("parties/{idType}/{idValue}/{subIdOrType}")
-    @ApiOperation(value = "Query Interoperation Account by secondary identifier", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropIdentifierAccountResponseData.class) })
-    public String getAccountByIdentifier(@PathParam("idType") @ApiParam(value = "idType") InteropIdentifierType idType,
-            @PathParam("idValue") @ApiParam(value = "idValue") String idValue,
-            @PathParam("subIdOrType") @ApiParam(value = "subIdOrType") String subIdOrType, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query Interoperation Account by secondary identifier", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropIdentifierAccountResponseData.class))) })
+    public String getAccountByIdentifier(@PathParam("idType") @Parameter(description = "idType") InteropIdentifierType idType,
+            @PathParam("idValue") @Parameter(description = "idValue") String idValue,
+            @PathParam("subIdOrType") @Parameter(description = "subIdOrType") String subIdOrType, @Context UriInfo uriInfo) {
         InteropIdentifierAccountResponseData result = interopService.getAccountByIdentifier(idType, idValue, subIdOrType);
         ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
 
@@ -184,12 +191,12 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("parties/{idType}/{idValue}")
-    @ApiOperation(value = "Interoperation Identifier registration", httpMethod = "POST", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = InteropIdentifierRequestData.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropIdentifierAccountResponseData.class) })
-    public String registerAccountIdentifier(@PathParam("idType") @ApiParam(value = "idType") InteropIdentifierType idType,
-            @PathParam("idValue") @ApiParam(value = "idValue") String idValue, @ApiParam(hidden = true) String identifierJson,
+    @Operation(summary = "Interoperation Identifier registration", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = InteropIdentifierRequestData.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropIdentifierAccountResponseData.class))) })
+    public String registerAccountIdentifier(@PathParam("idType") @Parameter(description = "idType") InteropIdentifierType idType,
+            @PathParam("idValue") @Parameter(description = "idValue") String idValue, @Parameter(hidden = true) String identifierJson,
             @Context UriInfo uriInfo) {
         CommandWrapper commandRequest = new InteropWrapperBuilder().registerAccountIdentifier(idType, idValue, null)
                 .withJson(identifierJson).build();
@@ -205,14 +212,14 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("parties/{idType}/{idValue}/{subIdOrType}")
-    @ApiOperation(value = "Interoperation Identifier registration", httpMethod = "POST", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = InteropIdentifierRequestData.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropIdentifierAccountResponseData.class) })
-    public String registerAccountIdentifier(@PathParam("idType") @ApiParam(value = "idType") InteropIdentifierType idType,
-            @PathParam("idValue") @ApiParam(value = "idValue") String idValue,
-            @PathParam("subIdOrType") @ApiParam(value = "subIdOrType") String subIdOrType, @ApiParam(hidden = true) String identifierJson,
-            @Context UriInfo uriInfo) {
+    @Operation(summary = "Interoperation Identifier registration", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = InteropIdentifierRequestData.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropIdentifierAccountResponseData.class))) })
+    public String registerAccountIdentifier(@PathParam("idType") @Parameter(description = "idType") InteropIdentifierType idType,
+            @PathParam("idValue") @Parameter(description = "idValue") String idValue,
+            @PathParam("subIdOrType") @Parameter(description = "subIdOrType") String subIdOrType,
+            @Parameter(hidden = true) String identifierJson, @Context UriInfo uriInfo) {
         CommandWrapper commandRequest = new InteropWrapperBuilder().registerAccountIdentifier(idType, idValue, subIdOrType)
                 .withJson(identifierJson).build();
 
@@ -227,12 +234,12 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("parties/{idType}/{idValue}")
-    @ApiOperation(value = "Allow Interoperation Identifier registration", httpMethod = "DELETE", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = InteropIdentifierRequestData.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropIdentifierAccountResponseData.class) })
-    public String deleteAccountIdentifier(@PathParam("idType") @ApiParam(value = "idType") InteropIdentifierType idType,
-            @PathParam("idValue") @ApiParam(value = "idValue") String idValue, @Context UriInfo uriInfo) {
+    @Operation(summary = "Allow Interoperation Identifier registration", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = InteropIdentifierRequestData.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropIdentifierAccountResponseData.class))) })
+    public String deleteAccountIdentifier(@PathParam("idType") @Parameter(description = "idType") InteropIdentifierType idType,
+            @PathParam("idValue") @Parameter(description = "idValue") String idValue, @Context UriInfo uriInfo) {
         CommandWrapper commandRequest = new InteropWrapperBuilder().deleteAccountIdentifier(idType, idValue, null).build();
 
         InteropIdentifierAccountResponseData result = (InteropIdentifierAccountResponseData) commandsSourceService
@@ -246,13 +253,13 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("parties/{idType}/{idValue}/{subIdOrType}")
-    @ApiOperation(value = "Allow Interoperation Identifier registration", httpMethod = "DELETE", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = InteropIdentifierRequestData.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropIdentifierAccountResponseData.class) })
-    public String deleteAccountIdentifier(@PathParam("idType") @ApiParam(value = "idType") InteropIdentifierType idType,
-            @PathParam("idValue") @ApiParam(value = "idValue") String idValue,
-            @PathParam("subIdOrType") @ApiParam(value = "subIdOrType") String subIdOrType, @Context UriInfo uriInfo) {
+    @Operation(summary = "Allow Interoperation Identifier registration", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = InteropIdentifierRequestData.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropIdentifierAccountResponseData.class))) })
+    public String deleteAccountIdentifier(@PathParam("idType") @Parameter(description = "idType") InteropIdentifierType idType,
+            @PathParam("idValue") @Parameter(description = "idValue") String idValue,
+            @PathParam("subIdOrType") @Parameter(description = "subIdOrType") String subIdOrType, @Context UriInfo uriInfo) {
         CommandWrapper commandRequest = new InteropWrapperBuilder().deleteAccountIdentifier(idType, idValue, subIdOrType).build();
 
         InteropIdentifierAccountResponseData result = (InteropIdentifierAccountResponseData) commandsSourceService
@@ -266,10 +273,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("transactions/{transactionCode}/requests/{requestCode}")
-    @ApiOperation(value = "Query Interoperation Transaction Request", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropTransactionRequestResponseData.class) })
-    public String getTransactionRequest(@PathParam("transactionCode") @ApiParam(value = "transactionCode") String transactionCode,
-            @PathParam("requestCode") @ApiParam(value = "requestCode") String requestCode, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query Interoperation Transaction Request", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropTransactionRequestResponseData.class))) })
+    public String getTransactionRequest(@PathParam("transactionCode") @Parameter(description = "transactionCode") String transactionCode,
+            @PathParam("requestCode") @Parameter(description = "requestCode") String requestCode, @Context UriInfo uriInfo) {
         context.authenticatedUser().validateHasReadPermission(ENTITY_NAME_REQUEST);
 
         InteropTransactionRequestResponseData result = interopService.getTransactionRequest(transactionCode, requestCode);
@@ -282,11 +290,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("requests")
-    @ApiOperation(value = "Allow Interoperation Transaction Request", httpMethod = "POST", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = InteropTransactionRequestData.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropTransactionRequestResponseData.class) })
-    public String createTransactionRequest(@ApiParam(hidden = true) String quotesJson, @Context UriInfo uriInfo) {
+    @Operation(summary = "Allow Interoperation Transaction Request", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = InteropTransactionRequestData.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropTransactionRequestResponseData.class))) })
+    public String createTransactionRequest(@Parameter(hidden = true) String quotesJson, @Context UriInfo uriInfo) {
         CommandWrapper commandRequest = new InteropWrapperBuilder().createTransactionRequest().withJson(quotesJson).build();
 
         InteropTransactionRequestResponseData result = (InteropTransactionRequestResponseData) commandsSourceService
@@ -300,10 +308,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("transactions/{transactionCode}/quotes/{quoteCode}")
-    @ApiOperation(value = "Query Interoperation Quote", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropQuoteResponseData.class) })
-    public String getQuote(@PathParam("transactionCode") @ApiParam(value = "transactionCode") String transactionCode,
-            @PathParam("quoteCode") @ApiParam(value = "quoteCode") String quoteCode, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query Interoperation Quote", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropQuoteResponseData.class))) })
+    public String getQuote(@PathParam("transactionCode") @Parameter(description = "transactionCode") String transactionCode,
+            @PathParam("quoteCode") @Parameter(description = "quoteCode") String quoteCode, @Context UriInfo uriInfo) {
         context.authenticatedUser().validateHasReadPermission(ENTITY_NAME_QUOTE);
 
         InteropQuoteResponseData result = interopService.getQuote(transactionCode, quoteCode);
@@ -316,11 +325,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("quotes")
-    @ApiOperation(value = "Calculate Interoperation Quote", httpMethod = "POST", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = InteropQuoteRequestData.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropQuoteResponseData.class) })
-    public String createQuote(@ApiParam(hidden = true) String quotesJson, @Context UriInfo uriInfo) {
+    @Operation(summary = "Calculate Interoperation Quote", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = InteropQuoteRequestData.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropQuoteResponseData.class))) })
+    public String createQuote(@Parameter(hidden = true) String quotesJson, @Context UriInfo uriInfo) {
         CommandWrapper commandRequest = new InteropWrapperBuilder().createQuotes().withJson(quotesJson).build();
 
         InteropQuoteResponseData result = (InteropQuoteResponseData) commandsSourceService.logCommandSource(commandRequest);
@@ -333,10 +342,11 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("transactions/{transactionCode}/transfers/{transferCode}")
-    @ApiOperation(value = "Query Interoperation Transfer", httpMethod = "GET", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropTransferResponseData.class) })
-    public String getTransfer(@PathParam("transactionCode") @ApiParam(value = "transactionCode") String transactionCode,
-            @PathParam("transferCode") @ApiParam(value = "transferCode") String transferCode, @Context UriInfo uriInfo) {
+    @Operation(summary = "Query Interoperation Transfer", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropTransferResponseData.class))) })
+    public String getTransfer(@PathParam("transactionCode") @Parameter(description = "transactionCode") String transactionCode,
+            @PathParam("transferCode") @Parameter(description = "transferCode") String transferCode, @Context UriInfo uriInfo) {
         context.authenticatedUser().validateHasReadPermission(ENTITY_NAME_QUOTE);
 
         InteropTransferResponseData result = interopService.getTransfer(transactionCode, transferCode);
@@ -349,12 +359,12 @@ public class InteropApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     @Path("transfers")
-    @ApiOperation(value = "Prepare Interoperation Transfer", httpMethod = "POST", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = InteropTransferRequestData.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = InteropTransferResponseData.class) })
-    public String performTransfer(@QueryParam("action") @ApiParam(value = "action") String action,
-            @ApiParam(hidden = true) String quotesJson, @Context UriInfo uriInfo) {
+    @Operation(summary = "Prepare Interoperation Transfer", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = InteropTransferRequestData.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = InteropTransferResponseData.class))) })
+    public String performTransfer(@QueryParam("action") @Parameter(description = "action") String action,
+            @Parameter(hidden = true) String quotesJson, @Context UriInfo uriInfo) {
         CommandWrapper commandRequest = new InteropWrapperBuilder().performTransfer(InteropTransferActionType.valueOf(action))
                 .withJson(quotesJson).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixReportApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixReportApiResource.java
index 8c7bdfe..5e04778 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixReportApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixReportApiResource.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.mix.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.sql.Date;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -37,8 +35,8 @@ import org.springframework.stereotype.Component;
 @Path("/mixreport")
 @Component
 @Scope("singleton")
-@Api(tags = { "Mix Report" })
-@SwaggerDefinition(tags = { @Tag(name = "Mix Report", description = "") })
+
+@Tag(name = "Mix Report", description = "")
 public class MixReportApiResource {
 
     private final XBRLResultService xbrlResultService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.java
index 66cf6a7..f35b91e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyApiResource.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.mix.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -45,8 +43,8 @@ import org.springframework.stereotype.Component;
 @Path("/mixtaxonomy")
 @Component
 @Scope("singleton")
-@Api(tags = { "Mix Taxonomy" })
-@SwaggerDefinition(tags = { @Tag(name = "Mix Taxonomy", description = "") })
+
+@Tag(name = "Mix Taxonomy", description = "")
 public class MixTaxonomyApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java
index 096a7b4..0e202ca 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/mix/api/MixTaxonomyMappingApiResource.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.mix.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -49,8 +47,8 @@ import org.springframework.stereotype.Component;
 @Path("/mixmapping")
 @Component
 @Scope("singleton")
-@Api(tags = { "Mix Mapping " })
-@SwaggerDefinition(tags = { @Tag(name = "Mix Mapping", description = "") })
+
+@Tag(name = "Mix Mapping", description = "")
 public class MixTaxonomyMappingApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("identifier", "config"));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/notification/api/NotificationApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/notification/api/NotificationApiResource.java
index 524bc1b..5ae2680 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/notification/api/NotificationApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/notification/api/NotificationApiResource.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.notification.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.PUT;
@@ -45,8 +43,8 @@ import org.springframework.stereotype.Component;
 @Path("/notifications")
 @Component
 @Scope("singleton")
-@Api(tags = { "Notification" })
-@SwaggerDefinition(tags = { @Tag(name = "Notification", description = "") })
+
+@Tag(name = "Notification", description = "")
 public class NotificationApiResource {
 
     private final PlatformSecurityContext context;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResource.java
index 24165a2..8bf6cd6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResource.java
@@ -21,15 +21,15 @@ package org.apache.fineract.organisation.holiday.api;
 import static org.apache.fineract.organisation.holiday.api.HolidayApiConstants.HOLIDAY_RESOURCE_NAME;
 import static org.apache.fineract.organisation.holiday.api.HolidayApiConstants.HOLIDAY_RESPONSE_DATA_PARAMETERS;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collection;
 import java.util.Date;
 import javax.ws.rs.Consumes;
@@ -64,13 +64,11 @@ import org.springframework.stereotype.Component;
 @Path("/holidays")
 @Component
 @Scope("singleton")
-@Api(tags = { "Holidays" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Holidays", description = "Some MFI's span large regions where different branch offices might observe different holidays. They need the ability to define holidays for specific branch offices and be able to set the repayment rule to follow during those holidays.\n"
-                + "\n"
-                + "The reschedule of repayments to repaymentsRescheduledTo date during defined holidays is turned on/off by enabling/disabling reschedule-repayments-on-holidays in Global configurations.\n"
-                + "\n"
-                + "Allow Repayment transactions on a defined holidays is turned on/off by enabling/disabling allow-transactions-on-holiday in Global configurations.") })
+@Tag(name = "Holidays", description = "Some MFI's span large regions where different branch offices might observe different holidays. They need the ability to define holidays for specific branch offices and be able to set the repayment rule to follow during those holidays.\n"
+        + "\n"
+        + "The reschedule of repayments to repaymentsRescheduledTo date during defined holidays is turned on/off by enabling/disabling reschedule-repayments-on-holidays in Global configurations.\n"
+        + "\n"
+        + "Allow Repayment transactions on a defined holidays is turned on/off by enabling/disabling allow-transactions-on-holiday in Global configurations.")
 public class HolidaysApiResource {
 
     private final DefaultToApiJsonSerializer<HolidayData> toApiJsonSerializer;
@@ -94,12 +92,12 @@ public class HolidaysApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a Holiday", notes = "Mandatory Fields: "
+    @Operation(summary = "Create a Holiday", description = "Mandatory Fields: "
             + "name, description, fromDate, toDate, repaymentsRescheduledTo, offices")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = HolidaysApiResourceSwagger.PostHolidaysRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HolidaysApiResourceSwagger.PostHolidaysResponse.class) })
-    public String createNewHoliday(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.PostHolidaysRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.PostHolidaysResponse.class))) })
+    public String createNewHoliday(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createHoliday().withJson(apiRequestBodyAsJson).build();
 
@@ -112,14 +110,14 @@ public class HolidaysApiResource {
     @Path("{holidayId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Activate a Holiday", notes = "Always Holidays are created in pending state. This API allows to activate a holiday.\n"
+    @Operation(summary = "Activate a Holiday", description = "Always Holidays are created in pending state. This API allows to activate a holiday.\n"
             + "\n" + "Only the active holidays are considered for rescheduling the loan repayment.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = HolidaysApiResourceSwagger.PostHolidaysHolidayIdRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HolidaysApiResourceSwagger.PostHolidaysHolidayIdResponse.class) })
-    public String handleCommands(@PathParam("holidayId") @ApiParam(value = "holidayId") final Long holidayId,
-            @QueryParam("command") @ApiParam(value = "command") final String commandParam,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.PostHolidaysHolidayIdRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.PostHolidaysHolidayIdResponse.class))) })
+    public String handleCommands(@PathParam("holidayId") @Parameter(description = "holidayId") final Long holidayId,
+            @QueryParam("command") @Parameter(description = "command") final String commandParam,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         String jsonApiRequest = apiRequestBodyAsJson;
         if (StringUtils.isBlank(jsonApiRequest)) {
@@ -145,9 +143,11 @@ public class HolidaysApiResource {
     @Path("{holidayId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Holiday", notes = "Example Requests:\n" + "\n" + "holidays/1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HolidaysApiResourceSwagger.GetHolidaysResponse.class) })
-    public String retrieveOne(@PathParam("holidayId") @ApiParam(value = "holidayId") final Long holidayId, @Context final UriInfo uriInfo) {
+    @Operation(summary = "Retrieve a Holiday", description = "Example Requests:\n" + "\n" + "holidays/1")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.GetHolidaysResponse.class))) })
+    public String retrieveOne(@PathParam("holidayId") @Parameter(description = "holidayId") final Long holidayId,
+            @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(HOLIDAY_RESOURCE_NAME);
 
@@ -162,12 +162,12 @@ public class HolidaysApiResource {
     @Path("{holidayId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Holiday", notes = "If a holiday is in pending state (created and not activated) then all fields are allowed to modify. Once holidays become active only name and descriptions are allowed to modify.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = HolidaysApiResourceSwagger.PutHolidaysHolidayIdRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HolidaysApiResourceSwagger.PutHolidaysHolidayIdResponse.class) })
-    public String update(@PathParam("holidayId") @ApiParam(value = "holidayId") final Long holidayId,
-            @ApiParam(hidden = true) final String jsonRequestBody) {
+    @Operation(summary = "Update a Holiday", description = "If a holiday is in pending state (created and not activated) then all fields are allowed to modify. Once holidays become active only name and descriptions are allowed to modify.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.PutHolidaysHolidayIdRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.PutHolidaysHolidayIdResponse.class))) })
+    public String update(@PathParam("holidayId") @Parameter(description = "holidayId") final Long holidayId,
+            @Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateHoliday(holidayId).withJson(jsonRequestBody).build();
 
@@ -180,9 +180,10 @@ public class HolidaysApiResource {
     @Path("{holidayId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Delete a Holiday", notes = "This API allows to delete a holiday. This is a soft delete the deleted holiday status is marked as deleted.")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = HolidaysApiResourceSwagger.DeleteHolidaysHolidayIdResponse.class) })
-    public String delete(@PathParam("holidayId") @ApiParam(value = "holidayId") final Long holidayId) {
+    @Operation(summary = "Delete a Holiday", description = "This API allows to delete a holiday. This is a soft delete the deleted holiday status is marked as deleted.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = HolidaysApiResourceSwagger.DeleteHolidaysHolidayIdResponse.class))) })
+    public String delete(@PathParam("holidayId") @Parameter(description = "holidayId") final Long holidayId) {
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteHoliday(holidayId).build();
         final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
         return this.toApiJsonSerializer.serialize(result);
@@ -195,15 +196,15 @@ public class HolidaysApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Holidays", notes = "Example Requests:\n" + "\n" + "holidays?officeId=1")
+    @Operation(summary = "List Holidays", description = "Example Requests:\n" + "\n" + "holidays?officeId=1")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = HolidaysApiResourceSwagger.GetHolidaysResponse.class, responseContainer = "List") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = HolidaysApiResourceSwagger.GetHolidaysResponse.class)))) })
     public String retrieveAllHolidays(@Context final UriInfo uriInfo,
-            @QueryParam("officeId") @ApiParam(value = "officeId") final Long officeId,
-            @QueryParam("fromDate") @ApiParam(value = "fromDate") final DateParam fromDateParam,
-            @QueryParam("toDate") @ApiParam(value = "toDate") final DateParam toDateParam,
-            @QueryParam("locale") @ApiParam(value = "locale") final String locale,
-            @QueryParam("dateFormat") @ApiParam(value = "dateFormat") final String dateFormat) {
+            @QueryParam("officeId") @Parameter(description = "officeId") final Long officeId,
+            @QueryParam("fromDate") @Parameter(description = "fromDate") final DateParam fromDateParam,
+            @QueryParam("toDate") @Parameter(description = "toDate") final DateParam toDateParam,
+            @QueryParam("locale") @Parameter(description = "locale") final String locale,
+            @QueryParam("dateFormat") @Parameter(description = "dateFormat") final String dateFormat) {
 
         this.context.authenticatedUser().validateHasReadPermission(HOLIDAY_RESOURCE_NAME);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java
index 5a7b673..b690cb4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.organisation.holiday.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.joda.time.LocalDate;
@@ -33,29 +32,29 @@ final class HolidaysApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetHolidaysResponse")
+    @Schema(description = "GetHolidaysResponse")
     public static final class GetHolidaysResponse {
 
         private GetHolidaysResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "Good Friday")
+        @Schema(example = "Good Friday")
         public String name;
-        @ApiModelProperty(example = "[2013, 10, 26]")
+        @Schema(example = "[2013, 10, 26]")
         public LocalDate fromDate;
-        @ApiModelProperty(example = "[2013, 10, 26]")
+        @Schema(example = "[2013, 10, 26]")
         public LocalDate toDate;
-        @ApiModelProperty(example = "[2013, 10, 27]")
+        @Schema(example = "[2013, 10, 27]")
         public LocalDate repaymentsRescheduledTo;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
         public EnumOptionData status;
     }
 
-    @ApiModel(value = "PostHolidaysRequest")
+    @Schema(description = "PostHolidaysRequest")
     public static final class PostHolidaysRequest {
 
         private PostHolidaysRequest() {
@@ -68,39 +67,39 @@ final class HolidaysApiResourceSwagger {
 
             }
 
-            @ApiModelProperty(example = "1")
+            @Schema(example = "1")
             public Long officeId;
         }
 
-        @ApiModelProperty(example = "Good Friday")
+        @Schema(example = "Good Friday")
         public String name;
-        @ApiModelProperty(example = "Good Friday")
+        @Schema(example = "Good Friday")
         public String description;
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "25 October 2013")
+        @Schema(example = "25 October 2013")
         public LocalDate fromDate;
-        @ApiModelProperty(example = "25 October 2013")
+        @Schema(example = "25 October 2013")
         public LocalDate toDate;
-        @ApiModelProperty(example = "26 October 2013")
+        @Schema(example = "26 October 2013")
         public LocalDate repaymentsRescheduledTo;
         public List<PostHolidaysRequestOffices> offices;
     }
 
-    @ApiModel(value = "PostHolidaysResponse")
+    @Schema(description = "PostHolidaysResponse")
     public static final class PostHolidaysResponse {
 
         private PostHolidaysResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PostHolidaysHolidayIdRequest")
+    @Schema(description = "PostHolidaysHolidayIdRequest")
     public static final class PostHolidaysHolidayIdRequest {
 
         private PostHolidaysHolidayIdRequest() {
@@ -108,31 +107,31 @@ final class HolidaysApiResourceSwagger {
         }
     }
 
-    @ApiModel(value = "PostHolidaysHolidayIdResponse")
+    @Schema(description = "PostHolidaysHolidayIdResponse")
     public static final class PostHolidaysHolidayIdResponse {
 
         private PostHolidaysHolidayIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutHolidaysHolidayIdRequest")
+    @Schema(description = "PutHolidaysHolidayIdRequest")
     public static final class PutHolidaysHolidayIdRequest {
 
         private PutHolidaysHolidayIdRequest() {
 
         }
 
-        @ApiModelProperty(example = "Independence day")
+        @Schema(example = "Independence day")
         public String name;
-        @ApiModelProperty(example = "Holiday for Independence day celebration")
+        @Schema(example = "Holiday for Independence day celebration")
         public String description;
     }
 
-    @ApiModel(value = "PutHolidaysHolidayIdResponse")
+    @Schema(description = "PutHolidaysHolidayIdResponse")
     public static final class PutHolidaysHolidayIdResponse {
 
         private PutHolidaysHolidayIdResponse() {
@@ -143,25 +142,25 @@ final class HolidaysApiResourceSwagger {
 
             private PutHolidaysHolidayIdResponseChanges() {}
 
-            @ApiModelProperty(example = "Independence day")
+            @Schema(example = "Independence day")
             public String name;
-            @ApiModelProperty(example = "Holiday for Independence day celebration")
+            @Schema(example = "Holiday for Independence day celebration")
             public String description;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
         public PutHolidaysHolidayIdResponseChanges changes;
     }
 
-    @ApiModel(value = "DeleteHolidaysHolidayIdResponse")
+    @Schema(description = "DeleteHolidaysHolidayIdResponse")
     public static final class DeleteHolidaysHolidayIdResponse {
 
         private DeleteHolidaysHolidayIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResource.java
index dd5797d..937e80d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResource.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.organisation.monetary.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -55,9 +54,8 @@ import org.springframework.stereotype.Component;
 @Path("/currencies")
 @Component
 @Scope("singleton")
-@Api(tags = { "Currency" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Currency", description = "Application related configuration around viewing/updating the currencies permitted for use within the MFI.") })
+
+@Tag(name = "Currency", description = "Application related configuration around viewing/updating the currencies permitted for use within the MFI.")
 public class CurrenciesApiResource {
 
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("selectedCurrencyOptions", "currencyOptions"));
@@ -85,9 +83,10 @@ public class CurrenciesApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Currency Configuration", notes = "Returns the list of currencies permitted for use AND the list of currencies not selected (but available for selection).\n"
+    @Operation(summary = "Retrieve Currency Configuration", description = "Returns the list of currencies permitted for use AND the list of currencies not selected (but available for selection).\n"
             + "\n" + "Example Requests:\n" + "\n" + "currencies\n" + "\n" + "\n" + "currencies?fields=selectedCurrencyOptions")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CurrenciesApiResourceSwagger.GetCurrenciesResponse.class) })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CurrenciesApiResourceSwagger.GetCurrenciesResponse.class))) })
     public String retrieveCurrencies(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
@@ -101,11 +100,11 @@ public class CurrenciesApiResource {
     @PUT
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update Currency Configuration", notes = "Updates the list of currencies permitted for use.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = CurrenciesApiResourceSwagger.PutCurrenciesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = CurrenciesApiResourceSwagger.PutCurrenciesResponse.class) })
-    public String updateCurrencies(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update Currency Configuration", description = "Updates the list of currencies permitted for use.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = CurrenciesApiResourceSwagger.PutCurrenciesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = CurrenciesApiResourceSwagger.PutCurrenciesResponse.class))) })
+    public String updateCurrencies(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateCurrencies() //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResourceSwagger.java
index 9335fd8..4b2ba30 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/api/CurrenciesApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.organisation.monetary.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import org.apache.fineract.organisation.monetary.data.CurrencyData;
 
@@ -32,7 +31,7 @@ final class CurrenciesApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetCurrenciesResponse")
+    @Schema(description = "GetCurrenciesResponse")
     public static final class GetCurrenciesResponse {
 
         private GetCurrenciesResponse() {
@@ -43,28 +42,28 @@ final class CurrenciesApiResourceSwagger {
         public Collection<CurrencyData> currencyOptions;
     }
 
-    @ApiModel(value = "PutCurrenciesRequest")
+    @Schema(description = "PutCurrenciesRequest")
     public static final class PutCurrenciesRequest {
 
         private PutCurrenciesRequest() {
 
         }
 
-        @ApiModelProperty(example = "[\"KES\",\n" + "        \"BND\",\n" + "        \"LBP\",\n" + "        \"GHC\",\n"
-                + "        \"USD\",\n" + "        \"XOF\",\n" + "        \"AED\",\n" + "        \"AMD\"]")
+        @Schema(example = "[\"KES\",\n" + "        \"BND\",\n" + "        \"LBP\",\n" + "        \"GHC\",\n" + "        \"USD\",\n"
+                + "        \"XOF\",\n" + "        \"AED\",\n" + "        \"AMD\"]")
         public String currencies;
 
     }
 
-    @ApiModel(value = "PutCurrenciesResponse")
+    @Schema(description = "PutCurrenciesResponse")
     public static final class PutCurrenciesResponse {
 
         private PutCurrenciesResponse() {
 
         }
 
-        @ApiModelProperty(example = "[\"KES\",\n" + "        \"BND\",\n" + "        \"LBP\",\n" + "        \"GHC\",\n"
-                + "        \"USD\",\n" + "        \"XOF\",\n" + "        \"AED\",\n" + "        \"AMD\"]")
+        @Schema(example = "[\"KES\",\n" + "        \"BND\",\n" + "        \"LBP\",\n" + "        \"GHC\",\n" + "        \"USD\",\n"
+                + "        \"XOF\",\n" + "        \"AED\",\n" + "        \"AMD\"]")
         public String currencies;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficeTransactionsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficeTransactionsApiResource.java
index 929fe9c..0cec6e7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficeTransactionsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficeTransactionsApiResource.java
@@ -18,7 +18,6 @@
  */
 package org.apache.fineract.organisation.office.api;
 
-import io.swagger.annotations.Api;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -50,7 +49,7 @@ import org.springframework.stereotype.Component;
 @Path("/officetransactions")
 @Component
 @Scope("singleton")
-@Api(value = "officetransactions", description = "")
+
 public class OfficeTransactionsApiResource {
 
     private static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java
index 12c412f..3158ee9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java
@@ -20,15 +20,15 @@ package org.apache.fineract.organisation.office.api;
 
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
@@ -68,9 +68,7 @@ import org.springframework.stereotype.Component;
 @Path("/offices")
 @Component
 @Scope("singleton")
-@Api(tags = { "Offices" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Offices", description = "Offices are used to model an MFIs structure. A hierarchical representation of offices is supported. There will always be at least one office (which represents the MFI or an MFIs head office). All subsequent offices added must have a parent office.") })
+@Tag(name = "Offices", description = "Offices are used to model an MFIs structure. A hierarchical representation of offices is supported. There will always be at least one office (which represents the MFI or an MFIs head office). All subsequent offices added must have a parent office.")
 public class OfficesApiResource {
 
     /**
@@ -107,14 +105,14 @@ public class OfficesApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Offices", notes = "Example Requests:\n" + "\n" + "offices\n" + "\n" + "\n"
+    @Operation(summary = "List Offices", description = "Example Requests:\n" + "\n" + "offices\n" + "\n" + "\n"
             + "offices?fields=id,name,openingDate")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = OfficesApiResourceSwagger.GetOfficesResponse.class, responseContainer = "List") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = OfficesApiResourceSwagger.GetOfficesResponse.class)))) })
     public String retrieveOffices(@Context final UriInfo uriInfo,
-            @DefaultValue("false") @QueryParam("includeAllOffices") @ApiParam(value = "includeAllOffices") final boolean onlyManualEntries,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder) {
+            @DefaultValue("false") @QueryParam("includeAllOffices") @Parameter(description = "includeAllOffices") final boolean onlyManualEntries,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -130,9 +128,10 @@ public class OfficesApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Office Details Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
-            + "\n" + "Field Defaults\n" + "Allowed Value Lists\n" + "Example Request:\n" + "\n" + "offices/template")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = OfficesApiResourceSwagger.GetOfficesTemplateResponse.class) })
+    @Operation(summary = "Retrieve Office Details Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n"
+            + "\n" + "Field Defaults\n" + "Allowed description Lists\n" + "Example Request:\n" + "\n" + "offices/template")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = OfficesApiResourceSwagger.GetOfficesTemplateResponse.class))) })
     public String retrieveOfficeTemplate(@Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
@@ -149,11 +148,11 @@ public class OfficesApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create an Office", notes = "Mandatory Fields\n" + "name, openingDate, parentId")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = OfficesApiResourceSwagger.PostOfficesRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = OfficesApiResourceSwagger.PostOfficesResponse.class) })
-    public String createOffice(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Create an Office", description = "Mandatory Fields\n" + "name, openingDate, parentId")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = OfficesApiResourceSwagger.PostOfficesRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = OfficesApiResourceSwagger.PostOfficesResponse.class))) })
+    public String createOffice(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .createOffice() //
@@ -169,10 +168,12 @@ public class OfficesApiResource {
     @Path("{officeId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve an Office", notes = "Example Requests:\n" + "\n" + "offices/1\n" + "\n" + "\n"
+    @Operation(summary = "Retrieve an Office", description = "Example Requests:\n" + "\n" + "offices/1\n" + "\n" + "\n"
             + "offices/1?template=true\n" + "\n" + "\n" + "offices/1?fields=id,name,parentName")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = OfficesApiResourceSwagger.GetOfficesResponse.class) })
-    public String retreiveOffice(@PathParam("officeId") @ApiParam(value = "officeId") final Long officeId, @Context final UriInfo uriInfo) {
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = OfficesApiResourceSwagger.GetOfficesResponse.class))) })
+    public String retreiveOffice(@PathParam("officeId") @Parameter(description = "officeId") final Long officeId,
+            @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -191,12 +192,12 @@ public class OfficesApiResource {
     @Path("{officeId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update Office", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = OfficesApiResourceSwagger.PutOfficesOfficeIdRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = OfficesApiResourceSwagger.PutOfficesOfficeIdResponse.class) })
-    public String updateOffice(@PathParam("officeId") @ApiParam(value = "officeId") final Long officeId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update Office", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = OfficesApiResourceSwagger.PutOfficesOfficeIdRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = OfficesApiResourceSwagger.PutOfficesOfficeIdResponse.class))) })
+    public String updateOffice(@PathParam("officeId") @Parameter(description = "officeId") final Long officeId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder() //
                 .updateOffice(officeId) //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java
index 8a78eab..05274d1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.organisation.office.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import org.joda.time.LocalDate;
 
@@ -32,90 +31,90 @@ final class OfficesApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetOfficesResponse")
+    @Schema(description = "GetOfficesResponse")
     public static final class GetOfficesResponse {
 
         private GetOfficesResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String name;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String nameDecorated;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public String externalId;
-        @ApiModelProperty(example = "[2009, 1, 1]")
+        @Schema(example = "[2009, 1, 1]")
         public LocalDate openingDate;
-        @ApiModelProperty(example = ".")
+        @Schema(example = ".")
         public String hierarchy;
-        // @ApiModelProperty(example = "")
+        // @Schema(example = "")
         // public Long parentId;
-        // @ApiModelProperty(example = "")
+        // @Schema(example = "")
         // public String parentName;
     }
 
-    @ApiModel(value = "GetOfficesTemplateResponse")
+    @Schema(description = "GetOfficesTemplateResponse")
     public static final class GetOfficesTemplateResponse {
 
         private GetOfficesTemplateResponse() {
 
         }
 
-        @ApiModelProperty(example = "[2009, 1, 1]")
+        @Schema(example = "[2009, 1, 1]")
         public LocalDate openingDate;
         public Collection<GetOfficesResponse> allowedParents;
     }
 
-    @ApiModel(value = "PostOfficesRequest")
+    @Schema(description = "PostOfficesRequest")
     public static final class PostOfficesRequest {
 
         private PostOfficesRequest() {
 
         }
 
-        @ApiModelProperty(example = "Good Friday")
+        @Schema(example = "Good Friday")
         public String name;
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "01 July 2007")
+        @Schema(example = "01 July 2007")
         public LocalDate openingDate;
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long parentId;
-        @ApiModelProperty(example = "SYS54-88")
+        @Schema(example = "SYS54-88")
         public String externalId;
 
     }
 
-    @ApiModel(value = "PostOfficesResponse")
+    @Schema(description = "PostOfficesResponse")
     public static final class PostOfficesResponse {
 
         private PostOfficesResponse() {
 
         }
 
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long officeId;
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutOfficesOfficeIdRequest")
+    @Schema(description = "PutOfficesOfficeIdRequest")
     public static final class PutOfficesOfficeIdRequest {
 
         private PutOfficesOfficeIdRequest() {
 
         }
 
-        @ApiModelProperty(example = "Name is updated")
+        @Schema(example = "Name is updated")
         public String name;
     }
 
-    @ApiModel(value = "PutOfficesOfficeIdResponse")
+    @Schema(description = "PutOfficesOfficeIdResponse")
     public static final class PutOfficesOfficeIdResponse {
 
         private PutOfficesOfficeIdResponse() {
@@ -128,13 +127,13 @@ final class OfficesApiResourceSwagger {
 
             }
 
-            @ApiModelProperty(example = "Name is updated")
+            @Schema(example = "Name is updated")
             public String name;
         }
 
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long officeId;
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long resourceId;
         public PutOfficesOfficeIdResponseChanges changes;
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCategoryApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCategoryApiResource.java
index 9b7a865..88b07ed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCategoryApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCategoryApiResource.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.organisation.provisioning.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collection;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -50,8 +48,8 @@ import org.springframework.stereotype.Component;
 @Path("/provisioningcategory")
 @Component
 @Scope("singleton")
-@Api(tags = { "Provisioning Category" })
-@SwaggerDefinition(tags = { @Tag(name = "Provisioning Category", description = "") })
+
+@Tag(name = "Provisioning Category", description = "")
 public class ProvisioningCategoryApiResource {
 
     private final PlatformSecurityContext platformSecurityContext;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResource.java
index e3ad1d2..762831c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.organisation.provisioning.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -60,8 +60,8 @@ import org.springframework.stereotype.Component;
 @Path("/provisioningcriteria")
 @Component
 @Scope("singleton")
-@Api(tags = { "Provisioning Criteria" })
-@SwaggerDefinition(tags = { @Tag(name = "Provisioning Criteria", description = "This defines the Provisioning Criteria") })
+
+@Tag(name = "Provisioning Criteria", description = "This defines the Provisioning Criteria")
 public class ProvisioningCriteriaApiResource {
 
     private final PlatformSecurityContext platformSecurityContext;
@@ -110,10 +110,10 @@ public class ProvisioningCriteriaApiResource {
     @Path("{criteriaId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieves a Provisioning Criteria", notes = "Retrieves a Provisioning Criteria")
+    @Operation(summary = "Retrieves a Provisioning Criteria", description = "Retrieves a Provisioning Criteria")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ProvisioningCriteriaApiResourceSwagger.GetProvisioningCriteriaCriteriaIdResponse.class) })
-    public String retrieveProvisioningCriteria(@PathParam("criteriaId") @ApiParam(value = "criteriaId") final Long criteriaId,
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ProvisioningCriteriaApiResourceSwagger.GetProvisioningCriteriaCriteriaIdResponse.class))) })
+    public String retrieveProvisioningCriteria(@PathParam("criteriaId") @Parameter(description = "criteriaId") final Long criteriaId,
             @Context final UriInfo uriInfo) {
         platformSecurityContext.authenticatedUser();
         ProvisioningCriteriaData criteria = this.provisioningCriteriaReadPlatformService.retrieveProvisioningCriteria(criteriaId);
@@ -127,9 +127,9 @@ public class ProvisioningCriteriaApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieves all created Provisioning Criterias", notes = "Retrieves all created Provisioning Criterias")
+    @Operation(summary = "Retrieves all created Provisioning Criterias", description = "Retrieves all created Provisioning Criterias")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", responseContainer = "List", response = ProvisioningCriteriaApiResourceSwagger.GetProvisioningCriteriaResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ProvisioningCriteriaApiResourceSwagger.GetProvisioningCriteriaResponse.class)))) })
     public String retrieveAllProvisioningCriterias(@Context final UriInfo uriInfo) {
         platformSecurityContext.authenticatedUser();
         Collection<ProvisioningCriteriaData> data = this.provisioningCriteriaReadPlatformService.retrieveAllProvisioningCriterias();
@@ -140,13 +140,12 @@ public class ProvisioningCriteriaApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a new Provisioning Criteria", notes = "Creates a new Provisioning Criteria\n" + "\n"
+    @Operation(summary = "Create a new Provisioning Criteria", description = "Creates a new Provisioning Criteria\n" + "\n"
             + "Mandatory Fields: \n" + "criteriaName\n" + "provisioningcriteria\n" + "\n" + "Optional Fields: \n" + "loanProducts")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ProvisioningCriteriaApiResourceSwagger.PostProvisioningCriteriaRequest.class) })
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ProvisioningCriteriaApiResourceSwagger.PostProvisioningCriteriaRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ProvisioningCriteriaApiResourceSwagger.PostProvisioningCriteriaResponse.class) })
-    public String createProvisioningCriteria(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ProvisioningCriteriaApiResourceSwagger.PostProvisioningCriteriaResponse.class))) })
+    public String createProvisioningCriteria(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
         CommandWrapper commandWrapper = null;
         this.platformSecurityContext.authenticatedUser();
         commandWrapper = new CommandWrapperBuilder().createProvisioningCriteria().withJson(apiRequestBodyAsJson).build();
@@ -158,14 +157,13 @@ public class ProvisioningCriteriaApiResource {
     @Path("{criteriaId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Updates a new Provisioning Criteria", notes = "Updates a new Provisioning Criteria\n" + "\n"
+    @Operation(summary = "Updates a new Provisioning Criteria", description = "Updates a new Provisioning Criteria\n" + "\n"
             + "Optional Fields\n" + "criteriaName, loanProducts, provisioningcriteria")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = ProvisioningCriteriaApiResourceSwagger.PutProvisioningCriteriaRequest.class) })
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = ProvisioningCriteriaApiResourceSwagger.PutProvisioningCriteriaRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ProvisioningCriteriaApiResourceSwagger.PutProvisioningCriteriaResponse.class) })
-    public String updateProvisioningCriteria(@PathParam("criteriaId") @ApiParam(value = "criteriaId") final Long criteriaId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ProvisioningCriteriaApiResourceSwagger.PutProvisioningCriteriaResponse.class))) })
+    public String updateProvisioningCriteria(@PathParam("criteriaId") @Parameter(description = "criteriaId") final Long criteriaId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
         this.platformSecurityContext.authenticatedUser();
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateProvisioningCriteria(criteriaId)
                 .withJson(apiRequestBodyAsJson).build();
@@ -177,10 +175,10 @@ public class ProvisioningCriteriaApiResource {
     @Path("{criteriaId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Deletes Provisioning Criteria", notes = "Deletes Provisioning Criteria")
+    @Operation(summary = "Deletes Provisioning Criteria", description = "Deletes Provisioning Criteria")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = ProvisioningCriteriaApiResourceSwagger.DeleteProvisioningCriteriaResponse.class) })
-    public String deleteProvisioningCriteria(@PathParam("criteriaId") @ApiParam(value = "criteriaId") final Long criteriaId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = ProvisioningCriteriaApiResourceSwagger.DeleteProvisioningCriteriaResponse.class))) })
+    public String deleteProvisioningCriteria(@PathParam("criteriaId") @Parameter(description = "criteriaId") final Long criteriaId) {
         this.platformSecurityContext.authenticatedUser();
         final CommandWrapper commandRequest = new CommandWrapperBuilder().deleteProvisioningCriteria(criteriaId).build();
         final CommandProcessingResult result = this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java
index e523511..afe7f73 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.organisation.provisioning.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import org.apache.fineract.organisation.provisioning.data.ProvisioningCriteriaDefinitionData;
 import org.apache.fineract.portfolio.loanproduct.data.LoanProductData;
@@ -33,76 +32,76 @@ final class ProvisioningCriteriaApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PostProvisioningCriteriaRequest")
+    @Schema(description = "PostProvisioningCriteriaRequest")
     public static final class PostProvisioningCriteriaRequest {
 
         private PostProvisioningCriteriaRequest() {
 
         }
 
-        @ApiModelProperty(example = "High Risk Products Criteria")
+        @Schema(example = "High Risk Products Criteria")
         public String criteriaName;
         public Collection<LoanProductData> loanProducts;
         public Collection<ProvisioningCriteriaDefinitionData> provisioningcriteria;
     }
 
-    @ApiModel(value = "PostProvisioningCriteriaResponse")
+    @Schema(description = "PostProvisioningCriteriaResponse")
     public static final class PostProvisioningCriteriaResponse {
 
         private PostProvisioningCriteriaResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "GetProvisioningCriteriaResponse")
+    @Schema(description = "GetProvisioningCriteriaResponse")
     public static final class GetProvisioningCriteriaResponse {
 
         private GetProvisioningCriteriaResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long criteriaId;
-        @ApiModelProperty(example = "High Risk Products Criteria")
+        @Schema(example = "High Risk Products Criteria")
         public String criteriaName;
-        @ApiModelProperty(example = "mifos")
+        @Schema(example = "mifos")
         public String createdBy;
     }
 
-    @ApiModel(value = "GetProvisioningCriteriaCriteriaIdResponse")
+    @Schema(description = "GetProvisioningCriteriaCriteriaIdResponse")
     public static final class GetProvisioningCriteriaCriteriaIdResponse {
 
         private GetProvisioningCriteriaCriteriaIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long criteriaId;
-        @ApiModelProperty(example = "High Risk Products Criteria")
+        @Schema(example = "High Risk Products Criteria")
         public String criteriaName;
-        @ApiModelProperty(example = "mifos")
+        @Schema(example = "mifos")
         public String createdBy;
         public Collection<LoanProductData> loanProducts;
         public Collection<ProvisioningCriteriaDefinitionData> provisioningcriteria;
     }
 
-    @ApiModel(value = "PutProvisioningCriteriaRequest")
+    @Schema(description = "PutProvisioningCriteriaRequest")
     public static final class PutProvisioningCriteriaRequest {
 
         private PutProvisioningCriteriaRequest() {
 
         }
 
-        @ApiModelProperty(example = "High Risk Products Criteria")
+        @Schema(example = "High Risk Products Criteria")
         public String criteriaName;
         public Collection<LoanProductData> loanProducts;
         public Collection<ProvisioningCriteriaDefinitionData> provisioningcriteria;
     }
 
-    @ApiModel(value = "PutProvisioningCriteriaResponse")
+    @Schema(description = "PutProvisioningCriteriaResponse")
     public static final class PutProvisioningCriteriaResponse {
 
         private PutProvisioningCriteriaResponse() {
@@ -113,23 +112,23 @@ final class ProvisioningCriteriaApiResourceSwagger {
 
             private PutProvisioningCriteriaResponseChanges() {}
 
-            @ApiModelProperty(example = "High Risk Products Criteria")
+            @Schema(example = "High Risk Products Criteria")
             public String criteriaName;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
         public PutProvisioningCriteriaResponseChanges changes;
     }
 
-    @ApiModel(value = "DeleteProvisioningCriteriaResponse")
+    @Schema(description = "DeleteProvisioningCriteriaResponse")
     public static final class DeleteProvisioningCriteriaResponse {
 
         private DeleteProvisioningCriteriaResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java
index 59e19cd..0131495 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java
@@ -20,15 +20,15 @@ package org.apache.fineract.organisation.staff.api;
 
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
@@ -69,9 +69,7 @@ import org.springframework.stereotype.Component;
 @Path("/staff")
 @Component
 @Scope("singleton")
-@Api(tags = { "Staff" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Staff", description = "Allows you to model staff members. At present the key role of significance is whether this staff member is a loan officer or not.") })
+@Tag(name = "Staff", description = "Allows you to model staff members. At present the key role of significance is whether this staff member is a loan officer or not.")
 public class StaffApiResource {
 
     /**
@@ -111,20 +109,20 @@ public class StaffApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Staff", notes = "Returns the list of staff members.\n" + "\n" + "Example Requests:\n" + "\n"
+    @Operation(summary = "Retrieve Staff", description = "Returns the list of staff members.\n" + "\n" + "Example Requests:\n" + "\n"
             + "staff\n\n\n\n" + "\n" + "Retrieve a Staff by status\n" + "\n" + "Returns the details of a Staff based on status.\n" + "\n"
             + "By default it Returns all the ACTIVE Staff.\n" + "\n" + "If status=INACTIVE, then it returns all INACTIVE Staff.\n" + "\n"
             + "and for status=ALL, it Returns both ACTIVE and INACTIVE Staff.\n" + "\n" + "Example Requests:\n" + "\n"
             + "staff?status=active")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = StaffApiResourceSwagger.GetStaffResponse.class, responseContainer = "List"),
-            @ApiResponse(code = 200, message = "GET https://DomainName/api/v1/staff?status={ACTIVE|INACTIVE|ALL}", response = StaffApiResourceSwagger.GetStaffResponse.class) })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = StaffApiResourceSwagger.GetStaffResponse.class)))),
+            @ApiResponse(responseCode = "200", description = "GET https://DomainName/api/v1/staff?status={ACTIVE|INACTIVE|ALL}", content = @Content(schema = @Schema(implementation = StaffApiResourceSwagger.GetStaffResponse.class))) })
     public String retrieveStaff(@Context final UriInfo uriInfo,
-            @QueryParam("sqlSearch") @ApiParam(value = "sqlSearch") final String sqlSearch,
-            @QueryParam("officeId") @ApiParam(value = "officeId") final Long officeId,
-            @DefaultValue("false") @QueryParam("staffInOfficeHierarchy") @ApiParam(value = "staffInOfficeHierarchy") final boolean staffInOfficeHierarchy,
-            @DefaultValue("false") @QueryParam("loanOfficersOnly") @ApiParam(value = "loanOfficersOnly") final boolean loanOfficersOnly,
-            @DefaultValue("active") @QueryParam("status") @ApiParam(value = "status") final String status) {
+            @QueryParam("sqlSearch") @Parameter(description = "sqlSearch") final String sqlSearch,
+            @QueryParam("officeId") @Parameter(description = "officeId") final Long officeId,
+            @DefaultValue("false") @QueryParam("staffInOfficeHierarchy") @Parameter(description = "staffInOfficeHierarchy") final boolean staffInOfficeHierarchy,
+            @DefaultValue("false") @QueryParam("loanOfficersOnly") @Parameter(description = "loanOfficersOnly") final boolean loanOfficersOnly,
+            @DefaultValue("active") @QueryParam("status") @Parameter(description = "status") final String status) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -142,12 +140,12 @@ public class StaffApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create a staff member", notes = "Creates a staff member.\n" + "\n" + "Mandatory Fields: \n"
+    @Operation(summary = "Create a staff member", description = "Creates a staff member.\n" + "\n" + "Mandatory Fields: \n"
             + "officeId, firstname, lastname\n" + "\n" + "Optional Fields: \n" + "isLoanOfficer, isActive")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = StaffApiResourceSwagger.PostStaffRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = StaffApiResourceSwagger.PostStaffResponse.class) })
-    public String createStaff(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = StaffApiResourceSwagger.PostStaffRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = StaffApiResourceSwagger.PostStaffResponse.class))) })
+    public String createStaff(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createStaff().withJson(apiRequestBodyAsJson).build();
 
@@ -160,10 +158,12 @@ public class StaffApiResource {
     @Path("{staffId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve a Staff Member", notes = "Returns the details of a Staff Member.\n" + "\n" + "Example Requests:\n"
+    @Operation(summary = "Retrieve a Staff Member", description = "Returns the details of a Staff Member.\n" + "\n" + "Example Requests:\n"
             + "\n" + "staff/1")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = StaffApiResourceSwagger.GetStaffResponse.class) })
-    public String retreiveStaff(@PathParam("staffId") @ApiParam(value = "staffId") final Long staffId, @Context final UriInfo uriInfo) {
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = StaffApiResourceSwagger.GetStaffResponse.class))) })
+    public String retreiveStaff(@PathParam("staffId") @Parameter(description = "staffId") final Long staffId,
+            @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions);
 
@@ -181,12 +181,12 @@ public class StaffApiResource {
     @Path("{staffId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Staff Member", notes = "Updates the details of a staff member.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = StaffApiResourceSwagger.PutStaffRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = StaffApiResourceSwagger.PutStaffResponse.class) })
-    public String updateStaff(@PathParam("staffId") @ApiParam(value = "staffId") final Long staffId,
-            @ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Update a Staff Member", description = "Updates the details of a staff member.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = StaffApiResourceSwagger.PutStaffRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = StaffApiResourceSwagger.PutStaffResponse.class))) })
+    public String updateStaff(@PathParam("staffId") @Parameter(description = "staffId") final Long staffId,
+            @Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateStaff(staffId).withJson(apiRequestBodyAsJson).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java
index f9f83b9..bfa5a81 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.organisation.staff.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.joda.time.LocalDate;
 
 /**
@@ -32,94 +31,94 @@ final class StaffApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "PostStaffRequest")
+    @Schema(description = "PostStaffRequest")
     public static final class PostStaffRequest {
 
         private PostStaffRequest() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "John")
+        @Schema(example = "John")
         public String firstname;
-        @ApiModelProperty(example = "Doe")
+        @Schema(example = "Doe")
         public String lastname;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isLoanOfficer;
-        @ApiModelProperty(example = "17H")
+        @Schema(example = "17H")
         public String externalId;
-        @ApiModelProperty(example = "+353851239876")
+        @Schema(example = "+353851239876")
         public String mobileNo;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isActive;
-        @ApiModelProperty(example = "01 January 2009")
+        @Schema(example = "01 January 2009")
         public LocalDate joiningDate;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd MMMM yyyy")
+        @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
 
     }
 
-    @ApiModel(value = "PostStaffResponse")
+    @Schema(description = "PostStaffResponse")
     public static final class PostStaffResponse {
 
         private PostStaffResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "GetStaffResponse")
+    @Schema(description = "GetStaffResponse")
     public static final class GetStaffResponse {
 
         private GetStaffResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "John")
+        @Schema(example = "John")
         public String firstname;
-        @ApiModelProperty(example = "Doe")
+        @Schema(example = "Doe")
         public String lastname;
-        @ApiModelProperty(example = "Doe, John")
+        @Schema(example = "Doe, John")
         public String displayName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isLoanOfficer;
-        @ApiModelProperty(example = "17H")
+        @Schema(example = "17H")
         public String externalId;
-        @ApiModelProperty(example = "+353851239876")
+        @Schema(example = "+353851239876")
         public Boolean isActive;
-        @ApiModelProperty(example = "[2009,8,1]")
+        @Schema(example = "[2009,8,1]")
         public LocalDate joiningDate;
 
     }
 
-    @ApiModel(value = "PutStaffRequest")
+    @Schema(description = "PutStaffRequest")
     public static final class PutStaffRequest {
 
         private PutStaffRequest() {
 
         }
 
-        @ApiModelProperty(example = "false")
+        @Schema(example = "false")
         public Boolean isLoanOfficer;
-        @ApiModelProperty(example = "17Hbb")
+        @Schema(example = "17Hbb")
         public String externalId;
 
     }
 
-    @ApiModel(value = "PutStaffResponse")
+    @Schema(description = "PutStaffResponse")
     public static final class PutStaffResponse {
 
         private PutStaffResponse() {
@@ -130,15 +129,15 @@ final class StaffApiResourceSwagger {
 
             private PutStaffResponseChanges() {}
 
-            @ApiModelProperty(example = "false")
+            @Schema(example = "false")
             public Boolean isLoanOfficer;
-            @ApiModelProperty(example = "17Hbb")
+            @Schema(example = "17Hbb")
             public String externalId;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
 
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/CashierApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/CashierApiResource.java
index e85ee4f..ac8fddd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/CashierApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/CashierApiResource.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.organisation.teller.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collection;
 import java.util.Date;
 import javax.ws.rs.Consumes;
@@ -41,8 +39,8 @@ import org.springframework.stereotype.Component;
 @Path("cashiers")
 @Component
 @Scope("singleton")
-@Api(tags = { "Cashiers" })
-@SwaggerDefinition(tags = { @Tag(name = "Cashiers", description = "") })
+
+@Tag(name = "Cashiers", description = "")
 public class CashierApiResource {
 
     private final DefaultToApiJsonSerializer<CashierData> jsonSerializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java
index 50ff531..430d695 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.organisation.teller.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collection;
 import java.util.Date;
 import javax.ws.rs.Consumes;
@@ -64,9 +64,8 @@ import org.springframework.stereotype.Component;
 @Path("tellers")
 @Component
 @Scope("singleton")
-@Api(tags = { "Teller Cash Management" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Teller Cash Management", description = "Teller cash management which will allow an organization to manage their cash transactions at branches or head office more effectively.") })
+
+@Tag(name = "Teller Cash Management", description = "Teller cash management which will allow an organization to manage their cash transactions at branches or head office more effectively.")
 public class TellerApiResource {
 
     private final PlatformSecurityContext securityContext;
@@ -88,10 +87,10 @@ public class TellerApiResource {
     @GET
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "List all tellers", notes = "Retrieves list tellers")
+    @Operation(summary = "List all tellers", description = "Retrieves list tellers")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersResponse.class, responseContainer = "List") })
-    public String getTellerData(@QueryParam("officeId") @ApiParam(value = "officeId") final Long officeId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersResponse.class)))) })
+    public String getTellerData(@QueryParam("officeId") @Parameter(description = "officeId") final Long officeId) {
         final Collection<TellerData> foundTellers = this.readPlatformService.getTellers(officeId);
 
         return this.jsonSerializer.serialize(foundTellers);
@@ -101,9 +100,10 @@ public class TellerApiResource {
     @Path("{tellerId}")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Retrieve tellers", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersResponse.class) })
-    public String findTeller(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId) {
+    @Operation(summary = "Retrieve tellers", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersResponse.class))) })
+    public String findTeller(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId) {
         final TellerData teller = this.readPlatformService.findTeller(tellerId);
 
         return this.jsonSerializer.serialize(teller);
@@ -112,12 +112,12 @@ public class TellerApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Create teller", notes = "Mandatory Fields\n" + "Teller name, OfficeId, Description, Start Date, Status\n"
+    @Operation(summary = "Create teller", description = "Mandatory Fields\n" + "Teller name, OfficeId, Description, Start Date, Status\n"
             + "Optional Fields\n" + "End Date")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = TellerApiResourceSwagger.PostTellersRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.PostTellersResponse.class) })
-    public String createTeller(@ApiParam(hidden = true) final String tellerData) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersResponse.class))) })
+    public String createTeller(@Parameter(hidden = true) final String tellerData) {
         final CommandWrapper request = new CommandWrapperBuilder().createTeller().withJson(tellerData).build();
 
         final CommandProcessingResult result = this.commandWritePlatformService.logCommandSource(request);
@@ -129,12 +129,12 @@ public class TellerApiResource {
     @Path("{tellerId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Update teller", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = TellerApiResourceSwagger.PutTellersRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.PutTellersResponse.class) })
-    public String updateTeller(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @ApiParam(hidden = true) final String tellerData) {
+    @Operation(summary = "Update teller", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PutTellersRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PutTellersResponse.class))) })
+    public String updateTeller(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @Parameter(hidden = true) final String tellerData) {
         final CommandWrapper request = new CommandWrapperBuilder().updateTeller(tellerId).withJson(tellerData).build();
 
         final CommandProcessingResult result = this.commandWritePlatformService.logCommandSource(request);
@@ -146,7 +146,7 @@ public class TellerApiResource {
     @Path("{tellerId}")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    public String deleteTeller(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId) {
+    public String deleteTeller(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId) {
         final CommandWrapper request = new CommandWrapperBuilder().deleteTeller(tellerId).build();
 
         final CommandProcessingResult result = this.commandWritePlatformService.logCommandSource(request);
@@ -158,11 +158,12 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "List Cashiers", notes = "")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersTellerIdCashiersResponse.class) })
-    public String getCashierData(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @QueryParam("fromdate") @ApiParam(value = "fromdate") final String fromDateStr,
-            @QueryParam("todate") @ApiParam(value = "todate") final String toDateStr) {
+    @Operation(summary = "List Cashiers", description = "")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersTellerIdCashiersResponse.class))) })
+    public String getCashierData(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @QueryParam("fromdate") @Parameter(description = "fromdate") final String fromDateStr,
+            @QueryParam("todate") @Parameter(description = "todate") final String toDateStr) {
         final DateTimeFormatter dateFormatter = ISODateTimeFormat.basicDate();
 
         final Date fromDate = fromDateStr != null ? dateFormatter.parseDateTime(fromDateStr).toDate() : new Date();
@@ -185,11 +186,11 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Retrieve a cashier", notes = "")
+    @Operation(summary = "Retrieve a cashier", description = "")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashierIdResponse.class) })
-    public String findCashierData(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashierIdResponse.class))) })
+    public String findCashierData(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId) {
         final CashierData cashier = this.readPlatformService.findCashier(cashierId);
 
         return this.jsonSerializer.serialize(cashier);
@@ -199,10 +200,10 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/template")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Find Cashiers", notes = "")
+    @Operation(summary = "Find Cashiers", description = "")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersTellerIdCashiersTemplateResponse.class) })
-    public String getCashierTemplate(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersTellerIdCashiersTemplateResponse.class))) })
+    public String getCashierTemplate(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId) {
 
         final TellerData teller = this.readPlatformService.findTeller(tellerId);
         Long officeId = teller.getOfficeId();
@@ -216,14 +217,14 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Create Cashiers", notes = "Mandatory Fields: \n"
+    @Operation(summary = "Create Cashiers", description = "Mandatory Fields: \n"
             + "Cashier/staff, Fromm Date, To Date, Full Day or From time and To time\n" + "\n\n\n" + "Optional Fields: \n"
             + "Description/Notes")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = TellerApiResourceSwagger.PostTellersTellerIdCashiersRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.PostTellersTellerIdCashiersResponse.class) })
-    public String createCashier(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @ApiParam(hidden = true) final String cashierData) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersTellerIdCashiersRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersTellerIdCashiersResponse.class))) })
+    public String createCashier(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @Parameter(hidden = true) final String cashierData) {
         final CommandWrapper request = new CommandWrapperBuilder().allocateTeller(tellerId).withJson(cashierData).build();
 
         final CommandProcessingResult result = this.commandWritePlatformService.logCommandSource(request);
@@ -235,14 +236,13 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Update Cashier", notes = "")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = TellerApiResourceSwagger.PutTellersTellerIdCashiersCashierIdRequest.class) })
+    @Operation(summary = "Update Cashier", description = "")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PutTellersTellerIdCashiersCashierIdRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.PutTellersTellerIdCashiersCashierIdResponse.class) })
-    public String updateCashier(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId,
-            @ApiParam(hidden = true) final String cashierDate) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PutTellersTellerIdCashiersCashierIdResponse.class))) })
+    public String updateCashier(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId,
+            @Parameter(hidden = true) final String cashierDate) {
         final CommandWrapper request = new CommandWrapperBuilder().updateAllocationTeller(tellerId, cashierId).withJson(cashierDate)
                 .build();
 
@@ -255,11 +255,11 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Delete Cashier", notes = "")
+    @Operation(summary = "Delete Cashier", description = "")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.DeleteTellersTellerIdCashiersCashierIdResponse.class) })
-    public String deleteCashier(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.DeleteTellersTellerIdCashiersCashierIdResponse.class))) })
+    public String deleteCashier(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId) {
         final CommandWrapper request = new CommandWrapperBuilder().deleteAllocationTeller(tellerId, cashierId).build();
 
         final CommandProcessingResult result = this.commandWritePlatformService.logCommandSource(request);
@@ -271,14 +271,13 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}/allocate")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Allocate Cash To Cashier", notes = "Mandatory Fields: \n" + "Date, Amount, Currency, Notes/Comments")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdAllocateRequest.class) })
+    @Operation(summary = "Allocate Cash To Cashier", description = "Mandatory Fields: \n" + "Date, Amount, Currency, Notes/Comments")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdAllocateRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdAllocateResponse.class) })
-    public String allocateCashToCashier(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId,
-            @ApiParam(hidden = true) final String cashierTxnData) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdAllocateResponse.class))) })
+    public String allocateCashToCashier(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId,
+            @Parameter(hidden = true) final String cashierTxnData) {
         final CommandWrapper request = new CommandWrapperBuilder().allocateCashToCashier(tellerId, cashierId).withJson(cashierTxnData)
                 .build();
 
@@ -292,14 +291,13 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}/settle")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Settle Cash From Cashier", notes = "Mandatory Fields\n" + "Date, Amount, Currency, Notes/Comments")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdSettleRequest.class) })
+    @Operation(summary = "Settle Cash From Cashier", description = "Mandatory Fields\n" + "Date, Amount, Currency, Notes/Comments")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdSettleRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdSettleResponse.class) })
-    public String settleCashFromCashier(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId,
-            @ApiParam(hidden = true) final String cashierTxnData) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.PostTellersTellerIdCashiersCashierIdSettleResponse.class))) })
+    public String settleCashFromCashier(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId,
+            @Parameter(hidden = true) final String cashierTxnData) {
         final CommandWrapper request = new CommandWrapperBuilder().settleCashFromCashier(tellerId, cashierId).withJson(cashierTxnData)
                 .build();
 
@@ -313,16 +311,16 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}/transactions")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Retrieve Cashier Transaction", notes = "")
+    @Operation(summary = "Retrieve Cashier Transaction", description = "")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashiersIdTransactionsResponse.class, responseContainer = "List") })
-    public String getTransactionsForCashier(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId,
-            @QueryParam("currencyCode") @ApiParam(value = "currencyCode") final String currencyCode,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashiersIdTransactionsResponse.class)))) })
+    public String getTransactionsForCashier(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId,
+            @QueryParam("currencyCode") @Parameter(description = "currencyCode") final String currencyCode,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder) {
         final TellerData teller = this.readPlatformService.findTeller(tellerId);
         final CashierData cashier = this.readPlatformService.findCashier(cashierId);
 
@@ -339,16 +337,16 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}/summaryandtransactions")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Transactions Wtih Summary For Cashier", notes = "")
+    @Operation(summary = "Transactions Wtih Summary For Cashier", description = "")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashiersIdSummaryAndTransactionsResponse.class) })
-    public String getTransactionsWtihSummaryForCashier(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId,
-            @QueryParam("currencyCode") @ApiParam(value = "currencyCode") final String currencyCode,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(value = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashiersIdSummaryAndTransactionsResponse.class))) })
+    public String getTransactionsWtihSummaryForCashier(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId,
+            @QueryParam("currencyCode") @Parameter(description = "currencyCode") final String currencyCode,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(description = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder) {
         final TellerData teller = this.readPlatformService.findTeller(tellerId);
         final CashierData cashier = this.readPlatformService.findCashier(cashierId);
 
@@ -367,11 +365,11 @@ public class TellerApiResource {
     @Path("{tellerId}/cashiers/{cashierId}/transactions/template")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(value = "Retrieve Cashier Transaction Template", notes = "")
+    @Operation(summary = "Retrieve Cashier Transaction Template", description = "")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashiersIdTransactionsTemplateResponse.class) })
-    public String getCashierTxnTemplate(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @PathParam("cashierId") @ApiParam(value = "cashierId") final Long cashierId) {
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = TellerApiResourceSwagger.GetTellersTellerIdCashiersCashiersIdTransactionsTemplateResponse.class))) })
+    public String getCashierTxnTemplate(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @PathParam("cashierId") @Parameter(description = "cashierId") final Long cashierId) {
 
         final CashierTransactionData cashierTxnTemplate = this.readPlatformService.retrieveCashierTxnTemplate(cashierId);
 
@@ -382,8 +380,8 @@ public class TellerApiResource {
     @Path("{tellerId}/transactions")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    public String getTransactionData(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @QueryParam("dateRange") @ApiParam(value = "dateRange") final String dateRange) {
+    public String getTransactionData(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @QueryParam("dateRange") @Parameter(description = "dateRange") final String dateRange) {
         final DateRange dateRangeHolder = DateRange.fromString(dateRange);
 
         final Collection<TellerTransactionData> transactions = this.readPlatformService.fetchTellerTransactionsByTellerId(tellerId,
@@ -396,8 +394,8 @@ public class TellerApiResource {
     @Path("{tellerId}/transactions/{transactionId}")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    public String findTransactionData(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerid,
-            @PathParam("transactionId") @ApiParam(value = "transactionId") final Long transactionId) {
+    public String findTransactionData(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerid,
+            @PathParam("transactionId") @Parameter(description = "transactionId") final Long transactionId) {
         final TellerTransactionData transaction = this.readPlatformService.findTellerTransaction(transactionId);
 
         return this.jsonSerializer.serialize(transaction);
@@ -407,9 +405,9 @@ public class TellerApiResource {
     @Path("{tellerId}/journals")
     @Consumes({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
     @Produces(MediaType.APPLICATION_JSON)
-    public String getJournalData(@PathParam("tellerId") @ApiParam(value = "tellerId") final Long tellerId,
-            @QueryParam("cashierId") @ApiParam(value = "cashierId") final Long cashierDate,
-            @QueryParam("dateRange") @ApiParam(value = "dateRange") final String dateRange) {
+    public String getJournalData(@PathParam("tellerId") @Parameter(description = "tellerId") final Long tellerId,
+            @QueryParam("cashierId") @Parameter(description = "cashierId") final Long cashierDate,
+            @QueryParam("dateRange") @Parameter(description = "dateRange") final String dateRange) {
         final DateRange dateRangeHolder = DateRange.fromString(dateRange);
 
         final Collection<TellerJournalData> journals = this.readPlatformService.fetchTellerJournals(tellerId, cashierDate,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java
index c4c2ee4..7b0eeee 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.organisation.teller.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
@@ -41,95 +40,95 @@ final class TellerApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetTellersResponse")
+    @Schema(description = "GetTellersResponse")
     public static final class GetTellersResponse {
 
         private GetTellersResponse() {
 
         }
 
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long id;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Long debitAccountId;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Long creditAccountId;
-        @ApiModelProperty(example = "Teller3")
+        @Schema(example = "Teller3")
         public String name;
-        @ApiModelProperty(example = "[2015,2,1]")
+        @Schema(example = "[2015,2,1]")
         public LocalDate startDate;
-        @ApiModelProperty(example = "ACTIVE")
+        @Schema(example = "ACTIVE")
         public TellerStatus status;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
     }
 
-    @ApiModel(value = "PostTellersRequest")
+    @Schema(description = "PostTellersRequest")
     public static final class PostTellersRequest {
 
         private PostTellersRequest() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Teller3")
+        @Schema(example = "Teller3")
         public String name;
-        @ApiModelProperty(example = "cash handling")
+        @Schema(example = "cash handling")
         public String description;
-        @ApiModelProperty(example = "ACTIVE")
+        @Schema(example = "ACTIVE")
         public TellerStatus status;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy")
+        @Schema(example = "dd-MM-yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "01 February 2015")
+        @Schema(example = "01 February 2015")
         public LocalDate startDate;
 
     }
 
-    @ApiModel(value = "PostTellersResponse")
+    @Schema(description = "PostTellersResponse")
     public static final class PostTellersResponse {
 
         private PostTellersResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "5")
+        @Schema(example = "5")
         public Long resourceId;
     }
 
-    @ApiModel(value = "PutTellersRequest")
+    @Schema(description = "PutTellersRequest")
     public static final class PutTellersRequest {
 
         private PutTellersRequest() {
 
         }
 
-        @ApiModelProperty(example = "Teller3")
+        @Schema(example = "Teller3")
         public String name;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "teller cash handling")
+        @Schema(example = "teller cash handling")
         public String description;
-        @ApiModelProperty(example = "ACTIVE")
+        @Schema(example = "ACTIVE")
         public TellerStatus status;
-        @ApiModelProperty(example = "28 February 2015")
+        @Schema(example = "28 February 2015")
         public LocalDate endDate;
-        @ApiModelProperty(example = "01 February 2015")
+        @Schema(example = "01 February 2015")
         public LocalDate startDate;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy")
+        @Schema(example = "dd-MM-yyyy")
         public String dateFormat;
 
     }
 
-    @ApiModel(value = "PutTellersResponse")
+    @Schema(description = "PutTellersResponse")
     public static final class PutTellersResponse {
 
         private PutTellersResponse() {
@@ -140,140 +139,140 @@ final class TellerApiResourceSwagger {
 
             private PutTellersResponseChanges() {}
 
-            @ApiModelProperty(example = "teller cash handling")
+            @Schema(example = "teller cash handling")
             public String description;
-            @ApiModelProperty(example = "28 February 2015")
+            @Schema(example = "28 February 2015")
             public LocalDate endDate;
-            @ApiModelProperty(example = "01 February 2015")
+            @Schema(example = "01 February 2015")
             public LocalDate startDate;
-            @ApiModelProperty(example = "en")
+            @Schema(example = "en")
             public String locale;
-            @ApiModelProperty(example = "dd-MM-yyyy")
+            @Schema(example = "dd-MM-yyyy")
             public String dateFormat;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "5")
+        @Schema(example = "5")
         public Long resourceId;
         public PutTellersResponseChanges changes;
 
     }
 
-    @ApiModel(value = "GetTellersTellerIdCashiersResponse")
+    @Schema(description = "GetTellersTellerIdCashiersResponse")
     public static final class GetTellersTellerIdCashiersResponse {
 
         private GetTellersTellerIdCashiersResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long tellerId;
-        @ApiModelProperty(example = "Teller1")
+        @Schema(example = "Teller1")
         public String tellerName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
         public Collection<CashierData> cashiers;
 
     }
 
-    @ApiModel(value = "PostTellersTellerIdCashiersRequest")
+    @Schema(description = "PostTellersTellerIdCashiersRequest")
     public static final class PostTellersTellerIdCashiersRequest {
 
         private PostTellersTellerIdCashiersRequest() {
 
         }
 
-        @ApiModelProperty(example = "28 February 2015")
+        @Schema(example = "28 February 2015")
         public LocalDate endDate;
-        @ApiModelProperty(example = "teller cash handling")
+        @Schema(example = "teller cash handling")
         public String description;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isFullDay;
-        @ApiModelProperty(example = "3")
+        @Schema(example = "3")
         public Long staffId;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy")
+        @Schema(example = "dd-MM-yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "01 February 2015")
+        @Schema(example = "01 February 2015")
         public LocalDate startDate;
 
     }
 
-    @ApiModel(value = "PostTellersTellerIdCashiersResponse")
+    @Schema(description = "PostTellersTellerIdCashiersResponse")
     public static final class PostTellersTellerIdCashiersResponse {
 
         private PostTellersTellerIdCashiersResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long subResourceId;
 
     }
 
-    @ApiModel(value = "GetTellersTellerIdCashiersCashierIdResponse")
+    @Schema(description = "GetTellersTellerIdCashiersCashierIdResponse")
     public static final class GetTellersTellerIdCashiersCashierIdResponse {
 
         private GetTellersTellerIdCashiersCashierIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long tellerId;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long staffId;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String description;
-        @ApiModelProperty(example = "Feb 20, 2015 12:00:00 AM")
+        @Schema(example = "Feb 20, 2015 12:00:00 AM")
         public LocalDate startDate;
-        @ApiModelProperty(example = "Feb 27, 2015 12:00:00 AM")
+        @Schema(example = "Feb 27, 2015 12:00:00 AM")
         public LocalDate endDate;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isFullDay;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String startTime;
-        @ApiModelProperty(example = "")
+        @Schema(example = "")
         public String endTime;
-        @ApiModelProperty(example = "Teller1")
+        @Schema(example = "Teller1")
         public String tellerName;
-        @ApiModelProperty(example = "Staff1, Test")
+        @Schema(example = "Staff1, Test")
         public String staffName;
 
     }
 
-    @ApiModel(value = "PutTellersTellerIdCashiersCashierIdRequest")
+    @Schema(description = "PutTellersTellerIdCashiersCashierIdRequest")
     public static final class PutTellersTellerIdCashiersCashierIdRequest {
 
         private PutTellersTellerIdCashiersCashierIdRequest() {
 
         }
 
-        @ApiModelProperty(example = "25 February 2015")
+        @Schema(example = "25 February 2015")
         public LocalDate endDate;
-        @ApiModelProperty(example = "Cashier updated.")
+        @Schema(example = "Cashier updated.")
         public String description;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean isFullDay;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long staffId;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy")
+        @Schema(example = "dd-MM-yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "01 February 2015")
+        @Schema(example = "01 February 2015")
         public LocalDate startDate;
 
     }
 
-    @ApiModel(value = "PutTellersTellerIdCashiersCashierIdResponse")
+    @Schema(description = "PutTellersTellerIdCashiersCashierIdResponse")
     public static final class PutTellersTellerIdCashiersCashierIdResponse {
 
         private PutTellersTellerIdCashiersCashierIdResponse() {
@@ -284,207 +283,207 @@ final class TellerApiResourceSwagger {
 
             private PutTellersTellerIdCashiersCashierIdResponseChanges() {}
 
-            @ApiModelProperty(example = "25 February 2015")
+            @Schema(example = "25 February 2015")
             public LocalDate endDate;
-            @ApiModelProperty(example = "Cashier updated.")
+            @Schema(example = "Cashier updated.")
             public String description;
-            @ApiModelProperty(example = "en")
+            @Schema(example = "en")
             public String locale;
-            @ApiModelProperty(example = "dd-MM-yyyy")
+            @Schema(example = "dd-MM-yyyy")
             public String dateFormat;
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long subResourceId;
         public PutTellersTellerIdCashiersCashierIdResponseChanges changes;
     }
 
-    @ApiModel(value = "DeleteTellersTellerIdCashiersCashierIdResponse")
+    @Schema(description = "DeleteTellersTellerIdCashiersCashierIdResponse")
     public static final class DeleteTellersTellerIdCashiersCashierIdResponse {
 
         private DeleteTellersTellerIdCashiersCashierIdResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 
-    @ApiModel(value = "GetTellersTellerIdCashiersTemplateResponse")
+    @Schema(description = "GetTellersTellerIdCashiersTemplateResponse")
     public static final class GetTellersTellerIdCashiersTemplateResponse {
 
         private GetTellersTellerIdCashiersTemplateResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long tellerId;
-        @ApiModelProperty(example = "Teller1")
+        @Schema(example = "Teller1")
         public String tellerName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
         public Collection<StaffData> staffOptions;
     }
 
-    @ApiModel(value = "GetTellersTellerIdCashiersCashiersIdTransactionsResponse")
+    @Schema(description = "GetTellersTellerIdCashiersCashiersIdTransactionsResponse")
     public static final class GetTellersTellerIdCashiersCashiersIdTransactionsResponse {
 
         private GetTellersTellerIdCashiersCashiersIdTransactionsResponse() {
 
         }
 
-        @ApiModelProperty(example = "8")
+        @Schema(example = "8")
         public Long id;
-        @ApiModelProperty(example = "15")
+        @Schema(example = "15")
         public Long cashierId;
         public CashierTxnType txnType;
-        @ApiModelProperty(example = "1000")
+        @Schema(example = "1000")
         public BigDecimal txnAmount;
-        @ApiModelProperty(example = "Feb 25, 2015 12:00:00 AM")
+        @Schema(example = "Feb 25, 2015 12:00:00 AM")
         public Date txnDate;
-        @ApiModelProperty(example = "2")
+        @Schema(example = "2")
         public Long entityId;
-        @ApiModelProperty(example = "loans")
+        @Schema(example = "loans")
         public String entityType;
-        @ApiModelProperty(example = "Disbursement, Loan:2-000000002,Client:1-Test 1")
+        @Schema(example = "Disbursement, Loan:2-000000002,Client:1-Test 1")
         public String txnNote;
-        @ApiModelProperty(example = "Feb 25, 2015 12:00:00 AM")
+        @Schema(example = "Feb 25, 2015 12:00:00 AM")
         public Date createdDate;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long officeId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Long tellerId;
-        @ApiModelProperty(example = "B, Ramesh")
+        @Schema(example = "B, Ramesh")
         public String cashierName;
     }
 
-    @ApiModel(value = "PostTellersTellerIdCashiersCashierIdAllocateRequest")
+    @Schema(description = "PostTellersTellerIdCashiersCashierIdAllocateRequest")
     public static final class PostTellersTellerIdCashiersCashierIdAllocateRequest {
 
         private PostTellersTellerIdCashiersCashierIdAllocateRequest() {
 
         }
 
-        @ApiModelProperty(example = "USD")
+        @Schema(example = "USD")
         public String currencyCode;
-        @ApiModelProperty(example = "5000")
+        @Schema(example = "5000")
         public BigDecimal txnAmount;
-        @ApiModelProperty(example = "allocating cash")
+        @Schema(example = "allocating cash")
         public String txnNote;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy")
+        @Schema(example = "dd-MM-yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "01 February 2015")
+        @Schema(example = "01 February 2015")
         public Date txnDate;
     }
 
-    @ApiModel(value = "PostTellersTellerIdCashiersCashierIdAllocateResponse")
+    @Schema(description = "PostTellersTellerIdCashiersCashierIdAllocateResponse")
     public static final class PostTellersTellerIdCashiersCashierIdAllocateResponse {
 
         private PostTellersTellerIdCashiersCashierIdAllocateResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public Long subResourceId;
     }
 
-    @ApiModel(value = "PostTellersTellerIdCashiersCashierIdSettleRequest")
+    @Schema(description = "PostTellersTellerIdCashiersCashierIdSettleRequest")
     public static final class PostTellersTellerIdCashiersCashierIdSettleRequest {
 
         private PostTellersTellerIdCashiersCashierIdSettleRequest() {
 
         }
 
-        @ApiModelProperty(example = "USD")
+        @Schema(example = "USD")
         public String currencyCode;
-        @ApiModelProperty(example = "2000")
+        @Schema(example = "2000")
         public BigDecimal txnAmount;
-        @ApiModelProperty(example = "cash settlement")
+        @Schema(example = "cash settlement")
         public String txnNote;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "dd-MM-yyyy")
+        @Schema(example = "dd-MM-yyyy")
         public String dateFormat;
-        @ApiModelProperty(example = "20 February 2015")
+        @Schema(example = "20 February 2015")
         public Date txnDate;
 
     }
 
-    @ApiModel(value = "PostTellersTellerIdCashiersCashierIdSettleResponse")
+    @Schema(description = "PostTellersTellerIdCashiersCashierIdSettleResponse")
     public static final class PostTellersTellerIdCashiersCashierIdSettleResponse {
 
         private PostTellersTellerIdCashiersCashierIdSettleResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
-        @ApiModelProperty(example = "5")
+        @Schema(example = "5")
         public Long subResourceId;
     }
 
-    @ApiModel(value = "GetTellersTellerIdCashiersCashiersIdSummaryAndTransactionsResponse")
+    @Schema(description = "GetTellersTellerIdCashiersCashiersIdSummaryAndTransactionsResponse")
     public static final class GetTellersTellerIdCashiersCashiersIdSummaryAndTransactionsResponse {
 
         private GetTellersTellerIdCashiersCashiersIdSummaryAndTransactionsResponse() {
 
         }
 
-        @ApiModelProperty(example = "7000.000000")
+        @Schema(example = "7000.000000")
         public BigDecimal sumCashAllocation;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public BigDecimal sumInwardCash;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public BigDecimal sumOutwardCash;
-        @ApiModelProperty(example = "50.000000")
+        @Schema(example = "50.000000")
         public BigDecimal sumCashSettlement;
-        @ApiModelProperty(example = "6950.000000")
+        @Schema(example = "6950.000000")
         public BigDecimal netCash;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public long tellerId;
-        @ApiModelProperty(example = "Teller1")
+        @Schema(example = "Teller1")
         public String tellerName;
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public long cashierId;
-        @ApiModelProperty(example = "Staff1, Test")
+        @Schema(example = "Staff1, Test")
         public String cashierName;
         public Page<CashierTransactionData> cashierTransactions;
 
     }
 
-    @ApiModel(value = "GetTellersTellerIdCashiersCashiersIdTransactionsTemplateResponse")
+    @Schema(description = "GetTellersTellerIdCashiersCashiersIdTransactionsTemplateResponse")
     public static final class GetTellersTellerIdCashiersCashiersIdTransactionsTemplateResponse {
 
         private GetTellersTellerIdCashiersCashiersIdTransactionsTemplateResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long cashierId;
-        @ApiModelProperty(example = "Head Office")
+        @Schema(example = "Head Office")
         public String officeName;
-        @ApiModelProperty(example = "0")
+        @Schema(example = "0")
         public Long tellerId;
-        @ApiModelProperty(example = "Teller1")
+        @Schema(example = "Teller1")
         public String tellerName;
-        @ApiModelProperty(example = "Staff1, Test")
+        @Schema(example = "Staff1, Test")
         public String cashierName;
         public CashierData cashierData;
-        @ApiModelProperty(example = "Feb 20, 2015 12:00:00 AM")
+        @Schema(example = "Feb 20, 2015 12:00:00 AM")
         public LocalDate startDate;
-        @ApiModelProperty(example = "Feb 27, 2015 12:00:00 AM")
+        @Schema(example = "Feb 27, 2015 12:00:00 AM")
         public LocalDate endDate;
         public Collection<CurrencyData> currencyOptions;
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerJournalApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerJournalApiResource.java
index ac0b014..275b03f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerJournalApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerJournalApiResource.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.organisation.teller.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.Collection;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -41,8 +39,8 @@ import org.springframework.stereotype.Component;
 @Path("cashiersjournal")
 @Component
 @Scope("singleton")
-@Api(tags = { "Cashier Journals" })
-@SwaggerDefinition(tags = { @Tag(name = "Cashier Journals", description = "") })
+
+@Tag(name = "Cashier Journals", description = "")
 public class TellerJournalApiResource {
 
     private final PlatformSecurityContext securityContext;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResource.java
index bfc0ec6..99cf2f7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResource.java
@@ -18,15 +18,15 @@
  */
 package org.apache.fineract.organisation.workingdays.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+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.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.PUT;
@@ -52,11 +52,11 @@ import org.springframework.stereotype.Component;
 @Path("/workingdays")
 @Component
 @Scope("singleton")
-@Api(tags = { "Working days" })
-@SwaggerDefinition(tags = { @Tag(name = "Working days", description = "The days of the week that are workdays.\n" + "\n"
+
+@Tag(name = "Working days", description = "The days of the week that are workdays.\n" + "\n"
         + "Rescheduling of repayments when it falls on a non-working is turned on /off by enable/disable reschedule-future-repayments parameter in Global configurations\n"
         + "\n"
-        + "Allow transactions on non-working days is configurable by enabling/disbaling the allow-transactions-on-non_workingday parameter in Global configurations.") })
+        + "Allow transactions on non-working days is configurable by enabling/disbaling the allow-transactions-on-non_workingday parameter in Global configurations.")
 public class WorkingDaysApiResource {
 
     private final DefaultToApiJsonSerializer<WorkingDaysData> toApiJsonSerializer;
@@ -80,9 +80,9 @@ public class WorkingDaysApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List Working days", notes = "Example Requests:\n" + "\n" + "workingdays")
+    @Operation(summary = "List Working days", description = "Example Requests:\n" + "\n" + "workingdays")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "", response = WorkingDaysApiResourceSwagger.GetWorkingDaysResponse.class, responseContainer = "list") })
+            @ApiResponse(responseCode = "200", description = "", content = @Content(array = @ArraySchema(schema = @Schema(implementation = WorkingDaysApiResourceSwagger.GetWorkingDaysResponse.class)))) })
     public String retrieveAll(@Context final UriInfo uriInfo) {
         this.context.authenticatedUser().validateHasReadPermission(WorkingDaysApiConstants.WORKING_DAYS_RESOURCE_NAME);
         final WorkingDaysData workingDaysData = this.workingDaysReadPlatformService.retrieve();
@@ -94,12 +94,12 @@ public class WorkingDaysApiResource {
     @PUT
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Update a Working Day", notes = "Mandatory Fields\n"
+    @Operation(summary = "Update a Working Day", description = "Mandatory Fields\n"
             + "recurrence,repaymentRescheduleType,extendTermForDailyRepayments,locale")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = WorkingDaysApiResourceSwagger.PutWorkingDaysRequest.class) })
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = WorkingDaysApiResourceSwagger.PutWorkingDaysResponse.class) })
-    public String update(@ApiParam(hidden = true) final String jsonRequestBody) {
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = WorkingDaysApiResourceSwagger.PutWorkingDaysRequest.class)))
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = WorkingDaysApiResourceSwagger.PutWorkingDaysResponse.class))) })
+    public String update(@Parameter(hidden = true) final String jsonRequestBody) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().updateWorkingDays().withJson(jsonRequestBody).build();
 
@@ -112,9 +112,10 @@ public class WorkingDaysApiResource {
     @Path("/template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Working Days Template", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for working days.\n"
+    @Operation(summary = "Working Days Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for working days.\n"
             + "\n" + "Example Request:\n" + "\n" + "workingdays/template")
-    @ApiResponses({ @ApiResponse(code = 200, message = "", response = WorkingDaysApiResourceSwagger.GetWorkingDaysTemplateResponse.class) })
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "", content = @Content(schema = @Schema(implementation = WorkingDaysApiResourceSwagger.GetWorkingDaysTemplateResponse.class))) })
     public String template(@Context final UriInfo uriInfo) {
         this.context.authenticatedUser().validateHasReadPermission(WorkingDaysApiConstants.WORKING_DAYS_RESOURCE_NAME);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResourceSwagger.java
index 318a261..1da8075 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.organisation.workingdays.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Collection;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
@@ -33,23 +32,23 @@ final class WorkingDaysApiResourceSwagger {
 
     }
 
-    @ApiModel(value = "GetWorkingDaysResponse")
+    @Schema(description = "GetWorkingDaysResponse")
     public static final class GetWorkingDaysResponse {
 
         private GetWorkingDaysResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long id;
-        @ApiModelProperty(example = "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR")
+        @Schema(example = "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR")
         public String recurrence;
         public EnumOptionData repaymentRescheduleType;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean extendTermForDailyRepayments;
     }
 
-    @ApiModel(value = "GetWorkingDaysTemplateResponse")
+    @Schema(description = "GetWorkingDaysTemplateResponse")
     public static final class GetWorkingDaysTemplateResponse {
 
         private GetWorkingDaysTemplateResponse() {
@@ -59,31 +58,31 @@ final class WorkingDaysApiResourceSwagger {
         public Collection<EnumOptionData> repaymentRescheduleOptions;
     }
 
-    @ApiModel(value = "PutWorkingDaysRequest")
+    @Schema(description = "PutWorkingDaysRequest")
     public static final class PutWorkingDaysRequest {
 
         private PutWorkingDaysRequest() {
 
         }
 
-        @ApiModelProperty(example = "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR")
+        @Schema(example = "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR")
         public String recurrence;
-        @ApiModelProperty(example = "en")
+        @Schema(example = "en")
         public String locale;
-        @ApiModelProperty(example = "4")
+        @Schema(example = "4")
         public EnumOptionData repaymentRescheduleType;
-        @ApiModelProperty(example = "true")
+        @Schema(example = "true")
         public Boolean extendTermForDailyRepayments;
     }
 
-    @ApiModel(value = "PutWorkingDaysResponse")
+    @Schema(description = "PutWorkingDaysResponse")
     public static final class PutWorkingDaysResponse {
 
         private PutWorkingDaysResponse() {
 
         }
 
-        @ApiModelProperty(example = "1")
+        @Schema(example = "1")
         public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java
index c7b8441..70d89ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResource.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.portfolio.account.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+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;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -56,9 +55,7 @@ import org.springframework.stereotype.Component;
 @Path("/accounttransfers")
 @Component
 @Scope("singleton")
-@Api(tags = { "Account Transfers" })
-@SwaggerDefinition(tags = {
-        @Tag(name = "Account Transfers", description = "Ability to be able to transfer monetary funds from one account to another.\n\nNote: At present only savings account to savings account transfers are supported.") })
+@Tag(name = "Account Transfers", description = "Ability to be able to transfer monetary funds from one account to another.\n\nNote: At present only savings account to savings account transfers are supported.")
 public class AccountTransfersApiResource {
 
     private final PlatformSecurityContext context;
@@ -84,21 +81,22 @@ public class AccountTransfersApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Account Transfer Template", httpMethod = "GET", notes = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n\n"
+    @Operation(summary = "Retrieve Account Transfer Template", description = "This is a convenience resource. It can be useful when building maintenance user interface screens for client applications. The template data returned consists of any or all of:\n\n"
             + "\n\n" + "Field Defaults\n\n" + "Allowed Value Lists\n\n" + "Example Requests:\n\n" + "\n\n"
             + "accounttransfers/template?fromAccountType=2&fromOfficeId=1\n\n" + "\n\n"
             + "accounttransfers/template?fromAccountType=2&fromOfficeId=1&fromClientId=1\n\n" + "\n\n"
             + "accounttransfers/template?fromClientId=1&fromAccountType=2&fromAccountId=1")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = AccountTransfersApiResourceSwagger.GetAccountTransfersTemplateResponse.class) })
-    public String template(@QueryParam("fromOfficeId") @ApiParam(value = "fromOfficeId") final Long fromOfficeId,
-            @QueryParam("fromClientId") @ApiParam(value = "fromClientId") final Long fromClientId,
-            @QueryParam("fromAccountId") @ApiParam(value = "fromAccountId") final Long fromAccountId,
-            @QueryParam("fromAccountType") @ApiParam(value = "fromAccountType") final Integer fromAccountType,
-            @QueryParam("toOfficeId") @ApiParam(value = "toOfficeId") final Long toOfficeId,
-            @QueryParam("toClientId") @ApiParam(value = "toClientId") final Long toClientId,
-            @QueryParam("toAccountId") @ApiParam(value = "toAccountId") final Long toAccountId,
-            @QueryParam("toAccountType") @ApiParam(value = "toAccountType") final Integer toAccountType, @Context final UriInfo uriInfo) {
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.GetAccountTransfersTemplateResponse.class))) })
+    public String template(@QueryParam("fromOfficeId") @Parameter(description = "fromOfficeId") final Long fromOfficeId,
+            @QueryParam("fromClientId") @Parameter(description = "fromClientId") final Long fromClientId,
+            @QueryParam("fromAccountId") @Parameter(description = "fromAccountId") final Long fromAccountId,
+            @QueryParam("fromAccountType") @Parameter(description = "fromAccountType") final Integer fromAccountType,
+            @QueryParam("toOfficeId") @Parameter(description = "toOfficeId") final Long toOfficeId,
+            @QueryParam("toClientId") @Parameter(description = "toClientId") final Long toClientId,
+            @QueryParam("toAccountId") @Parameter(description = "toAccountId") final Long toAccountId,
+            @QueryParam("toAccountType") @Parameter(description = "toAccountType") final Integer toAccountType,
+            @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(AccountTransfersApiConstants.ACCOUNT_TRANSFER_RESOURCE_NAME);
 
@@ -112,12 +110,10 @@ public class AccountTransfersApiResource {
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Create new Transfer", httpMethod = "POST", notes = "Ability to create new transfer of monetary funds from one account to another.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = AccountTransfersApiResourceSwagger.PostAccountTransfersRequest.class) })
-    @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = AccountTransfersApiResourceSwagger.PostAccountTransfersResponse.class) })
-    public String create(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+    @Operation(summary = "Create new Transfer", description = "Ability to create new transfer of monetary funds from one account to another.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.PostAccountTransfersRequest.class)))
+    @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.PostAccountTransfersResponse.class)))
+    public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().createAccountTransfer().withJson(apiRequestBodyAsJson).build();
 
@@ -129,18 +125,18 @@ public class AccountTransfersApiResource {
     @GET
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "List account transfers", httpMethod = "GET", notes = "Lists account's transfers\n\n" + "Example Requests:\n\n"
-            + "\n\n" + "accounttransfers")
+    @Operation(summary = "List account transfers", description = "Lists account's transfers\n\n" + "Example Requests:\n\n" + "\n\n"
+            + "accounttransfers")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = AccountTransfersApiResourceSwagger.GetAccountTransfersResponse.class) })
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.GetAccountTransfersResponse.class))) })
     public String retrieveAll(@Context final UriInfo uriInfo,
-            @QueryParam("sqlSearch") @ApiParam(value = "sqlSearch") final String sqlSearch,
-            @QueryParam("externalId") @ApiParam(value = "externalId") final String externalId,
-            @QueryParam("offset") @ApiParam(value = "offset") final Integer offset,
-            @QueryParam("limit") @ApiParam(example = "limit") final Integer limit,
-            @QueryParam("orderBy") @ApiParam(value = "orderBy") final String orderBy,
-            @QueryParam("sortOrder") @ApiParam(value = "sortOrder") final String sortOrder,
-            @QueryParam("accountDetailId") @ApiParam(value = "accountDetailId") final Long accountDetailId) {
+            @QueryParam("sqlSearch") @Parameter(description = "sqlSearch") final String sqlSearch,
+            @QueryParam("externalId") @Parameter(description = "externalId") final String externalId,
+            @QueryParam("offset") @Parameter(description = "offset") final Integer offset,
+            @QueryParam("limit") @Parameter(example = "limit") final Integer limit,
+            @QueryParam("orderBy") @Parameter(description = "orderBy") final String orderBy,
+            @QueryParam("sortOrder") @Parameter(description = "sortOrder") final String sortOrder,
+            @QueryParam("accountDetailId") @Parameter(description = "accountDetailId") final Long accountDetailId) {
 
         this.context.authenticatedUser().validateHasReadPermission(AccountTransfersApiConstants.ACCOUNT_TRANSFER_RESOURCE_NAME);
 
@@ -157,11 +153,11 @@ public class AccountTransfersApiResource {
     @Path("{transferId}")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve account transfer", httpMethod = "GET", notes = "Retrieves account transfer\n\n"
-            + "Example Requests :\n\n" + "\n\n" + "accounttransfers/1")
+    @Operation(summary = "Retrieve account transfer", description = "Retrieves account transfer\n\n" + "Example Requests :\n\n" + "\n\n"
+            + "accounttransfers/1")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = AccountTransfersApiResourceSwagger.GetAccountTransfersResponse.GetAccountTransfersPageItems.class) })
-    public String retrieveOne(@PathParam("transferId") @ApiParam(value = "transferId") final Long transferId,
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.GetAccountTransfersResponse.GetAccountTransfersPageItems.class))) })
+    public String retrieveOne(@PathParam("transferId") @Parameter(description = "transferId") final Long transferId,
             @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(AccountTransfersApiConstants.ACCOUNT_TRANSFER_RESOURCE_NAME);
@@ -176,19 +172,20 @@ public class AccountTransfersApiResource {
     @Path("templateRefundByTransfer")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Retrieve Refund of an Active Loan by Transfer Template", httpMethod = "GET", notes = "Retrieves Refund of an Active Loan by Transfer Template"
+    @Operation(summary = "Retrieve Refund of an Active Loan by Transfer Template", description = "Retrieves Refund of an Active Loan by Transfer Template"
             + "Example Requests :\n\n" + "\n\n"
             + "accounttransfers/templateRefundByTransfer?fromAccountId=2&fromAccountType=1& toAccountId=1&toAccountType=2&toClientId=1&toOfficeId=1")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = AccountTransfersApiResourceSwagger.GetAccountTransfersTemplateRefundByTransferResponse.class) })
-    public String templateRefundByTransfer(@QueryParam("fromOfficeId") @ApiParam(value = "fromOfficeId") final Long fromOfficeId,
-            @QueryParam("fromClientId") @ApiParam(value = "fromClientId") final Long fromClientId,
-            @QueryParam("fromAccountId") @ApiParam(value = "fromAccountId") final Long fromAccountId,
-            @QueryParam("fromAccountType") @ApiParam(value = "fromAccountType") final Integer fromAccountType,
-            @QueryParam("toOfficeId") @ApiParam(value = "toOfficeId") final Long toOfficeId,
-            @QueryParam("toClientId") @ApiParam(value = "toClientId") final Long toClientId,
-            @QueryParam("toAccountId") @ApiParam(value = "toAccountId") final Long toAccountId,
-            @QueryParam("toAccountType") @ApiParam(value = "toAccountType") final Integer toAccountType, @Context final UriInfo uriInfo) {
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.GetAccountTransfersTemplateRefundByTransferResponse.class))) })
+    public String templateRefundByTransfer(@QueryParam("fromOfficeId") @Parameter(description = "fromOfficeId") final Long fromOfficeId,
+            @QueryParam("fromClientId") @Parameter(description = "fromClientId") final Long fromClientId,
+            @QueryParam("fromAccountId") @Parameter(description = "fromAccountId") final Long fromAccountId,
+            @QueryParam("fromAccountType") @Parameter(description = "fromAccountType") final Integer fromAccountType,
+            @QueryParam("toOfficeId") @Parameter(description = "toOfficeId") final Long toOfficeId,
+            @QueryParam("toClientId") @Parameter(description = "toClientId") final Long toClientId,
+            @QueryParam("toAccountId") @Parameter(description = "toAccountId") final Long toAccountId,
+            @QueryParam("toAccountType") @Parameter(description = "toAccountType") final Integer toAccountType,
+            @Context final UriInfo uriInfo) {
 
         this.context.authenticatedUser().validateHasReadPermission(AccountTransfersApiConstants.ACCOUNT_TRANSFER_RESOURCE_NAME);
 
@@ -203,12 +200,11 @@ public class AccountTransfersApiResource {
     @Path("refundByTransfer")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(value = "Refund of an Active Loan by Transfer", httpMethod = "POST", notes = "Ability to refund an active loan by transferring to a savings account.")
-    @ApiImplicitParams({
-            @ApiImplicitParam(value = "body", required = true, paramType = "body", dataType = "body", format = "body", dataTypeClass = AccountTransfersApiResourceSwagger.PostAccountTransfersRefundByTransferRequest.class) })
+    @Operation(summary = "Refund of an Active Loan by Transfer", description = "Ability to refund an active loan by transferring to a savings account.")
+    @RequestBody(required = true, content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.PostAccountTransfersRefundByTransferRequest.class)))
     @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = AccountTransfersApiResourceSwagger.PostAccountTransfersRefundByTransferResponse.class) })
-    public String templateRefundByTransferPost(@ApiParam(hidden = true) final String apiRequestBodyAsJson) {
+            @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AccountTransfersApiResourceSwagger.PostAccountTransfersRefundByTransferResponse.class))) })
+    public String templateRefundByTransferPost(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
 
         final CommandWrapper commandRequest = new CommandWrapperBuilder().refundByTransfer().withJson(apiRequestBodyAsJson).build();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
index e90cd5e..8757da3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
@@ -18,8 +18,7 @@
  */
 package org.apache.fineract.portfolio.account.api;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDate;
... 26450 lines suppressed ...


Mime
View raw message