diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
deleted file mode 100644
index 2784e858d0..0000000000
--- a/app/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    package="com.tangem.wallet">
-
-
-    <application
-        tools:ignore="GoogleAppIndexingWarning">
-
-<!--        <provider-->
-<!--            android:name="com.tangem.data.LogFileProvider"-->
-<!--            android:authorities="@string/log_file_provider_authorities"-->
-<!--            android:enabled="true"-->
-<!--            android:exported="false"-->
-<!--            android:grantUriPermissions="true" />-->
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/app/src/debug/res/values-ru/strings.xml b/app/src/debug/res/values-ru/strings.xml
index 878fbcbef1..9c7f1adda2 100644
--- a/app/src/debug/res/values-ru/strings.xml
+++ b/app/src/debug/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="tangem_app_name">DebugTangem</string>
+    <string name="tangem_app_name" translatable="false">DebugTangem</string>
 
 </resources>
diff --git a/app/src/debug/res/xml/network_security_config.xml b/app/src/debug/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..894912ac61
--- /dev/null
+++ b/app/src/debug/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/app/src/debug_beta/AndroidManifest.xml b/app/src/debug_beta/AndroidManifest.xml
deleted file mode 100644
index 2784e858d0..0000000000
--- a/app/src/debug_beta/AndroidManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    package="com.tangem.wallet">
-
-
-    <application
-        tools:ignore="GoogleAppIndexingWarning">
-
-<!--        <provider-->
-<!--            android:name="com.tangem.data.LogFileProvider"-->
-<!--            android:authorities="@string/log_file_provider_authorities"-->
-<!--            android:enabled="true"-->
-<!--            android:exported="false"-->
-<!--            android:grantUriPermissions="true" />-->
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/app/src/debug_beta/res/values-ru/strings.xml b/app/src/debug_beta/res/values-ru/strings.xml
deleted file mode 100644
index 7fd995cb02..0000000000
--- a/app/src/debug_beta/res/values-ru/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="tangem_app_name">BetaTangem</string>
-
-</resources>
diff --git a/app/src/debug_beta/res/values/strings.xml b/app/src/debug_beta/res/values/strings.xml
deleted file mode 100644
index 7fd995cb02..0000000000
--- a/app/src/debug_beta/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="tangem_app_name">BetaTangem</string>
-
-</resources>
diff --git a/app/src/external/res/values-ru/strings.xml b/app/src/external/res/values-ru/strings.xml
new file mode 100644
index 0000000000..3a1e80c609
--- /dev/null
+++ b/app/src/external/res/values-ru/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="tangem_app_name" translatable="false">ExternalTangem</string>
+
+</resources>
diff --git a/app/src/external/res/values/strings.xml b/app/src/external/res/values/strings.xml
new file mode 100644
index 0000000000..3a1e80c609
--- /dev/null
+++ b/app/src/external/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="tangem_app_name" translatable="false">ExternalTangem</string>
+
+</resources>
diff --git a/app/src/internal/res/values-ru/strings.xml b/app/src/internal/res/values-ru/strings.xml
new file mode 100644
index 0000000000..76df805cb3
--- /dev/null
+++ b/app/src/internal/res/values-ru/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="tangem_app_name" translatable="false">InternalTangem</string>
+
+</resources>
diff --git a/app/src/internal/res/values/strings.xml b/app/src/internal/res/values/strings.xml
new file mode 100644
index 0000000000..76df805cb3
--- /dev/null
+++ b/app/src/internal/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="tangem_app_name" translatable="false">InternalTangem</string>
+
+</resources>
diff --git a/app/src/internal/res/xml/network_security_config.xml b/app/src/internal/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..894912ac61
--- /dev/null
+++ b/app/src/internal/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index c0b6c9cc13..454c57b5fd 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <debug-overrides>
-        <trust-anchors>
-            <certificates src="user" />
-            <certificates src="system" />
-        </trust-anchors>
-    </debug-overrides>
-
     <domain-config>
         <domain includeSubdomains="true">api.tangem.com</domain>
         <trust-anchors>
diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt
index 3817da1027..1ba8b81a2d 100644
--- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt
+++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt
@@ -72,7 +72,9 @@ private fun AndroidBuildType.configureBuildVariant(extension: AppExtension, buil
             isDebuggable = true
             isMinifyEnabled = false
         }
-        BuildType.External -> {
+        BuildType.Internal,
+        BuildType.External,
+        -> {
             initWith(extension.buildTypes.getByName(BuildType.Release.id))
             signingConfig = extension.signingConfigs.getByName(BuildType.Debug.id)
         }
diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt
index 16aa46325d..b872eb35ff 100644
--- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt
+++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt
@@ -7,6 +7,72 @@ internal enum class BuildType(
     val configFields: List<BuildConfigField>,
 ) {
 
+    /**
+     * Build type for developers
+     *
+     * Features:
+     * - Env: dev
+     * - Signing config: debug
+     * - Debuggable
+     * - Logs
+     * - Tester menu
+     * - Test action
+     * - Traffic sniffing
+     * */
+    Debug(
+        id = "debug",
+        appIdSuffix = "debug",
+        configFields = listOf(
+            BuildConfigField.Environment(value = "dev"),
+            BuildConfigField.TestActionEnabled(isEnabled = true),
+            BuildConfigField.LogEnabled(isEnabled = true),
+            BuildConfigField.TesterMenuAvailability(isEnabled = true),
+        ),
+    ),
+
+    /**
+     * Build type for QA
+     *
+     * Features:
+     * - Env: beta
+     * - Signing config: debug
+     * - Logs
+     * - Tester menu
+     * - Test action
+     * - Traffic sniffing
+     * */
+    Internal(
+        id = "internal",
+        appIdSuffix = "internal",
+        versionSuffix = "internal",
+        configFields = listOf(
+            BuildConfigField.Environment(value = "beta"),
+            BuildConfigField.TestActionEnabled(isEnabled = true),
+            BuildConfigField.LogEnabled(isEnabled = true),
+            BuildConfigField.TesterMenuAvailability(isEnabled = true),
+        ),
+    ),
+
+    /**
+     * Build type for QA and business
+     *
+     * Features:
+     * - Env: prod
+     * - Signing config: debug
+     * - Proguard
+     * */
+    External(
+        id = "external",
+        appIdSuffix = "external",
+        versionSuffix = "external",
+        configFields = listOf(
+            BuildConfigField.Environment(value = "prod"),
+            BuildConfigField.TestActionEnabled(isEnabled = false),
+            BuildConfigField.LogEnabled(isEnabled = false),
+            BuildConfigField.TesterMenuAvailability(isEnabled = false),
+        ),
+    ),
+
     /**
      * Production ready build type for clients
      *
@@ -24,49 +90,4 @@ internal enum class BuildType(
             BuildConfigField.TesterMenuAvailability(isEnabled = false),
         ),
     ),
-
-    /**
-     * Build type for developers
-     *
-     * Features:
-     * - Env: dev
-     * - Signing config: debug
-     * - Debuggable
-     * - Logs
-     * - Tester menu
-     * - Test action
-     * - Traffic sniffing
-     * */
-    Debug(
-        id = "debug",
-        appIdSuffix = "dev",
-        configFields = listOf(
-            BuildConfigField.Environment(value = "dev"),
-            BuildConfigField.TestActionEnabled(isEnabled = true),
-            BuildConfigField.LogEnabled(isEnabled = true),
-            BuildConfigField.TesterMenuAvailability(isEnabled = true),
-        ),
-    ),
-
-    /**
-     * Build type for QA and business
-     *
-     * Features:
-     * - Env: prod
-     * - Signing config: debug
-     * - Tester menu
-     * - Test action
-     * - Proguard
-     * */
-    External(
-        id = "debug_beta",
-        appIdSuffix = "debug",
-        versionSuffix = "debug",
-        configFields = listOf(
-            BuildConfigField.Environment(value = "prod"),
-            BuildConfigField.TestActionEnabled(isEnabled = true),
-            BuildConfigField.LogEnabled(isEnabled = false),
-            BuildConfigField.TesterMenuAvailability(isEnabled = true),
-        ),
-    ),
 }
\ No newline at end of file