diff --git a/src/Kiota.Builder/Configuration/SearchConfiguration.cs b/src/Kiota.Builder/Configuration/SearchConfiguration.cs
index 8663c5b2dc..eaafb9458e 100644
--- a/src/Kiota.Builder/Configuration/SearchConfiguration.cs
+++ b/src/Kiota.Builder/Configuration/SearchConfiguration.cs
@@ -6,6 +6,7 @@ public class SearchConfiguration : SearchConfigurationBase, ICloneable
 {
     public Uri APIsGuruListUrl { get; set; } = new("https://raw.githubusercontent.com/APIs-guru/openapi-directory/gh-pages/v2/list.json");
     public GitHubConfiguration GitHub { get; set; } = new();
+    public ApicurioConfiguration Apicurio { get; set; } = new();
 
     public object Clone()
     {
@@ -13,6 +14,7 @@ public object Clone()
         {
             APIsGuruListUrl = new(APIsGuruListUrl.ToString(), UriKind.RelativeOrAbsolute),
             GitHub = (GitHubConfiguration)GitHub.Clone(),
+            Apicurio = (ApicurioConfiguration)Apicurio.Clone(),
             ClearCache = ClearCache
         };
     }
@@ -36,3 +38,39 @@ public object Clone()
         };
     }
 }
+
+public class ApicurioConfiguration : ICloneable
+{
+    public enum ApicurioSearchBy
+    {
+        LABEL,
+        PROPERTY
+    }
+
+    public Uri? ApiBaseUrl
+    {
+        get; set;
+    }
+
+    public Uri? UIBaseUrl
+    {
+        get; set;
+    }
+
+    public int ArtifactsLimit { get; set; } = 10;
+    public int VersionsLimit { get; set; } = 100;
+
+    public ApicurioSearchBy SearchBy { get; set; } = ApicurioSearchBy.LABEL;
+
+    public object Clone()
+    {
+        return new ApicurioConfiguration
+        {
+            ApiBaseUrl = (ApiBaseUrl != null) ? new(ApiBaseUrl.ToString(), UriKind.RelativeOrAbsolute) : null,
+            UIBaseUrl = (UIBaseUrl != null) ? new(UIBaseUrl.ToString(), UriKind.RelativeOrAbsolute) : null,
+            ArtifactsLimit = ArtifactsLimit,
+            VersionsLimit = VersionsLimit,
+            SearchBy = SearchBy
+        };
+    }
+}
diff --git a/src/Kiota.Builder/KiotaSearcher.cs b/src/Kiota.Builder/KiotaSearcher.cs
index 04d54bf3f0..3ebc093993 100644
--- a/src/Kiota.Builder/KiotaSearcher.cs
+++ b/src/Kiota.Builder/KiotaSearcher.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Kiota.Builder.Configuration;
 using Kiota.Builder.SearchProviders;
+using Kiota.Builder.SearchProviders.Apicurio;
 using Kiota.Builder.SearchProviders.APIsGuru;
 using Kiota.Builder.SearchProviders.GitHub;
 using Kiota.Builder.SearchProviders.MSGraph;
@@ -20,9 +21,11 @@ public class KiotaSearcher
     private readonly SearchConfiguration _config;
     private readonly HttpClient _httpClient;
     private readonly IAuthenticationProvider? _gitHubAuthenticationProvider;
+
+    private readonly IAuthenticationProvider? _apicurioAuthenticationProvider;
     private readonly Func<CancellationToken, Task<bool>> _isGitHubSignedInCallBack;
 
