diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/ValuesController.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs
similarity index 94%
rename from src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/ValuesController.cs
rename to src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs
index 28bb7c28..2cf7d9f6 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/ValuesController.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs
@@ -8,11 +8,11 @@ namespace O2NetGen.OnTracker.Api.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class ValuesController : ControllerBase
+    public class GeoController : ControllerBase
     {
         private readonly IGeoIpAddressResolver _geoIpAddressResolver;
 
-        public ValuesController(IGeoIpAddressResolver geoIpAddressResolver)
+        public GeoController(IGeoIpAddressResolver geoIpAddressResolver)
         {
             _geoIpAddressResolver = geoIpAddressResolver;
         }
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
index cc4e0b7a..80014d9b 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json
index 8ef69a20..a68dcd59 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "O2.OnTracker.Api": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "api/values",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:57549;http://localhost:43192",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs
index 8fc6c532..c4dec083 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs
@@ -5,6 +5,7 @@
 using O2NetGen.OnTracker.Api.IoC;
 using O2NetGen.OnTracker.Api.Setup;
 using O2NextGen.Tracker.DbUtility;
+using Swashbuckle.AspNetCore.Swagger;
 
 namespace O2NetGen.OnTracker.Api
 {
@@ -22,6 +23,17 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddRequiredMvcComponents();
             // services.AddSingleton<IGeoDbSetting, GeoDbSetting>();
+            services.AddSwaggerGen(options =>
+            {
+                options.DescribeAllEnumsAsStrings();
+                options.SwaggerDoc("v1",new Info()
+                {
+                    Title = "O2NextGen Platform. On-Tracker HTTP API",
+                    Version = "v1",
+                    Description = "On-Tracker API Service. The service allows you to create certificates",
+                    TermsOfService = "Terms of Service"
+                });
+            });
             services.ConfigurePOCO<GeoDatabase>(AppConfiguration.GetSection("GeoDatabase"));
             services.AddScoped<IGeoIpAddressResolver, MaxMindLocalGeoIpAddressResolver>();
         }
@@ -37,10 +49,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             {
                 app.UseHsts();
             }
-
+            app.UseSwagger()
+                .UseSwaggerUI(c => { c.SwaggerEndpoint($"/swagger/v1/swagger.json", "On-Tracker API V1"); });
             app.UseHttpsRedirection();
             app.UseMvc();
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj
index 86ea3bbe..c16c6d5b 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj
index 86ea3bbe..c16c6d5b 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj
index 86ea3bbe..c16c6d5b 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.sln b/src/Services/on-tracker/O2NextGen.OnTracker.sln
index a4920687..960efa0e 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.sln
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.sln
@@ -5,9 +5,9 @@ VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{897A7BA2-3AAB-4D74-BA13-E6AEF977AE98}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.Tracker.DbUtility", "O2.Tracker.DbUtility\O2NextGen.Tracker.DbUtility.csproj", "{77D9E353-F5AE-440B-8EE8-70EBB92099AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.Tracker.DbUtility", "O2NextGen.Tracker.DbUtility\O2NextGen.Tracker.DbUtility.csproj", "{77D9E353-F5AE-440B-8EE8-70EBB92099AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NetGen.OnTracker.Api", "O2.OnTracker.Api\O2NetGen.OnTracker.Api.csproj", "{2288664B-04A5-4C80-8685-2AF877F5D335}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NetGen.OnTracker.Api", "O2NextGen.OnTracker.Api\O2NextGen.OnTracker.Api.csproj", "{2288664B-04A5-4C80-8685-2AF877F5D335}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.OnTracker.Data", "O2NextGen.OnTracker.Data\O2NextGen.OnTracker.Data.csproj", "{23CB3AC5-E48E-4A46-B5F7-8FB1F0F00A71}"
 EndProject
diff --git a/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj b/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj
index 63c2af17..d14efa4a 100644
--- a/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj
+++ b/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj
index 9c2aad77..08ce6023 100644
--- a/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj
+++ b/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj
index d7b45d57..419b03cc 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj
index d7b45d57..419b03cc 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj
index d7b45d57..419b03cc 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj
index d7b45d57..419b03cc 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj
index d7b45d57..419b03cc 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>