diff --git a/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json b/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json
index 9b059e81c1..3961bf3688 100644
--- a/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json
+++ b/application/src/main/data/json/system/oauth2_config_templates/facebook_config.json
@@ -7,11 +7,14 @@
   "userInfoUri": "https://graph.facebook.com/me?fields=id,name,first_name,last_name,email",
   "clientAuthenticationMethod": "BASIC",
   "userNameAttributeName": "email",
-  "basic": {
-    "emailAttributeKey": "email",
-    "firstNameAttributeKey": "first_name",
-    "lastNameAttributeKey": "last_name",
-    "tenantNameStrategy": "DOMAIN"
+  "mapperConfig": {
+    "type": "BASIC",
+    "basic": {
+      "emailAttributeKey": "email",
+      "firstNameAttributeKey": "first_name",
+      "lastNameAttributeKey": "last_name",
+      "tenantNameStrategy": "DOMAIN"
+    }
   },
   "comment": null,
   "loginButtonIcon": "mdi:facebook",
diff --git a/application/src/main/data/json/system/oauth2_config_templates/github_config.json b/application/src/main/data/json/system/oauth2_config_templates/github_config.json
index 6c3a51723f..6569162ead 100644
--- a/application/src/main/data/json/system/oauth2_config_templates/github_config.json
+++ b/application/src/main/data/json/system/oauth2_config_templates/github_config.json
@@ -7,8 +7,11 @@
   "userInfoUri": "https://api.github.com/user",
   "clientAuthenticationMethod": "BASIC",
   "userNameAttributeName": "login",
-  "basic": {
-    "tenantNameStrategy": "DOMAIN"
+  "mapperConfig": {
+    "type": "GITHUB",
+    "basic": {
+      "tenantNameStrategy": "DOMAIN"
+    }
   },
   "comment": "In order to log into ThingsBoard you need to have user's email. You may configure and use Custom OAuth2 Mapper to get email information. Please refer to <a href=\"https://docs.github.com/en/rest/reference/users#list-email-addresses-for-the-authenticated-user\">Github Documentation</a>",
   "loginButtonIcon": "mdi:github",
diff --git a/application/src/main/data/json/system/oauth2_config_templates/google_config.json b/application/src/main/data/json/system/oauth2_config_templates/google_config.json
index 2756bcc957..03e3046125 100644
--- a/application/src/main/data/json/system/oauth2_config_templates/google_config.json
+++ b/application/src/main/data/json/system/oauth2_config_templates/google_config.json
@@ -8,11 +8,14 @@
   "userInfoUri": "https://openidconnect.googleapis.com/v1/userinfo",
   "clientAuthenticationMethod": "BASIC",
   "userNameAttributeName": "email",
-  "basic": {
-    "emailAttributeKey": "email",
-    "firstNameAttributeKey": "given_name",
-    "lastNameAttributeKey": "family_name",
-    "tenantNameStrategy": "DOMAIN"
+  "mapperConfig": {
+    "type": "BASIC",
+    "basic": {
+      "emailAttributeKey": "email",
+      "firstNameAttributeKey": "given_name",
+      "lastNameAttributeKey": "family_name",
+      "tenantNameStrategy": "DOMAIN"
+    }
   },
   "comment": null,
   "loginButtonIcon": "mdi:google",
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
index 897472f154..30c6e1c4a9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
@@ -34,8 +34,7 @@ import java.util.List;
 public class OAuth2ClientRegistrationTemplate extends SearchTextBasedWithAdditionalInfo<OAuth2ClientRegistrationTemplateId> implements HasName {
 
     private String providerId;
-    private MapperType mapperType;
-    private OAuth2BasicMapperConfig basic;
+    private OAuth2MapperConfig mapperConfig;
     private String authorizationUri;
     private String accessTokenUri;
     private List<String> scope;
@@ -51,8 +50,7 @@ public class OAuth2ClientRegistrationTemplate extends SearchTextBasedWithAdditio
     public OAuth2ClientRegistrationTemplate(OAuth2ClientRegistrationTemplate clientRegistrationTemplate) {
         super(clientRegistrationTemplate);
         this.providerId = clientRegistrationTemplate.providerId;
-        this.mapperType = clientRegistrationTemplate.mapperType;
-        this.basic = clientRegistrationTemplate.basic;
+        this.mapperConfig = clientRegistrationTemplate.mapperConfig;
         this.authorizationUri = clientRegistrationTemplate.authorizationUri;
         this.accessTokenUri = clientRegistrationTemplate.accessTokenUri;
         this.scope = clientRegistrationTemplate.scope;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java
index e7973dcd5d..d4fb6bfebe 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ClientRegistrationTemplateEntity.java
@@ -109,17 +109,20 @@ public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2
         this.loginButtonLabel = clientRegistrationTemplate.getLoginButtonLabel();
         this.helpLink = clientRegistrationTemplate.getHelpLink();
         this.additionalInfo = clientRegistrationTemplate.getAdditionalInfo();
-        this.type = clientRegistrationTemplate.getMapperType();
-        OAuth2BasicMapperConfig basicConfig = clientRegistrationTemplate.getBasic();
-        if (basicConfig != null) {
-            this.emailAttributeKey = basicConfig.getEmailAttributeKey();
-            this.firstNameAttributeKey = basicConfig.getFirstNameAttributeKey();
-            this.lastNameAttributeKey = basicConfig.getLastNameAttributeKey();
-            this.tenantNameStrategy = basicConfig.getTenantNameStrategy();
-            this.tenantNamePattern = basicConfig.getTenantNamePattern();
-            this.customerNamePattern = basicConfig.getCustomerNamePattern();
-            this.defaultDashboardName = basicConfig.getDefaultDashboardName();
-            this.alwaysFullScreen = basicConfig.isAlwaysFullScreen();
+        OAuth2MapperConfig mapperConfig = clientRegistrationTemplate.getMapperConfig();
+        if (mapperConfig != null){
+            this.type = mapperConfig.getType();
+            OAuth2BasicMapperConfig basicConfig = mapperConfig.getBasic();
+            if (basicConfig != null) {
+                this.emailAttributeKey = basicConfig.getEmailAttributeKey();
+                this.firstNameAttributeKey = basicConfig.getFirstNameAttributeKey();
+                this.lastNameAttributeKey = basicConfig.getLastNameAttributeKey();
+                this.tenantNameStrategy = basicConfig.getTenantNameStrategy();
+                this.tenantNamePattern = basicConfig.getTenantNamePattern();
+                this.customerNamePattern = basicConfig.getCustomerNamePattern();
+                this.defaultDashboardName = basicConfig.getDefaultDashboardName();
+                this.alwaysFullScreen = basicConfig.isAlwaysFullScreen();
+            }
         }
     }
 
@@ -130,18 +133,21 @@ public class OAuth2ClientRegistrationTemplateEntity extends BaseSqlEntity<OAuth2
         clientRegistrationTemplate.setCreatedTime(createdTime);
         clientRegistrationTemplate.setAdditionalInfo(additionalInfo);
 
-        clientRegistrationTemplate.setMapperType(type);
         clientRegistrationTemplate.setProviderId(providerId);
-        clientRegistrationTemplate.setBasic(
-                OAuth2BasicMapperConfig.builder()
-                        .emailAttributeKey(emailAttributeKey)
-                        .firstNameAttributeKey(firstNameAttributeKey)
-                        .lastNameAttributeKey(lastNameAttributeKey)
-                        .tenantNameStrategy(tenantNameStrategy)
-                        .tenantNamePattern(tenantNamePattern)
-                        .customerNamePattern(customerNamePattern)
-                        .defaultDashboardName(defaultDashboardName)
-                        .alwaysFullScreen(alwaysFullScreen)
+        clientRegistrationTemplate.setMapperConfig(
+                OAuth2MapperConfig.builder()
+                        .type(type)
+                        .basic(OAuth2BasicMapperConfig.builder()
+                                .emailAttributeKey(emailAttributeKey)
+                                .firstNameAttributeKey(firstNameAttributeKey)
+                                .lastNameAttributeKey(lastNameAttributeKey)
+                                .tenantNameStrategy(tenantNameStrategy)
+                                .tenantNamePattern(tenantNamePattern)
+                                .customerNamePattern(customerNamePattern)
+                                .defaultDashboardName(defaultDashboardName)
+                                .alwaysFullScreen(alwaysFullScreen)
+                                .build()
+                        )
                         .build()
         );
         clientRegistrationTemplate.setAuthorizationUri(authorizationUri);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java
index 4eaeb914c9..f6fab8e38e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java
@@ -95,7 +95,13 @@ public class OAuth2ConfigTemplateServiceImpl extends AbstractEntityService imple
                     if (StringUtils.isEmpty(clientRegistrationTemplate.getProviderId())) {
                         throw new DataValidationException("Provider ID should be specified!");
                     }
-                    if (clientRegistrationTemplate.getBasic() == null) {
+                    if (clientRegistrationTemplate.getMapperConfig() == null) {
+                        throw new DataValidationException("Mapper config should be specified!");
+                    }
+                    if (clientRegistrationTemplate.getMapperConfig().getType() == null) {
+                        throw new DataValidationException("Mapper type should be specified!");
+                    }
+                    if (clientRegistrationTemplate.getMapperConfig().getBasic() == null) {
                         throw new DataValidationException("Basic mapper config should be specified!");
                     }
                 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
index 3c32af73a3..15c9172e83 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.oauth2.MapperType;
 import org.thingsboard.server.common.data.oauth2.OAuth2BasicMapperConfig;
 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistrationTemplate;
+import org.thingsboard.server.common.data.oauth2.OAuth2MapperConfig;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService;
 
@@ -106,9 +107,9 @@ public class BaseOAuth2ConfigTemplateServiceTest extends AbstractServiceTest {
         OAuth2ClientRegistrationTemplate clientRegistrationTemplate = new OAuth2ClientRegistrationTemplate();
         clientRegistrationTemplate.setProviderId(providerId);
         clientRegistrationTemplate.setAdditionalInfo(mapper.createObjectNode().put(UUID.randomUUID().toString(), UUID.randomUUID().toString()));
-        clientRegistrationTemplate.setMapperType(MapperType.BASIC);
-        clientRegistrationTemplate.setBasic(
-                OAuth2BasicMapperConfig.builder()
+        clientRegistrationTemplate.setMapperConfig(OAuth2MapperConfig.builder()
+                .type(MapperType.BASIC)
+                .basic(OAuth2BasicMapperConfig.builder()
                         .firstNameAttributeKey("firstName")
                         .lastNameAttributeKey("lastName")
                         .emailAttributeKey("email")
@@ -116,7 +117,8 @@ public class BaseOAuth2ConfigTemplateServiceTest extends AbstractServiceTest {
                         .defaultDashboardName("Test")
                         .alwaysFullScreen(true)
                         .build()
-        );
+                )
+                .build());
         clientRegistrationTemplate.setAuthorizationUri("authorizationUri");
         clientRegistrationTemplate.setAccessTokenUri("tokenUri");
         clientRegistrationTemplate.setScope(Arrays.asList("scope1", "scope2"));