-    public KiotaSearcher(ILogger<KiotaSearcher> logger, SearchConfiguration config, HttpClient httpClient, IAuthenticationProvider? gitHubAuthenticationProvider, Func<CancellationToken, Task<bool>> isGitHubSignedInCallBack)
+    public KiotaSearcher(ILogger<KiotaSearcher> logger, SearchConfiguration config, HttpClient httpClient, IAuthenticationProvider? gitHubAuthenticationProvider, Func<CancellationToken, Task<bool>> isGitHubSignedInCallBack, IAuthenticationProvider? apicurioAuthenticationProvider)
     {
         ArgumentNullException.ThrowIfNull(logger);
         ArgumentNullException.ThrowIfNull(config);
@@ -32,6 +35,7 @@ public KiotaSearcher(ILogger<KiotaSearcher> logger, SearchConfiguration config,
         _httpClient = httpClient;
         _gitHubAuthenticationProvider = gitHubAuthenticationProvider;
         _isGitHubSignedInCallBack = isGitHubSignedInCallBack;
+        _apicurioAuthenticationProvider = apicurioAuthenticationProvider;
     }
     public async Task<IDictionary<string, SearchResult>> SearchAsync(string? searchTerm, string? version, CancellationToken cancellationToken)
     {
@@ -45,10 +49,12 @@ public async Task<IDictionary<string, SearchResult>> SearchAsync(string? searchT
         _logger.LogDebug("searching APIs.guru with url {Url}", _config.APIsGuruListUrl);
         var oasProvider = new OpenApiSpecSearchProvider();
         var githubProvider = new GitHubSearchProvider(_httpClient, _logger, _config.ClearCache, _config.GitHub, _gitHubAuthenticationProvider, _isGitHubSignedInCallBack);
+        var apicurioProvider = new ApicurioSearchProvider(_httpClient, _logger, _config.ClearCache, _config.Apicurio, _apicurioAuthenticationProvider);
         var results = await Task.WhenAll(
                         SearchProviderAsync(searchTerm, version, apiGurusSearchProvider, cancellationToken),
                         SearchProviderAsync(searchTerm, version, oasProvider, cancellationToken),
-                        SearchProviderAsync(searchTerm, version, githubProvider, cancellationToken)).ConfigureAwait(false);
+                        SearchProviderAsync(searchTerm, version, githubProvider, cancellationToken),
+                        SearchProviderAsync(searchTerm, version, apicurioProvider, cancellationToken)).ConfigureAwait(false);
         return results.SelectMany(static x => x)
                 .ToDictionary(static x => x.Key, static x => x.Value, StringComparer.OrdinalIgnoreCase);
     }
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/ApicurioClient.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/ApicurioClient.cs
new file mode 100644
index 0000000000..66cb842575
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/ApicurioClient.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+using ApiSdk.Groups;
+using ApiSdk.Search;
+using Microsoft.Kiota.Abstractions.Extensions;
+using Microsoft.Kiota.Abstractions;
+using Microsoft.Kiota.Serialization.Form;
+using Microsoft.Kiota.Serialization.Json;
+using Microsoft.Kiota.Serialization.Multipart;
+using Microsoft.Kiota.Serialization.Text;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
+namespace ApiSdk {
+    /// <summary>
+    /// The main entry point of the SDK, exposes the configuration and the fluent API.
+    /// </summary>
+    public class ApicurioClient : BaseRequestBuilder {
+        /// <summary>The groups property</summary>
+        public GroupsRequestBuilder Groups { get =>
+            new GroupsRequestBuilder(PathParameters, RequestAdapter);
+        }
+        /// <summary>The search property</summary>
+        public SearchRequestBuilder Search { get =>
+            new SearchRequestBuilder(PathParameters, RequestAdapter);
+        }
+        /// <summary>
+        /// Instantiates a new ApicurioClient and sets the default values.
+        /// </summary>
+        /// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
+        public ApicurioClient(IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}", new Dictionary<string, object>()) {
+            ApiClientBuilder.RegisterDefaultSerializer<JsonSerializationWriterFactory>();
+            ApiClientBuilder.RegisterDefaultSerializer<TextSerializationWriterFactory>();
+            ApiClientBuilder.RegisterDefaultSerializer<FormSerializationWriterFactory>();
+            ApiClientBuilder.RegisterDefaultSerializer<MultipartSerializationWriterFactory>();
+            ApiClientBuilder.RegisterDefaultDeserializer<JsonParseNodeFactory>();
+            ApiClientBuilder.RegisterDefaultDeserializer<TextParseNodeFactory>();
+            ApiClientBuilder.RegisterDefaultDeserializer<FormParseNodeFactory>();
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Groups/GroupsRequestBuilder.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Groups/GroupsRequestBuilder.cs
new file mode 100644
index 0000000000..91f493a97d
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Groups/GroupsRequestBuilder.cs
@@ -0,0 +1,36 @@
+// <auto-generated/>
+using ApiSdk.Groups.Item;
+using Microsoft.Kiota.Abstractions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
+namespace ApiSdk.Groups {
+    /// <summary>
+    /// Builds and executes requests for operations under \groups
+    /// </summary>
+    public class GroupsRequestBuilder : BaseRequestBuilder {
+        /// <summary>Gets an item from the ApiSdk.groups.item collection</summary>
+        /// <param name="position">Unique identifier of the item</param>
+        public WithGroupItemRequestBuilder this[string position] { get {
+            var urlTplParams = new Dictionary<string, object>(PathParameters);
+            urlTplParams.Add("groupId", position);
+            return new WithGroupItemRequestBuilder(urlTplParams, RequestAdapter);
+        } }
+        /// <summary>
+        /// Instantiates a new GroupsRequestBuilder and sets the default values.
+        /// </summary>
+        /// <param name="pathParameters">Path parameters for the request</param>
+        /// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
+        public GroupsRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/groups", pathParameters) {
+        }
+        /// <summary>
+        /// Instantiates a new GroupsRequestBuilder and sets the default values.
+        /// </summary>
+        /// <param name="rawUrl">The raw URL to use for the request builder.</param>
+        /// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
+        public GroupsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/groups", rawUrl) {
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Groups/Item/WithGroupItemRequestBuilder.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Groups/Item/WithGroupItemRequestBuilder.cs
new file mode 100644
index 0000000000..df281729be
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Groups/Item/WithGroupItemRequestBuilder.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+using ApiSdk.Groups.Item.Artifacts;
+using Microsoft.Kiota.Abstractions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
+namespace ApiSdk.Groups.Item {
+    /// <summary>
+    /// Builds and executes requests for operations under \groups\{groupId}
+    /// </summary>
+    public class WithGroupItemRequestBuilder : BaseRequestBuilder {
+        /// <summary>The artifacts property</summary>
+        public ArtifactsRequestBuilder Artifacts { get =>
+            new ArtifactsRequestBuilder(PathParameters, RequestAdapter);
+        }
+        /// <summary>
+        /// Instantiates a new WithGroupItemRequestBuilder and sets the default values.
+        /// </summary>
+        /// <param name="pathParameters">Path parameters for the request</param>
+        /// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
+        public WithGroupItemRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/groups/{groupId}", pathParameters) {
+        }
+        /// <summary>
+        /// Instantiates a new WithGroupItemRequestBuilder and sets the default values.
+        /// </summary>
+        /// <param name="rawUrl">The raw URL to use for the request builder.</param>
+        /// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
+        public WithGroupItemRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/groups/{groupId}", rawUrl) {
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactReference.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactReference.cs
new file mode 100644
index 0000000000..e4244f0ed3
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactReference.cs
@@ -0,0 +1,84 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// A reference to a different artifact. Typically used with artifact types that can have dependencies like Protobuf.
+    /// </summary>
+    public class ArtifactReference : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>The artifactId property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? ArtifactId { get; set; }
+#nullable restore
+#else
+        public string ArtifactId { get; set; }
+#endif
+        /// <summary>The groupId property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? GroupId { get; set; }
+#nullable restore
+#else
+        public string GroupId { get; set; }
+#endif
+        /// <summary>The name property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Name { get; set; }
+#nullable restore
+#else
+        public string Name { get; set; }
+#endif
+        /// <summary>The version property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Version { get; set; }
+#nullable restore
+#else
+        public string Version { get; set; }
+#endif
+        /// <summary>
+        /// Instantiates a new ArtifactReference and sets the default values.
+        /// </summary>
+        public ArtifactReference() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static ArtifactReference CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new ArtifactReference();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"artifactId", n => { ArtifactId = n.GetStringValue(); } },
+                {"groupId", n => { GroupId = n.GetStringValue(); } },
+                {"name", n => { Name = n.GetStringValue(); } },
+                {"version", n => { Version = n.GetStringValue(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("artifactId", ArtifactId);
+            writer.WriteStringValue("groupId", GroupId);
+            writer.WriteStringValue("name", Name);
+            writer.WriteStringValue("version", Version);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactSearchResults.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactSearchResults.cs
new file mode 100644
index 0000000000..dd49173d7f
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactSearchResults.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// Describes the response received when searching for artifacts.
+    /// </summary>
+    public class ArtifactSearchResults : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>The artifacts returned in the result set.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<SearchedArtifact>? Artifacts { get; set; }
+#nullable restore
+#else
+        public List<SearchedArtifact> Artifacts { get; set; }
+#endif
+        /// <summary>The total number of artifacts that matched the query that produced the result set (may be more than the number of artifacts in the result set).</summary>
+        public int? Count { get; set; }
+        /// <summary>
+        /// Instantiates a new ArtifactSearchResults and sets the default values.
+        /// </summary>
+        public ArtifactSearchResults() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static ArtifactSearchResults CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new ArtifactSearchResults();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"artifacts", n => { Artifacts = n.GetCollectionOfObjectValues<SearchedArtifact>(SearchedArtifact.CreateFromDiscriminatorValue)?.ToList(); } },
+                {"count", n => { Count = n.GetIntValue(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteCollectionOfObjectValues<SearchedArtifact>("artifacts", Artifacts);
+            writer.WriteIntValue("count", Count);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactState.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactState.cs
new file mode 100644
index 0000000000..d6bb9e9c76
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/ArtifactState.cs
@@ -0,0 +1,14 @@
+// <auto-generated/>
+using System.Runtime.Serialization;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>Describes the state of an artifact or artifact version.  The following statesare possible:* ENABLED* DISABLED* DEPRECATED</summary>
+    public enum ArtifactState {
+        [EnumMember(Value = "ENABLED")]
+        ENABLED,
+        [EnumMember(Value = "DISABLED")]
+        DISABLED,
+        [EnumMember(Value = "DEPRECATED")]
+        DEPRECATED,
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/Error.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/Error.cs
new file mode 100644
index 0000000000..30e5155b3c
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/Error.cs
@@ -0,0 +1,79 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// All error responses, whether `4xx` or `5xx` will include one of these as the responsebody.
+    /// </summary>
+    public class Error : ApiException, IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>Full details about the error.  This might contain a server stack trace, for example.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Detail { get; set; }
+#nullable restore
+#else
+        public string Detail { get; set; }
+#endif
+        /// <summary>The server-side error code.</summary>
+        public int? ErrorCode { get; set; }
+        /// <summary>The short error message.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? MessageEscaped { get; set; }
+#nullable restore
+#else
+        public string MessageEscaped { get; set; }
+#endif
+        /// <summary>The error name - typically the classname of the exception thrown by the server.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Name { get; set; }
+#nullable restore
+#else
+        public string Name { get; set; }
+#endif
+        /// <summary>
+        /// Instantiates a new Error and sets the default values.
+        /// </summary>
+        public Error() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static Error CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new Error();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"detail", n => { Detail = n.GetStringValue(); } },
+                {"error_code", n => { ErrorCode = n.GetIntValue(); } },
+                {"message", n => { MessageEscaped = n.GetStringValue(); } },
+                {"name", n => { Name = n.GetStringValue(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("detail", Detail);
+            writer.WriteIntValue("error_code", ErrorCode);
+            writer.WriteStringValue("message", MessageEscaped);
+            writer.WriteStringValue("name", Name);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/Properties.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/Properties.cs
new file mode 100644
index 0000000000..9ee3e63e7f
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/Properties.cs
@@ -0,0 +1,44 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// User-defined name-value pairs. Name and value must be strings.
+    /// </summary>
+    public class Properties : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>
+        /// Instantiates a new Properties and sets the default values.
+        /// </summary>
+        public Properties() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static Properties CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new Properties();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/RuleViolationCause.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/RuleViolationCause.cs
new file mode 100644
index 0000000000..3190673c6d
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/RuleViolationCause.cs
@@ -0,0 +1,61 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    public class RuleViolationCause : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>The context property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Context { get; set; }
+#nullable restore
+#else
+        public string Context { get; set; }
+#endif
+        /// <summary>The description property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Description { get; set; }
+#nullable restore
+#else
+        public string Description { get; set; }
+#endif
+        /// <summary>
+        /// Instantiates a new RuleViolationCause and sets the default values.
+        /// </summary>
+        public RuleViolationCause() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static RuleViolationCause CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new RuleViolationCause();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"context", n => { Context = n.GetStringValue(); } },
+                {"description", n => { Description = n.GetStringValue(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("context", Context);
+            writer.WriteStringValue("description", Description);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/RuleViolationError.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/RuleViolationError.cs
new file mode 100644
index 0000000000..4a4ff76ec3
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/RuleViolationError.cs
@@ -0,0 +1,46 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// All error responses, whether `4xx` or `5xx` will include one of these as the responsebody.
+    /// </summary>
+    public class RuleViolationError : Error, IParsable {
+        /// <summary>List of rule violation causes.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<RuleViolationCause>? Causes { get; set; }
+#nullable restore
+#else
+        public List<RuleViolationCause> Causes { get; set; }
+#endif
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static new RuleViolationError CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new RuleViolationError();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public override IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>>(base.GetFieldDeserializers()) {
+                {"causes", n => { Causes = n.GetCollectionOfObjectValues<RuleViolationCause>(RuleViolationCause.CreateFromDiscriminatorValue)?.ToList(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public override void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            base.Serialize(writer);
+            writer.WriteCollectionOfObjectValues<RuleViolationCause>("causes", Causes);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SearchedArtifact.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SearchedArtifact.cs
new file mode 100644
index 0000000000..982e5463ec
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SearchedArtifact.cs
@@ -0,0 +1,136 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// Models a single artifact from the result set returned when searching for artifacts.
+    /// </summary>
+    public class SearchedArtifact : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>The createdBy property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? CreatedBy { get; set; }
+#nullable restore
+#else
+        public string CreatedBy { get; set; }
+#endif
+        /// <summary>The createdOn property</summary>
+        public DateTimeOffset? CreatedOn { get; set; }
+        /// <summary>The description property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Description { get; set; }
+#nullable restore
+#else
+        public string Description { get; set; }
+#endif
+        /// <summary>An ID of a single artifact group.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? GroupId { get; set; }
+#nullable restore
+#else
+        public string GroupId { get; set; }
+#endif
+        /// <summary>The ID of a single artifact.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Id { get; set; }
+#nullable restore
+#else
+        public string Id { get; set; }
+#endif
+        /// <summary>The labels property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<string>? Labels { get; set; }
+#nullable restore
+#else
+        public List<string> Labels { get; set; }
+#endif
+        /// <summary>The modifiedBy property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? ModifiedBy { get; set; }
+#nullable restore
+#else
+        public string ModifiedBy { get; set; }
+#endif
+        /// <summary>The modifiedOn property</summary>
+        public DateTimeOffset? ModifiedOn { get; set; }
+        /// <summary>The name property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Name { get; set; }
+#nullable restore
+#else
+        public string Name { get; set; }
+#endif
+        /// <summary>Describes the state of an artifact or artifact version.  The following statesare possible:* ENABLED* DISABLED* DEPRECATED</summary>
+        public ArtifactState? State { get; set; }
+        /// <summary>The type property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Type { get; set; }
+#nullable restore
+#else
+        public string Type { get; set; }
+#endif
+        /// <summary>
+        /// Instantiates a new SearchedArtifact and sets the default values.
+        /// </summary>
+        public SearchedArtifact() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static SearchedArtifact CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new SearchedArtifact();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"createdBy", n => { CreatedBy = n.GetStringValue(); } },
+                {"createdOn", n => { CreatedOn = n.GetDateTimeOffsetValue(); } },
+                {"description", n => { Description = n.GetStringValue(); } },
+                {"groupId", n => { GroupId = n.GetStringValue(); } },
+                {"id", n => { Id = n.GetStringValue(); } },
+                {"labels", n => { Labels = n.GetCollectionOfPrimitiveValues<string>()?.ToList(); } },
+                {"modifiedBy", n => { ModifiedBy = n.GetStringValue(); } },
+                {"modifiedOn", n => { ModifiedOn = n.GetDateTimeOffsetValue(); } },
+                {"name", n => { Name = n.GetStringValue(); } },
+                {"state", n => { State = n.GetEnumValue<ArtifactState>(); } },
+                {"type", n => { Type = n.GetStringValue(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteStringValue("createdBy", CreatedBy);
+            writer.WriteDateTimeOffsetValue("createdOn", CreatedOn);
+            writer.WriteStringValue("description", Description);
+            writer.WriteStringValue("groupId", GroupId);
+            writer.WriteStringValue("id", Id);
+            writer.WriteCollectionOfPrimitiveValues<string>("labels", Labels);
+            writer.WriteStringValue("modifiedBy", ModifiedBy);
+            writer.WriteDateTimeOffsetValue("modifiedOn", ModifiedOn);
+            writer.WriteStringValue("name", Name);
+            writer.WriteEnumValue<ArtifactState>("state", State);
+            writer.WriteStringValue("type", Type);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SearchedVersion.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SearchedVersion.cs
new file mode 100644
index 0000000000..2f4db6e03d
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SearchedVersion.cs
@@ -0,0 +1,140 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// Models a single artifact from the result set returned when searching for artifacts.
+    /// </summary>
+    public class SearchedVersion : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>The contentId property</summary>
+        public long? ContentId { get; set; }
+        /// <summary>The createdBy property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? CreatedBy { get; set; }
+#nullable restore
+#else
+        public string CreatedBy { get; set; }
+#endif
+        /// <summary>The createdOn property</summary>
+        public DateTimeOffset? CreatedOn { get; set; }
+        /// <summary>The description property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Description { get; set; }
+#nullable restore
+#else
+        public string Description { get; set; }
+#endif
+        /// <summary>The globalId property</summary>
+        public long? GlobalId { get; set; }
+        /// <summary>The labels property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<string>? Labels { get; set; }
+#nullable restore
+#else
+        public List<string> Labels { get; set; }
+#endif
+        /// <summary>The name property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Name { get; set; }
+#nullable restore
+#else
+        public string Name { get; set; }
+#endif
+        /// <summary>User-defined name-value pairs. Name and value must be strings.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public ApiSdk.Models.Properties? Properties { get; set; }
+#nullable restore
+#else
+        public ApiSdk.Models.Properties Properties { get; set; }
+#endif
+        /// <summary>The references property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<ArtifactReference>? References { get; set; }
+#nullable restore
+#else
+        public List<ArtifactReference> References { get; set; }
+#endif
+        /// <summary>Describes the state of an artifact or artifact version.  The following statesare possible:* ENABLED* DISABLED* DEPRECATED</summary>
+        public ArtifactState? State { get; set; }
+        /// <summary>The type property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Type { get; set; }
+#nullable restore
+#else
+        public string Type { get; set; }
+#endif
+        /// <summary>The version property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Version { get; set; }
+#nullable restore
+#else
+        public string Version { get; set; }
+#endif
+        /// <summary>
+        /// Instantiates a new SearchedVersion and sets the default values.
+        /// </summary>
+        public SearchedVersion() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static SearchedVersion CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new SearchedVersion();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"contentId", n => { ContentId = n.GetLongValue(); } },
+                {"createdBy", n => { CreatedBy = n.GetStringValue(); } },
+                {"createdOn", n => { CreatedOn = n.GetDateTimeOffsetValue(); } },
+                {"description", n => { Description = n.GetStringValue(); } },
+                {"globalId", n => { GlobalId = n.GetLongValue(); } },
+                {"labels", n => { Labels = n.GetCollectionOfPrimitiveValues<string>()?.ToList(); } },
+                {"name", n => { Name = n.GetStringValue(); } },
+                {"properties", n => { Properties = n.GetObjectValue<ApiSdk.Models.Properties>(ApiSdk.Models.Properties.CreateFromDiscriminatorValue); } },
+                {"references", n => { References = n.GetCollectionOfObjectValues<ArtifactReference>(ArtifactReference.CreateFromDiscriminatorValue)?.ToList(); } },
+                {"state", n => { State = n.GetEnumValue<ArtifactState>(); } },
+                {"type", n => { Type = n.GetStringValue(); } },
+                {"version", n => { Version = n.GetStringValue(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteLongValue("contentId", ContentId);
+            writer.WriteStringValue("createdBy", CreatedBy);
+            writer.WriteDateTimeOffsetValue("createdOn", CreatedOn);
+            writer.WriteStringValue("description", Description);
+            writer.WriteLongValue("globalId", GlobalId);
+            writer.WriteCollectionOfPrimitiveValues<string>("labels", Labels);
+            writer.WriteStringValue("name", Name);
+            writer.WriteObjectValue<ApiSdk.Models.Properties>("properties", Properties);
+            writer.WriteCollectionOfObjectValues<ArtifactReference>("references", References);
+            writer.WriteEnumValue<ArtifactState>("state", State);
+            writer.WriteStringValue("type", Type);
+            writer.WriteStringValue("version", Version);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SortBy.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SortBy.cs
new file mode 100644
index 0000000000..33adf563a9
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SortBy.cs
@@ -0,0 +1,11 @@
+// <auto-generated/>
+using System.Runtime.Serialization;
+using System;
+namespace ApiSdk.Models {
+    public enum SortBy {
+        [EnumMember(Value = "name")]
+        Name,
+        [EnumMember(Value = "createdOn")]
+        CreatedOn,
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SortOrder.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SortOrder.cs
new file mode 100644
index 0000000000..128abafddd
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/SortOrder.cs
@@ -0,0 +1,11 @@
+// <auto-generated/>
+using System.Runtime.Serialization;
+using System;
+namespace ApiSdk.Models {
+    public enum SortOrder {
+        [EnumMember(Value = "asc")]
+        Asc,
+        [EnumMember(Value = "desc")]
+        Desc,
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/VersionMetaData.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/VersionMetaData.cs
new file mode 100644
index 0000000000..be7a8aff94
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/VersionMetaData.cs
@@ -0,0 +1,147 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    public class VersionMetaData : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>The contentId property</summary>
+        public long? ContentId { get; set; }
+        /// <summary>The createdBy property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? CreatedBy { get; set; }
+#nullable restore
+#else
+        public string CreatedBy { get; set; }
+#endif
+        /// <summary>The createdOn property</summary>
+        public DateTimeOffset? CreatedOn { get; set; }
+        /// <summary>The description property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Description { get; set; }
+#nullable restore
+#else
+        public string Description { get; set; }
+#endif
+        /// <summary>The globalId property</summary>
+        public long? GlobalId { get; set; }
+        /// <summary>An ID of a single artifact group.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? GroupId { get; set; }
+#nullable restore
+#else
+        public string GroupId { get; set; }
+#endif
+        /// <summary>The ID of a single artifact.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Id { get; set; }
+#nullable restore
+#else
+        public string Id { get; set; }
+#endif
+        /// <summary>The labels property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<string>? Labels { get; set; }
+#nullable restore
+#else
+        public List<string> Labels { get; set; }
+#endif
+        /// <summary>The name property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Name { get; set; }
+#nullable restore
+#else
+        public string Name { get; set; }
+#endif
+        /// <summary>User-defined name-value pairs. Name and value must be strings.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public ApiSdk.Models.Properties? Properties { get; set; }
+#nullable restore
+#else
+        public ApiSdk.Models.Properties Properties { get; set; }
+#endif
+        /// <summary>Describes the state of an artifact or artifact version.  The following statesare possible:* ENABLED* DISABLED* DEPRECATED</summary>
+        public ArtifactState? State { get; set; }
+        /// <summary>The type property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Type { get; set; }
+#nullable restore
+#else
+        public string Type { get; set; }
+#endif
+        /// <summary>The version property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public string? Version { get; set; }
+#nullable restore
+#else
+        public string Version { get; set; }
+#endif
+        /// <summary>
+        /// Instantiates a new VersionMetaData and sets the default values.
+        /// </summary>
+        public VersionMetaData() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static VersionMetaData CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new VersionMetaData();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"contentId", n => { ContentId = n.GetLongValue(); } },
+                {"createdBy", n => { CreatedBy = n.GetStringValue(); } },
+                {"createdOn", n => { CreatedOn = n.GetDateTimeOffsetValue(); } },
+                {"description", n => { Description = n.GetStringValue(); } },
+                {"globalId", n => { GlobalId = n.GetLongValue(); } },
+                {"groupId", n => { GroupId = n.GetStringValue(); } },
+                {"id", n => { Id = n.GetStringValue(); } },
+                {"labels", n => { Labels = n.GetCollectionOfPrimitiveValues<string>()?.ToList(); } },
+                {"name", n => { Name = n.GetStringValue(); } },
+                {"properties", n => { Properties = n.GetObjectValue<ApiSdk.Models.Properties>(ApiSdk.Models.Properties.CreateFromDiscriminatorValue); } },
+                {"state", n => { State = n.GetEnumValue<ArtifactState>(); } },
+                {"type", n => { Type = n.GetStringValue(); } },
+                {"version", n => { Version = n.GetStringValue(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteLongValue("contentId", ContentId);
+            writer.WriteStringValue("createdBy", CreatedBy);
+            writer.WriteDateTimeOffsetValue("createdOn", CreatedOn);
+            writer.WriteStringValue("description", Description);
+            writer.WriteLongValue("globalId", GlobalId);
+            writer.WriteStringValue("groupId", GroupId);
+            writer.WriteStringValue("id", Id);
+            writer.WriteCollectionOfPrimitiveValues<string>("labels", Labels);
+            writer.WriteStringValue("name", Name);
+            writer.WriteObjectValue<ApiSdk.Models.Properties>("properties", Properties);
+            writer.WriteEnumValue<ArtifactState>("state", State);
+            writer.WriteStringValue("type", Type);
+            writer.WriteStringValue("version", Version);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/VersionSearchResults.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/VersionSearchResults.cs
new file mode 100644
index 0000000000..6c4884707e
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Models/VersionSearchResults.cs
@@ -0,0 +1,58 @@
+// <auto-generated/>
+using Microsoft.Kiota.Abstractions.Serialization;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
+namespace ApiSdk.Models {
+    /// <summary>
+    /// Describes the response received when searching for artifacts.
+    /// </summary>
+    public class VersionSearchResults : IAdditionalDataHolder, IParsable {
+        /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
+        public IDictionary<string, object> AdditionalData { get; set; }
+        /// <summary>The total number of versions that matched the query (may be more than the number of versionsreturned in the result set).</summary>
+        public int? Count { get; set; }
+        /// <summary>The collection of artifact versions returned in the result set.</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<SearchedVersion>? Versions { get; set; }
+#nullable restore
+#else
+        public List<SearchedVersion> Versions { get; set; }
+#endif
+        /// <summary>
+        /// Instantiates a new VersionSearchResults and sets the default values.
+        /// </summary>
+        public VersionSearchResults() {
+            AdditionalData = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static VersionSearchResults CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new VersionSearchResults();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>> {
+                {"count", n => { Count = n.GetIntValue(); } },
+                {"versions", n => { Versions = n.GetCollectionOfObjectValues<SearchedVersion>(SearchedVersion.CreateFromDiscriminatorValue)?.ToList(); } },
+            };
+        }
+        /// <summary>
+        /// Serializes information the current object
+        /// </summary>
+        /// <param name="writer">Serialization writer to use to serialize this model</param>
+        public virtual void Serialize(ISerializationWriter writer) {
+            _ = writer ?? throw new ArgumentNullException(nameof(writer));
+            writer.WriteIntValue("count", Count);
+            writer.WriteCollectionOfObjectValues<SearchedVersion>("versions", Versions);
+            writer.WriteAdditionalData(AdditionalData);
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Search/SearchRequestBuilder.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Search/SearchRequestBuilder.cs
new file mode 100644
index 0000000000..669e03388f
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/Search/SearchRequestBuilder.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+using ApiSdk.Search.Artifacts;
+using Microsoft.Kiota.Abstractions;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
+namespace ApiSdk.Search {
+    /// <summary>
+    /// Builds and executes requests for operations under \search
+    /// </summary>
+    public class SearchRequestBuilder : BaseRequestBuilder {
+        /// <summary>Search for artifacts in the registry.</summary>
+        public ArtifactsRequestBuilder Artifacts { get =>
+            new ArtifactsRequestBuilder(PathParameters, RequestAdapter);
+        }
+        /// <summary>
+        /// Instantiates a new SearchRequestBuilder and sets the default values.
+        /// </summary>
+        /// <param name="pathParameters">Path parameters for the request</param>
+        /// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
+        public SearchRequestBuilder(Dictionary<string, object> pathParameters, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/search", pathParameters) {
+        }
+        /// <summary>
+        /// Instantiates a new SearchRequestBuilder and sets the default values.
+        /// </summary>
+        /// <param name="rawUrl">The raw URL to use for the request builder.</param>
+        /// <param name="requestAdapter">The request adapter to use to execute the requests.</param>
+        public SearchRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/search", rawUrl) {
+        }
+    }
+}
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/kiota-lock.json b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/kiota-lock.json
new file mode 100644
index 0000000000..b2f2ee9ccd
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioClient/kiota-lock.json
@@ -0,0 +1,36 @@
+{
+  "descriptionHash": "D5B27A71189D0DED59490DB1BB5139C2978BCFDBC33290DB09A0A7F6F64B7D47E674D63EF48F305DC29A5DFF15B57000D1C2BB276A9617C2F28590B92138CFB5",
+  "descriptionLocation": "https://raw.githubusercontent.com/Apicurio/apicurio-registry/main/common/src/main/resources/META-INF/openapi.json",
+  "lockFileVersion": "1.0.0",
+  "kiotaVersion": "1.8.1",
+  "clientClassName": "ApicurioClient",
+  "clientNamespaceName": "ApiSdk",
+  "language": "CSharp",
+  "usesBackingStore": false,
+  "excludeBackwardCompatible": false,
+  "includeAdditionalData": true,
+  "serializers": [
+    "Microsoft.Kiota.Serialization.Json.JsonSerializationWriterFactory",
+    "Microsoft.Kiota.Serialization.Text.TextSerializationWriterFactory",
+    "Microsoft.Kiota.Serialization.Form.FormSerializationWriterFactory",
+    "Microsoft.Kiota.Serialization.Multipart.MultipartSerializationWriterFactory"
+  ],
+  "deserializers": [
+    "Microsoft.Kiota.Serialization.Json.JsonParseNodeFactory",
+    "Microsoft.Kiota.Serialization.Text.TextParseNodeFactory",
+    "Microsoft.Kiota.Serialization.Form.FormParseNodeFactory"
+  ],
+  "structuredMimeTypes": [
+    "application/json;q=1",
+    "text/plain;q=0.9",
+    "application/x-www-form-urlencoded;q=0.2",
+    "multipart/form-data;q=0.1"
+  ],
+  "includePatterns": [
+    "/search/*",
+    "/groups/**/artifacts/**/versions#GET",
+    "/groups/**/artifacts/**/versions/**/meta#GET"
+  ],
+  "excludePatterns": [],
+  "disabledValidationRules": []
+}
\ No newline at end of file
diff --git a/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioSearchProvider.cs b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioSearchProvider.cs
new file mode 100644
index 0000000000..14eb7e0890
--- /dev/null
+++ b/src/Kiota.Builder/SearchProviders/Apicurio/ApicurioSearchProvider.cs
@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using ApiSdk;
+using ApiSdk.Models;
+using Kiota.Builder.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Kiota.Abstractions.Authentication;
+using Microsoft.Kiota.Http.HttpClientLibrary;
+
+namespace Kiota.Builder.SearchProviders.Apicurio;
+
+public class ApicurioSearchProvider : ISearchProvider
+{
+    private readonly HttpClient _httpClient;
+    private readonly ILogger _logger;
+    private readonly IAuthenticationProvider? _authenticatedAuthenticationProvider;
+    private readonly ApicurioConfiguration _configuration;
+
+    private readonly static IDictionary<string, SearchResult> EMPTY_RESULT = new Dictionary<string, SearchResult>();
+
+    public string ProviderKey => "apicurio";
+
+    public HashSet<string> KeysToExclude
+    {
+        get; init;
+    } = new();
+
+    public ApicurioSearchProvider(HttpClient httpClient, ILogger logger, bool clearCache, ApicurioConfiguration configuration, IAuthenticationProvider? authenticatedAuthenticationProvider)
+    {
+        ArgumentNullException.ThrowIfNull(httpClient);
+        ArgumentNullException.ThrowIfNull(configuration);
+        ArgumentNullException.ThrowIfNull(logger);
+        _httpClient = httpClient;
+        _logger = logger;
+        _configuration = configuration;
+        _authenticatedAuthenticationProvider = authenticatedAuthenticationProvider;
+        KeysToExclude = new(StringComparer.OrdinalIgnoreCase);
+    }
+
+    public async Task<IDictionary<string, SearchResult>> SearchAsync(string term, string? version, CancellationToken cancellationToken)
+    {
+        if (_configuration.ApiBaseUrl == null)
+        {
+            _logger.LogInformation("Apicurio provider not configured, skipping.");
+            return EMPTY_RESULT;
+        }
+
+        var authenticationProvider = _authenticatedAuthenticationProvider != null ?
+            _authenticatedAuthenticationProvider :
+            new AnonymousAuthenticationProvider();
+        using var requestAdapter = new HttpClientRequestAdapter(authenticationProvider, httpClient: _httpClient);
+        requestAdapter.BaseUrl = _configuration.ApiBaseUrl.AbsoluteUri;
+        var apicurioClient = new ApicurioClient(requestAdapter);
+
+        IDictionary<string, SearchResult> result;
+        try
+        {
+            ArtifactSearchResults? searchResults = await apicurioClient.Search.Artifacts.GetAsync(config =>
+            {
+                config.QueryParameters.Limit = _configuration.ArtifactsLimit;
+                config.QueryParameters.Offset = 0;
+                switch (_configuration.SearchBy)
+                {
+                    case ApicurioConfiguration.ApicurioSearchBy.LABEL:
+                        config.QueryParameters.Labels = new string[] { term };
+                        break;
+                    case ApicurioConfiguration.ApicurioSearchBy.PROPERTY:
+                        config.QueryParameters.Properties = new string[] { term };
+                        break;
+                }
+            }, cancellationToken).ConfigureAwait(false);
+
+            if (searchResults == null || searchResults!.Artifacts == null)
+                return EMPTY_RESULT;
+
+            var dictionaries = searchResults!.Artifacts!.Select(async x =>
+            {
+                var groupId = (x.GroupId != null) ? x.GroupId : "default";
+                var uiUrl = new Uri(_configuration.UIBaseUrl + "/artifacts/" + groupId + "/" + x.Id);
+                var restUrl = new Uri(_configuration.ApiBaseUrl + "/groups/" + groupId + "/artifacts/" + x.Id);
+
+                if (!string.IsNullOrEmpty(version))
+                {
+                    var versionMetadata = await apicurioClient.Groups[groupId].Artifacts[x.Id].Versions[version!].Meta.GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+
+                    if (versionMetadata == null || versionMetadata!.Version == null)
+                    {
+                        return EMPTY_RESULT;
+                    }
+
+                    return new Dictionary<string, SearchResult>()
+                    {
+                        [x.Id!] = new SearchResult(x.Name ?? x.Id!,
+                            x.Description ?? string.Empty,
+                            uiUrl,
+                            restUrl,
+                            new List<string>(1) { versionMetadata!.Version! })
+                    };
+                }
+                else
+                {
+                    var versions = await apicurioClient.Groups[groupId].Artifacts[x.Id].Versions.GetAsync(config =>
+                    {
+                        config.QueryParameters.Limit = _configuration.VersionsLimit;
+                        config.QueryParameters.Offset = 0;
+                    }, cancellationToken).ConfigureAwait(false);
+
+                    if (versions == null || versions.Versions == null)
+                        return EMPTY_RESULT;
+
+                    return new Dictionary<string, SearchResult>()
+                    {
+                        [x.Id!] = new SearchResult(x.Name ?? x.Id!,
+                            x.Description ?? string.Empty,
+                            uiUrl,
+                            restUrl,
+                            versions.Versions!.Select(static v => v.Version!).ToList())
+                    };
+                }
+            });
+
+            var x = await Task.WhenAll(dictionaries).ConfigureAwait(false);
+            result = x.SelectMany(static dict => dict).ToDictionary(static x => x.Key, static x => x.Value, StringComparer.OrdinalIgnoreCase);
+        }
+        catch (HttpRequestException)
+        {
+            _logger.LogWarning("Error connecting to Apicurio Registry at the URL {String}", _configuration.ApiBaseUrl);
+            return EMPTY_RESULT;
+        }
+        catch (ApiSdk.Models.Error)
+        {
+            return EMPTY_RESULT;
+        }
+
+        if (result == null)
+            return EMPTY_RESULT;
+
+        return result;
+    }
+}
diff --git a/src/kiota/Handlers/BaseKiotaCommandHandler.cs b/src/kiota/Handlers/BaseKiotaCommandHandler.cs
index af680b9c65..54bfac7567 100644
--- a/src/kiota/Handlers/BaseKiotaCommandHandler.cs
+++ b/src/kiota/Handlers/BaseKiotaCommandHandler.cs
@@ -77,6 +77,11 @@ private IAuthenticationProvider GetGitHubPatAuthenticationProvider(ILogger logge
                                     new List<string> { Configuration.Search.GitHub.ApiBaseUrl.Host },
                                     logger,
                                     GetGitHubPatStorageService(logger));
+
+    // TODO: implement me
+    private IAuthenticationProvider GetApicurioAuthenticationProvider(ILogger logger) =>
+        new Microsoft.Kiota.Abstractions.Authentication.AnonymousAuthenticationProvider();
+
     protected async Task<KiotaSearcher> GetKiotaSearcherAsync(ILoggerFactory loggerFactory, CancellationToken cancellationToken)
     {
         var logger = loggerFactory.CreateLogger<KiotaSearcher>();
@@ -90,7 +95,7 @@ protected async Task<KiotaSearcher> GetKiotaSearcherAsync(ILoggerFactory loggerF
             (_, true) => (GetGitHubPatAuthenticationProvider(logger), patSignInCallBack),
             (_, _) => (null, (CancellationToken cts) => Task.FromResult(false))
         };
-        return new KiotaSearcher(logger, Configuration.Search, httpClient, provider, callback);
+        return new KiotaSearcher(logger, Configuration.Search, httpClient, provider, callback, GetApicurioAuthenticationProvider(logger));
     }
     public int Invoke(InvocationContext context)
     {
diff --git a/src/kiota/KiotaConfigurationExtensions.cs b/src/kiota/KiotaConfigurationExtensions.cs
index a44dce586b..4fea50cfd9 100644
--- a/src/kiota/KiotaConfigurationExtensions.cs
+++ b/src/kiota/KiotaConfigurationExtensions.cs
@@ -28,6 +28,11 @@ public static void BindConfiguration(this KiotaConfiguration configObject, IConf
         configObject.Search.GitHub.AppId = configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.GitHub)}:{nameof(GitHubConfiguration.AppId)}"] is string appId && !string.IsNullOrEmpty(appId) ? appId : configObject.Search.GitHub.AppId;
         configObject.Search.GitHub.AppManagement = Uri.TryCreate(configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.GitHub)}:{nameof(GitHubConfiguration.AppManagement)}"], new UriCreationOptions(), out var appManagement) ? appManagement : configObject.Search.GitHub.AppManagement;
         configObject.Search.GitHub.BlockListUrl = Uri.TryCreate(configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.GitHub)}:{nameof(GitHubConfiguration.BlockListUrl)}"], new UriCreationOptions(), out var blockListUrl) ? blockListUrl : configObject.Search.GitHub.BlockListUrl;
+        configObject.Search.Apicurio.ApiBaseUrl = Uri.TryCreate(configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.Apicurio)}:{nameof(ApicurioConfiguration.ApiBaseUrl)}"], new UriCreationOptions(), out var apicurioApiBaseUrl) ? apicurioApiBaseUrl : configObject.Search.Apicurio.ApiBaseUrl;
+        configObject.Search.Apicurio.UIBaseUrl = Uri.TryCreate(configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.Apicurio)}:{nameof(ApicurioConfiguration.UIBaseUrl)}"], new UriCreationOptions(), out var uiBaseUrl) ? uiBaseUrl : configObject.Search.Apicurio.UIBaseUrl;
+        configObject.Search.Apicurio.ArtifactsLimit = configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.Apicurio)}"] is string artifactsLimit && !string.IsNullOrEmpty(artifactsLimit) ? int.Parse(artifactsLimit) : configObject.Search.Apicurio.ArtifactsLimit;
+        configObject.Search.Apicurio.VersionsLimit = configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.Apicurio)}"] is string versionsLimit && !string.IsNullOrEmpty(versionsLimit) ? int.Parse(versionsLimit) : configObject.Search.Apicurio.VersionsLimit;
+        configObject.Search.Apicurio.SearchBy = configuration[$"{nameof(configObject.Search)}:{nameof(SearchConfiguration.Apicurio)}"] is string searchBy && !string.IsNullOrEmpty(searchBy) ? (ApicurioConfiguration.ApicurioSearchBy)Enum.Parse(typeof(ApicurioConfiguration.ApicurioSearchBy), searchBy) : configObject.Search.Apicurio.SearchBy;
 
         var languagesSection = configuration.GetSection(nameof(configObject.Languages));
         foreach (var section in languagesSection.GetChildren())
diff --git a/src/kiota/Rpc/Server.cs b/src/kiota/Rpc/Server.cs
index b1502cd824..01aa9b87f1 100644
--- a/src/kiota/Rpc/Server.cs
+++ b/src/kiota/Rpc/Server.cs
@@ -93,7 +93,7 @@ public async Task<SearchOperationResult> SearchAsync(string searchTerm, bool cle
         var logger = new ForwardedLogger<KiotaSearcher>();
         var configuration = Configuration.Search;
         configuration.ClearCache = clearCache;
-        var searchService = new KiotaSearcher(logger, configuration, httpClient, null, (_) => Task.FromResult(false));
+        var searchService = new KiotaSearcher(logger, configuration, httpClient, null, (_) => Task.FromResult(false), null);
         var results = await searchService.SearchAsync(searchTerm, string.Empty, cancellationToken);
         return new(logger.LogEntries, results);
     }
diff --git a/src/kiota/appsettings.json b/src/kiota/appsettings.json
index d13e556356..2938152603 100644
--- a/src/kiota/appsettings.json
+++ b/src/kiota/appsettings.json
@@ -9,6 +9,10 @@
       "BlockListUrl": "https://raw.githubusercontent.com/microsoft/kiota/main/resources/index-block-list.yml",
       "AppId": "Iv1.9ed2bcb878c90617",
       "AppManagement": "https://aka.ms/kiota/install/github"
+    },
+    "Apicurio": {
+      "ApiBaseUrl": "http://localhost:8080/apis/registry/v2",
+      "UIBaseUrl": "http://localhost:8080/ui"
     }
   },
   "Logging": {
diff --git a/tests/Kiota.Builder.Tests/KiotaSearcherTests.cs b/tests/Kiota.Builder.Tests/KiotaSearcherTests.cs
index 7c04daa653..3dba4c7f19 100644
--- a/tests/Kiota.Builder.Tests/KiotaSearcherTests.cs
+++ b/tests/Kiota.Builder.Tests/KiotaSearcherTests.cs
@@ -16,9 +16,9 @@ public class KiotaSearcherTests : IDisposable
     [Fact]
     public void DefensivePrograming()
     {
-        Assert.Throws<ArgumentNullException>(() => new KiotaSearcher(null, new SearchConfiguration(), httpClient, null, null));
-        Assert.Throws<ArgumentNullException>(() => new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, null, httpClient, null, null));
-        Assert.Throws<ArgumentNullException>(() => new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, new SearchConfiguration(), null, null, null));
+        Assert.Throws<ArgumentNullException>(() => new KiotaSearcher(null, new SearchConfiguration(), httpClient, null, null, null));
+        Assert.Throws<ArgumentNullException>(() => new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, null, httpClient, null, null, null));
+        Assert.Throws<ArgumentNullException>(() => new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, new SearchConfiguration(), null, null, null, null));
         Assert.Throws<ArgumentNullException>(() => new GitHubSearchProvider(httpClient, new Mock<ILogger<KiotaSearcher>>().Object, false, null, null, null));
         Assert.Throws<ArgumentNullException>(() => new GitHubSearchProvider(httpClient, null, false, new GitHubConfiguration(), null, null));
         Assert.Throws<ArgumentNullException>(() => new GitHubSearchProvider(null, new Mock<ILogger<KiotaSearcher>>().Object, false, new GitHubConfiguration(), null, null));
@@ -34,7 +34,7 @@ public void DefensivePrograming()
     public async Task GetsMicrosoftGraphBothVersions()
     {
         var searchConfiguration = searchConfigurationFactory;
-        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null);
+        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null, null);
         var results = await searcher.SearchAsync("github::microsoftgraph/msgraph-metadata", string.Empty, new CancellationToken());
         Assert.Equal(2, results.Count);
     }
@@ -42,7 +42,7 @@ public async Task GetsMicrosoftGraphBothVersions()
     public async Task GetsMicrosoftGraph()
     {
         var searchConfiguration = searchConfigurationFactory;
-        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null);
+        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null, null);
         var results = await searcher.SearchAsync("github::microsoftgraph/msgraph-metadata/graph.microsoft.com/v1.0", string.Empty, new CancellationToken());
         Assert.Single(results);
         Assert.Equal("https://raw.githubusercontent.com/microsoftgraph/msgraph-metadata/master/openapi/v1.0/openapi.yaml", results.First().Value.DescriptionUrl.ToString());
@@ -51,7 +51,7 @@ public async Task GetsMicrosoftGraph()
     public async Task GetsMicrosoftGraphBeta()
     {
         var searchConfiguration = searchConfigurationFactory;
-        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null);
+        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null, null);
         var results = await searcher.SearchAsync("github::microsoftgraph/msgraph-metadata/graph.microsoft.com/beta", string.Empty, new CancellationToken());
         Assert.Single(results);
         Assert.Equal("https://raw.githubusercontent.com/microsoftgraph/msgraph-metadata/master/openapi/beta/openapi.yaml", results.First().Value.DescriptionUrl.ToString());
@@ -59,7 +59,7 @@ public async Task GetsMicrosoftGraphBeta()
     [Fact]
     public async Task DoesntFailOnEmptyTerm()
     {
-        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfigurationFactory, httpClient, null, null);
+        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfigurationFactory, httpClient, null, null, null);
         var results = await searcher.SearchAsync(string.Empty, string.Empty, new CancellationToken());
         Assert.Empty(results);
     }
@@ -67,7 +67,7 @@ public async Task DoesntFailOnEmptyTerm()
     public async Task GetsGithubFromApisGuru()
     {
         var searchConfiguration = searchConfigurationFactory;
-        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null);
+        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null, null);
         var results = await searcher.SearchAsync("github", string.Empty, new CancellationToken());
         Assert.NotEmpty(results);
     }
@@ -75,7 +75,7 @@ public async Task GetsGithubFromApisGuru()
     public async Task GetsGithubFromApisGuruWithExactMatch()
     {
         var searchConfiguration = searchConfigurationFactory;
-        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null);
+        var searcher = new KiotaSearcher(new Mock<ILogger<KiotaSearcher>>().Object, searchConfiguration, httpClient, null, null, null);
         var results = await searcher.SearchAsync("apisguru::github.com:api.github.com.2022-11-28", string.Empty, new CancellationToken());
         Assert.Single(results);
     }