diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml
index 8bb329c1cfa..5d2fb3616ff 100644
--- a/openmetadata-service/pom.xml
+++ b/openmetadata-service/pom.xml
@@ -1139,9 +1139,11 @@
           <outputPath>${basedir}/target/classes/assets</outputPath>
           <outputFormat>JSONANDYAML</outputFormat>
           <resourcePackages>
+            <package>org.openmetadata.service</package>
             <package>org.openmetadata.service.resources</package>
           </resourcePackages>
           <prettyPrint>true</prettyPrint>
+          <contextId>default</contextId>
           <openAPI>
             <info>
               <title>OpenMetadata APIs</title>
@@ -1149,40 +1151,14 @@
               <description>Common types and API definition for OpenMetadata</description>
               <contact>
                 <name>OpenMetadata</name>
-                <url>https://open-metadata.org/</url>
-                <email>dev@open-metadata.org</email>
+                <url>https://open-metadata.org</url>
+                <email>openmetadata-dev@googlegroups.com</email>
               </contact>
               <license>
                 <name>Apache 2.0</name>
-                <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+                <url>https://www.apache.org/licenses/LICENSE-2.0</url>
               </license>
             </info>
-            <servers>
-              <server>
-                <url>/api</url>
-                <description>Current Host</description>
-              </server>
-              <server>
-                <url>http://localhost:8585/api</url>
-                <description>Endpoint URL</description>
-              </server>
-            </servers>
-            <components>
-              <securitySchemes>
-                <securityScheme>
-                  <key>BearerAuth</key>
-                  <securityScheme>
-                    <type>http</type>
-                    <scheme>bearer</scheme>
-                  </securityScheme>
-                </securityScheme>
-              </securitySchemes>
-            </components>
-            <security>
-              <securityRequirement>
-                <name>BearerAuth</name>
-              </securityRequirement>
-            </security>
           </openAPI>
         </configuration>
         <executions>
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java
index fed24088192..be1a80e1b10 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java
@@ -30,6 +30,15 @@ import io.federecio.dropwizard.swagger.SwaggerBundle;
 import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;
 import io.socket.engineio.server.EngineIoServerOptions;
 import io.socket.engineio.server.JettyWebSocketHandler;
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
+import io.swagger.v3.oas.annotations.info.Contact;
+import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.info.License;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.security.SecurityScheme;
+import io.swagger.v3.oas.annotations.security.SecuritySchemes;
+import io.swagger.v3.oas.annotations.servers.Server;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.FilterRegistration;
 import jakarta.servlet.ServletRegistration;
@@ -139,6 +148,31 @@ import org.quartz.SchedulerException;
 
 /** Main catalog application */
 @Slf4j
+@OpenAPIDefinition(
+    info =
+        @Info(
+            title = "OpenMetadata APIs",
+            version = "1.8.0",
+            description = "Common types and API definition for OpenMetadata",
+            contact =
+                @Contact(
+                    name = "OpenMetadata",
+                    url = "https://open-metadata.org",
+                    email = "openmetadata-dev@googlegroups.com"),
+            license =
+                @License(name = "Apache 2.0", url = "https://www.apache.org/licenses/LICENSE-2.0")),
+    servers = {
+      @Server(url = "/api", description = "Current Host"),
+      @Server(url = "http://localhost:8585/api", description = "Endpoint URL")
+    },
+    security = @SecurityRequirement(name = "BearerAuth"))
+@SecuritySchemes({
+  @SecurityScheme(
+      name = "BearerAuth",
+      type = SecuritySchemeType.HTTP,
+      scheme = "bearer",
+      bearerFormat = "JWT")
+})
 public class OpenMetadataApplication extends Application<OpenMetadataApplicationConfig> {
   protected Authorizer authorizer;
   private AuthenticatorHandler authenticatorHandler;