diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dd01bd8..bcda6b91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.5.0] - 2019-11-04
+### Added
+- Added compatibility with Android 10
+- Added support for Docker containers
+
+### Fixed
+- Fixed URL of Ubuntu repository
+- Fixed Arch Linux deprecations
+
+### Changed
+- Updated built-in busybox to v1.31.1
+
+### Removed
+- Removed PRoot support
+- Removed installing symlink to /system/bin
+
 ## [2.4.1] - 2019-10-20
 ### Added
 - Added power trigger
diff --git a/README.md b/README.md
index 73d21d05..69d05901 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The app is available for download in Google Play and GitHub.
 
 ## Features
 
-- Supported distributions: Debian, Ubuntu, Kali Linux, Arch Linux, Fedora, CentOS, Slackware, Alpine Linux, other (from rootfs.tar)
+- Bootstrap: Alpine, Arch, CentOS, Debian, Fedora, Kali, Slackware, Ubuntu, Docker or from rootfs.tar
 - Installation type: image file, directory, disk partition, RAM
 - Supported file systems: ext2, ext3, ext4
 - Supported architectures: arm, arm64, x86, x86_64, emulation mode (ARM ~ x86)
diff --git a/app/build.gradle b/app/build.gradle
index ca134683..d980c3a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId 'ru.meefik.linuxdeploy'
         minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 252
-        versionName "2.4.1"
+        targetSdkVersion 29
+        versionCode 253
+        versionName "2.5.0"
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c72f804..ead33afa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,8 +16,9 @@
         android:name=".App"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
         android:theme="@style/DarkTheme"
+        android:supportsRtl="true"
+        android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
diff --git a/app/src/main/assets/bin/arm/busybox b/app/src/main/assets/bin/arm/busybox
index 3d063dca..465eb6e4 100755
Binary files a/app/src/main/assets/bin/arm/busybox and b/app/src/main/assets/bin/arm/busybox differ
diff --git a/app/src/main/assets/bin/arm/proot b/app/src/main/assets/bin/arm/proot
deleted file mode 100755
index 5e89dd86..00000000
Binary files a/app/src/main/assets/bin/arm/proot and /dev/null differ
diff --git a/app/src/main/assets/bin/arm_64/busybox b/app/src/main/assets/bin/arm_64/busybox
deleted file mode 100755
index 4c43cc4c..00000000
Binary files a/app/src/main/assets/bin/arm_64/busybox and /dev/null differ
diff --git a/app/src/main/assets/bin/arm_64/proot b/app/src/main/assets/bin/arm_64/proot
deleted file mode 100755
index 75c829d3..00000000
Binary files a/app/src/main/assets/bin/arm_64/proot and /dev/null differ
diff --git a/app/src/main/assets/bin/x86/busybox b/app/src/main/assets/bin/x86/busybox
index cbed7043..2f8f7112 100755
Binary files a/app/src/main/assets/bin/x86/busybox and b/app/src/main/assets/bin/x86/busybox differ
diff --git a/app/src/main/assets/bin/x86/proot b/app/src/main/assets/bin/x86/proot
deleted file mode 100755
index c6df206d..00000000
Binary files a/app/src/main/assets/bin/x86/proot and /dev/null differ
diff --git a/app/src/main/assets/bin/x86_64/proot b/app/src/main/assets/bin/x86_64/proot
deleted file mode 100755
index 4b4a34ee..00000000
Binary files a/app/src/main/assets/bin/x86_64/proot and /dev/null differ
diff --git a/app/src/main/assets/env b/app/src/main/assets/env
index a99b2055..6fb80262 160000
--- a/app/src/main/assets/env
+++ b/app/src/main/assets/env
@@ -1 +1 @@
-Subproject commit a99b2055f4fe5c447a243660ec8537f8d327f624
+Subproject commit 6fb80262ba8f264d9f0bc0a828a95440029d3c5e
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java b/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java
index b84e5e02..c9448427 100644
--- a/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java
+++ b/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java
@@ -386,10 +386,6 @@ static boolean updateEnv(final Context c) {
         // update profile.conf
         if (!PrefStore.getPropertiesConfFile(c).exists()) PrefStore.dumpProperties(c);
 
-        if (PrefStore.isCliSymlink(c)) {
-            if (!EnvUtils.makeSymlink(c)) return false;
-        }
-
         // update version
         if (!setVersion(c)) return false;
 
@@ -424,38 +420,6 @@ private static boolean makeMainScript(Context c) {
         return result;
     }
 
-    /**
-     * Make symlink on linuxdeploy script in /system/bin
-     *
-     * @param c context
-     * @return true if success
-     */
-    private static boolean makeSymlink(Context c) {
-        List<String> params = new ArrayList<>();
-        params.add("{ rm -f /system/bin/linuxdeploy; ln -s "
-                + PrefStore.getBinDir(c)
-                + "/linuxdeploy /system/bin/linuxdeploy; } 2>/dev/null || "
-                + "{ mount -o rw,remount /system; rm -f /system/bin/linuxdeploy; ln -s "
-                + PrefStore.getBinDir(c)
-                + "/linuxdeploy /system/bin/linuxdeploy; mount -o ro,remount /system; }");
-        return exec(c, "su", params);
-    }
-
-    /**
-     * Remove symlink on linuxdeploy script from /system/bin
-     *
-     * @param c context
-     * @return true if success
-     */
-    private static boolean removeSymlink(Context c) {
-        List<String> params = new ArrayList<>();
-        params.add("if [ -e /system/bin/linuxdeploy ]; then "
-                + "rm -f /system/bin/linuxdeploy 2>/dev/null || "
-                + "{ mount -o rw,remount /system; rm -f /system/bin/linuxdeploy; mount -o ro,remount /system; };"
-                + "fi");
-        return exec(c, "su", params);
-    }
-
     /**
      * Remove operating environment
      *
@@ -466,10 +430,6 @@ static boolean removeEnv(Context c) {
         // stop services
         execServices(c, new String[]{"telnetd", "httpd"}, "stop");
 
-        // remove symlink
-        File ldSymlink = new File("/system/bin/linuxdeploy");
-        if (ldSymlink.exists()) removeSymlink(c);
-
         // clean env directory
         File envDir = new File(PrefStore.getEnvDir(c));
         cleanDirectory(envDir);
@@ -495,8 +455,7 @@ public static boolean cli(Context c, String cmd, String args) {
         params.add("printf '>>> " + cmd + "\n'");
         params.add(PrefStore.getBinDir(c) + "/linuxdeploy " + opts + cmd + args);
         params.add("printf '<<< " + cmd + "\n'");
-        String shell = PrefStore.isRootRequired(c) ? "su" : "sh";
-        return exec(c, shell, params);
+        return exec(c, "su", params);
     }
 
     /**
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/PrefStore.java b/app/src/main/java/ru/meefik/linuxdeploy/PrefStore.java
index 40e508fb..f068b3a6 100644
--- a/app/src/main/java/ru/meefik/linuxdeploy/PrefStore.java
+++ b/app/src/main/java/ru/meefik/linuxdeploy/PrefStore.java
@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Point;
+import android.os.Environment;
 import android.text.TextUtils;
 import android.view.Display;
 import android.view.WindowManager;
@@ -155,15 +156,6 @@ static String getPropertiesSharedName() {
         return PropertiesStore.name;
     }
 
-    /**
-     * Check root is required for current profile
-     *
-     * @return true if required
-     */
-    static boolean isRootRequired(Context c) {
-        return PROPERTIES.get(c, "method").equals("chroot");
-    }
-
     /**
      * Get language code
      *
@@ -302,9 +294,12 @@ static Boolean isLogger(Context c) {
      * @return path
      */
     static String getLogFile(Context c) {
-        String logfile = SETTINGS.get(c, "logfile");
-        if (!logfile.contains("/")) logfile = getEnvDir(c) + "/" + logfile;
-        return logfile;
+        String logFile = SETTINGS.get(c, "logfile");
+        if (!logFile.contains("/")) {
+            String storageDir = Environment.getExternalStorageDirectory().getAbsolutePath();
+            logFile = storageDir + "/" + logFile;
+        }
+        return logFile;
     }
 
     /**
@@ -449,16 +444,6 @@ static void setRepositoryUrl(Context c, String url) {
         SETTINGS.set(c, "repository_url", url);
     }
 
-    /**
-     * CLI symlink is enabled
-     *
-     * @param c context
-     * @return true if enabled
-     */
-    static Boolean isCliSymlink(Context c) {
-        return SETTINGS.get(c, "is_cli").equals("true");
-    }
-
     /**
      * Telnet is enabled
      *
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/PropertiesActivity.java b/app/src/main/java/ru/meefik/linuxdeploy/PropertiesActivity.java
index d5fc745e..01781541 100644
--- a/app/src/main/java/ru/meefik/linuxdeploy/PropertiesActivity.java
+++ b/app/src/main/java/ru/meefik/linuxdeploy/PropertiesActivity.java
@@ -8,7 +8,6 @@
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
-import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.view.MenuItem;
 
@@ -20,10 +19,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         PrefStore.setLocale(this);
 
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        PreferenceManager prefMgr = getPreferenceManager();
-        prefMgr.setSharedPreferencesName(PrefStore.getPropertiesSharedName());
+        getPreferenceManager().setSharedPreferencesName(PrefStore.getPropertiesSharedName());
 
         // Restore from conf file if open from main activity
         if (getIntent().getBooleanExtra("restore", false)) {
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/PropertiesStore.java b/app/src/main/java/ru/meefik/linuxdeploy/PropertiesStore.java
index 5ff62204..fc5f7e90 100644
--- a/app/src/main/java/ru/meefik/linuxdeploy/PropertiesStore.java
+++ b/app/src/main/java/ru/meefik/linuxdeploy/PropertiesStore.java
@@ -11,7 +11,7 @@
 class PropertiesStore extends ParamUtils {
 
     public static final String name = "properties_conf";
-    private static final String[] params = {"method", "distrib", "arch", "suite", "source_path",
+    private static final String[] params = {"distrib", "arch", "suite", "source_path",
             "target_type", "target_path", "disk_size", "fs_type", "user_name", "user_password",
             "privileged_users", "locale", "dns", "net_trigger", "power_trigger", "init", "init_path", "init_level",
             "init_user", "init_async", "ssh_port", "ssh_args", "pulse_host", "pulse_port", "graphics",
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/SettingsActivity.java b/app/src/main/java/ru/meefik/linuxdeploy/SettingsActivity.java
index 5535611b..a375bab4 100644
--- a/app/src/main/java/ru/meefik/linuxdeploy/SettingsActivity.java
+++ b/app/src/main/java/ru/meefik/linuxdeploy/SettingsActivity.java
@@ -13,7 +13,6 @@
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
-import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 
 import androidx.appcompat.app.AlertDialog;
@@ -28,8 +27,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         PrefStore.setLocale(this);
 
-        PreferenceManager prefMgr = getPreferenceManager();
-        prefMgr.setSharedPreferencesName(PrefStore.getSettingsSharedName());
+        getPreferenceManager().setSharedPreferencesName(PrefStore.getSettingsSharedName());
 
         // Restore from conf file
         PrefStore.restoreSettings(this);
@@ -151,6 +149,11 @@ private void setSummary(Preference pref, boolean init) {
                 editPref.setText(PrefStore.getHttpConf(this));
                 pref.setSummary(editPref.getText());
             }
+
+            if (editPref.getKey().equals("logfile") && !init) {
+                editPref.setText(PrefStore.getLogFile(this));
+                pref.setSummary(editPref.getText());
+            }
         }
 
         if (pref instanceof ListPreference) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2cce5a39..8f666c38 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -82,7 +82,6 @@
     <string name="summary_debug_mode_preference">Sehe die Debugging Information</string>
     <string name="summary_disk_size_preference">Automatische Berechnung</string>
     <string name="summary_gui_properties_preference">Ändern der Einstellungen für das Grafik-Subsystem</string>
-    <string name="summary_is_cli_preference">Set up a command line interface</string>
     <string name="title_x11_display_preference">Bildschirm</string>
     <string name="title_x11_host_preference">X Server Addrese</string>
     <string name="title_x11_sdl_preference">XServer XSDL</string>
@@ -114,7 +113,6 @@
     <string name="title_mounts_editor_preference">Mount Punkte</string>
     <string name="title_ssh_port_preference">Port</string>
     <string name="title_ssh_properties_preference">SSH Einstellungen</string>
-    <string name="title_is_cli_preference">Aktivieren CLI</string>
     <string name="title_arch_preference">Architekture</string>
     <string name="title_dns_preference">DNS Server</string>
     <string name="title_source_path_preference">Quellpfad</string>
@@ -122,7 +120,6 @@
     <string name="summary_trace_mode_preference">Aktiviere Trance-Modus</string>
     <string name="summary_ssh_properties_preference">SSH Server Einstellungen ändern</string>
     <string name="summary_is_ssh_preference">Erlauben das der SSH Server hochfährt</string>
-    <string name="summary_nettrack_preference"></string>
     <string name="summary_mounts_editor_preference">Bearbeite die Mountliste</string>
     <string name="summary_dns_preference">Automatische Erkennung</string>
     <string name="summary_is_mounts_preference">Erlaube das mount der Android resources</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 87462512..6d3296dc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -117,12 +117,10 @@
     <string name="title_mounts_editor_preference">Puntos de montaje</string>
     <string name="title_ssh_port_preference">Puerto</string>
     <string name="title_ssh_properties_preference">Configuración SSH</string>
-    <string name="title_is_cli_preference">Habilitar CLI</string>
     <string name="title_arch_preference">Arquitectura</string>
     <string name="title_dns_preference">Servidor DNS</string>
     <string name="title_source_path_preference">Ruta de origen</string>
     <string name="summary_x11_sdl_preference">Abrir automáticamente XServer XSDL</string>
-    <string name="summary_is_cli_preference">Set up a command line interface</string>
     <string name="summary_trace_mode_preference">Habilitar modo seguimiento</string>
     <string name="summary_ssh_properties_preference">Cambiar la configuración del servidor SSH</string>
     <string name="summary_is_ssh_preference">Permitir ejecutar servidor SSH</string>
@@ -134,7 +132,6 @@
     <string name="dialog_title_user_name_preference">Nombre usuario</string>
     <string name="dialog_title_user_password_preference">Contraseña de usuario</string>
     <string name="dialog_title_target_path_preference">Ruta instalación</string>
-    <string name="dialog_title_ssh_options_preference"></string>
     <string name="dialog_title_ssh_port_preference">SSH: puerto</string>
     <string name="dialog_title_fs_type_preference">Sistema de archivo</string>
     <string name="dialog_title_graphics_preference">Gráficos subsistema</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 88747fc9..d820f4bc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -117,12 +117,10 @@
     <string name="title_mounts_editor_preference">Points de montage</string>
     <string name="title_ssh_port_preference">Port</string>
     <string name="title_ssh_properties_preference">Paramètres SSH</string>
-    <string name="title_is_cli_preference">Activer CLI</string>
     <string name="title_arch_preference">Architecture</string>
     <string name="title_dns_preference">Serveur DNS</string>
     <string name="title_source_path_preference">Chemin source</string>
     <string name="summary_x11_sdl_preference">Ouvrir automatiquement XServer XSDL</string>
-    <string name="summary_is_cli_preference">Set up a command line interface</string>
     <string name="summary_trace_mode_preference">Active le mode de suivi</string>
     <string name="summary_ssh_properties_preference">Changer les paramètres du serveur SSH</string>
     <string name="summary_is_ssh_preference">Autoriser le démarrage du serveur SSH</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 9a7c7c11..3922b2ef 100755
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -101,9 +101,6 @@
     <string name="title_server_url_preference">"URL server"</string>
     <string name="dialog_title_server_url_preference">"URL server"</string>
 
-    <string name="title_is_cli_preference">"Aktifkan CLI"</string>
-    <string name="summary_is_cli_preference">"Siapkan antarmuka baris perintah"</string>
-
     <string name="title_installenv_preference">"Perbarui ENV"</string>
     <string name="summary_installenv_preference">"Perbarui lingkungan pengoperasian"</string>
     <string name="message_installenv_confirm_dialog">"Update lingkungan operasi?"</string>
@@ -143,9 +140,6 @@
     <string name="title_export_dialog">"Ekspor"</string>
 
     <string name="bootstrap_preferences">"BOOTSTRAP"</string>
-    <!-- METHOD -->
-    <string name="title_method_preference">"Metode kontainerisasi"</string>
-    <string name="dialog_title_method_preference">"Metode kontainerisasi"</string>
     <!-- DISTRIB -->
     <string name="title_distrib_preference">"Distribusi"</string>
     <string name="dialog_title_distrib_preference">"Distribusi"</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 097d26ef..83b34d51 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -117,12 +117,10 @@
     <string name="title_mounts_editor_preference">Punti di montaggio</string>
     <string name="title_ssh_port_preference">Porta</string>
     <string name="title_ssh_properties_preference">Impostazioni SSH</string>
-    <string name="title_is_cli_preference">Permettere CLI</string>
     <string name="title_arch_preference">Architettura</string>
     <string name="title_dns_preference">Server DNS</string>
     <string name="title_source_path_preference">Percorso di origine</string>
     <string name="summary_x11_sdl_preference">Aprire automaticamente XServer XSDL</string>
-    <string name="summary_is_cli_preference">Set up a command line interface</string>
     <string name="summary_trace_mode_preference">Abilità modalità di tracciamento</string>
     <string name="summary_ssh_properties_preference">Modifica impostazioni server SSH</string>
     <string name="summary_is_ssh_preference">Permetti l\'avvio del server SSH</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 0283219d..ee024a59 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -95,9 +95,6 @@
     <string name="title_server_url_preference">서버 URL</string>
     <string name="dialog_title_server_url_preference">서버 URL</string>
 
-    <string name="title_is_cli_preference">CLI 활성화</string>
-    <string name="summary_is_cli_preference">명령 줄 인터페이스를 설정합니다.</string>
-
     <string name="title_installenv_preference">ENV 업데이트</string>
     <string name="summary_installenv_preference">운영체제 환경 업데이트</string>
     <string name="message_installenv_confirm_dialog">운영체제 환경을 업데이트 하시겠습니까?</string>
@@ -137,9 +134,6 @@
     <string name="title_export_dialog">내보내기</string>
 
     <string name="bootstrap_preferences">부트스트랩</string>
-    <!-- METHOD -->
-    <string name="title_method_preference">컨테이너화 방식</string>
-    <string name="dialog_title_method_preference">컨테이너화 방식</string>
     <!-- DISTRIB -->
     <string name="title_distrib_preference">배포</string>
     <string name="dialog_title_distrib_preference">배포</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a98a3d9a..75b5456c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -60,8 +60,6 @@
     <string name="env_preferences">Środowisko operacyjne</string>
     <string name="title_path_preference">Katalog BusyBox</string>
     <string name="dialog_title_path_preference">PATH</string>
-    <string name="title_is_cli_preference">Włącz CLI</string>
-    <string name="summary_is_cli_preference">Ustaw interfejs wiersza poleceń</string>
     <string name="title_installenv_preference">Zaktualizuj ENV</string>
     <string name="summary_installenv_preference">Zaktualizuj środowisko operacyjne</string>
     <string name="message_installenv_confirm_dialog">Zaktualizować środowisko operacyjne?</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 03b99566..a18db22d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -55,13 +55,11 @@
     <string name="summary_timestamp_preference">Mostrar timestamp</string>
     <string name="title_appicon_preference">Mostrar ícone</string>
     <string name="summary_appicon_preference">Mostrar ícone na barra de notificação</string>
-    <string name="title_autostart_preference">Inicio automático</string>
+    <string name="title_autostart_preference">Início automático</string>
     <string name="summary_autostart_preference">Executar automaticamente o GNU/Linux ao iniciar o Android</string>
     <string name="env_preferences">Ambiente de operação</string>
     <string name="title_path_preference">Diretório do BusyBox</string>
     <string name="dialog_title_path_preference">Diretório do BusyBox</string>
-    <string name="title_is_cli_preference">Usar CLI</string>
-    <string name="summary_is_cli_preference">Configurar a interface de linha de comando</string>
     <string name="title_installenv_preference">Atualizar ENV</string>
     <string name="summary_installenv_preference">Atualizar ambiente de operação</string>
     <string name="message_installenv_confirm_dialog">Atualizar ambiente de operação?</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index dd94bf50..9c8dccfa 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -93,7 +93,6 @@
     <string name="summary_gui_properties_preference">Изменить параметры графической подсистемы</string>
     <string name="summary_init_properties_preference">Изменить параметры система инициализации</string>
     <string name="summary_init_async_preference">Запускать процессы параллельно </string>
-    <string name="summary_is_cli_preference">Настроить интерфейс командной строки</string>
     <string name="title_x11_display_preference">Номер дисплея</string>
     <string name="title_x11_host_preference">Адрес X-сервера</string>
     <string name="title_x11_sdl_preference">XServer XSDL</string>
@@ -131,7 +130,6 @@
     <string name="title_is_telnet_preference">TELNET</string>
     <string name="title_mounts_editor_preference">Точки монтирования</string>
     <string name="title_nettrack_preference">Отслеживать изменения сети</string>
-    <string name="title_is_cli_preference">Включить CLI</string>
     <string name="title_is_http_preference">Веб-интерфейс</string>
     <string name="title_path_preference">Переменная PATH</string>
     <string name="title_ssh_port_preference">Порт</string>
@@ -148,7 +146,6 @@
     <string name="title_dns_preference">DNS-сервер</string>
     <string name="title_source_path_preference">Источник установки</string>
     <string name="title_ssh_options_preference">Опции SSH</string>
-    <string name="title_method_preference">Метод контейнеризации</string>
     <string name="title_env_dir_preference">Директория окружения</string>
     <string name="summary_x11_sdl_preference">Автоматически открывать XServer XSDL</string>
     <string name="summary_trace_mode_preference">Перейти в режим трассировки</string>
@@ -202,7 +199,6 @@
     <string name="dialog_title_path_preference">Переменная PATH</string>
     <string name="dialog_title_privileged_users_preference">Привилегированные пользователи</string>
     <string name="dialog_title_server_url_preference">URL сервера</string>
-    <string name="dialog_title_method_preference">Метод контейнеризации</string>
     <string name="dialog_title_init_user_preference">INIT: пользователь</string>
     <string name="title_privileged_users_preference">Привилегированные пользователи</string>
     <string name="bootstrap_preferences">Развертывание</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 445a9bf5..e12e4549 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -86,7 +86,6 @@
     <string name="summary_debug_mode_preference">Zobrazí ladiace informácie</string>
     <string name="summary_disk_size_preference">Bude vypočítaná automaticky</string>
     <string name="summary_gui_properties_preference">Zmení nastavenia grafického podsystému</string>
-    <string name="summary_is_cli_preference">Nastaví rozhranie príkazového riadku</string>
     <string name="title_x11_display_preference">Displej</string>
     <string name="title_x11_host_preference">Adresa X servera</string>
     <string name="title_x11_sdl_preference">XServer XSDL</string>
@@ -119,7 +118,6 @@
     <string name="title_mounts_editor_preference">Body pripojení</string>
     <string name="title_ssh_port_preference">Port</string>
     <string name="title_ssh_properties_preference">Nastavenia SSH</string>
-    <string name="title_is_cli_preference">Aktivovať CLI</string>
     <string name="gui_preferences">Grafické používateľské rozhranie</string>
     <string name="title_arch_preference">Architektúra</string>
     <string name="title_dns_preference">Server DNS</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 7d06fb77..882803be 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -117,13 +117,11 @@
     <string name="title_mounts_editor_preference">Các điểm gắn kết</string>
     <string name="title_ssh_port_preference">Cổng</string>
     <string name="title_ssh_properties_preference">Tuỳ chọn SSH</string>
-    <string name="title_is_cli_preference">Cho phép CLI</string>
     <string name="gui_preferences">GUI</string>
     <string name="title_arch_preference">Chuẩn nén</string>
     <string name="title_dns_preference">Máy chủ DNS</string>
     <string name="title_source_path_preference">Đường dẫn nguồn</string>
     <string name="summary_x11_sdl_preference">Tự động mở máy chủ X XSDL</string>
-    <string name="summary_is_cli_preference">Set up a command line interface</string>
     <string name="summary_trace_mode_preference">Bật chế độ dấu vết</string>
     <string name="summary_ssh_properties_preference">Thay đổi cài đặt cho máy chủ  SSH</string>
     <string name="summary_is_ssh_preference">Cho phép khởi động máy chủ SSH</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9db0c3ad..f707bb2f 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -102,9 +102,6 @@
     <string name="title_server_url_preference">服务器地址</string>
     <string name="dialog_title_server_url_preference">服务器地址</string>
 
-    <string name="title_is_cli_preference">启用 CLI</string>
-    <string name="summary_is_cli_preference">一个设置命令行界面</string>
-
     <string name="title_installenv_preference">更新环境</string>
     <string name="summary_installenv_preference">更新操作环境</string>
     <string name="message_installenv_confirm_dialog">是否要更新操作环境？</string>
@@ -144,9 +141,6 @@
     <string name="title_export_dialog">导出</string>
 
     <string name="bootstrap_preferences">引导设置</string>
-    <!-- METHOD -->
-    <string name="title_method_preference">容器类型</string>
-    <string name="dialog_title_method_preference">选择容器类型</string>
     <!-- DISTRIB -->
     <string name="title_distrib_preference">发行版 GNU/Linux </string>
     <string name="dialog_title_distrib_preference">选择发行版 GNU/Linux </string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 0ce08b0a..6cd42238 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -237,6 +237,7 @@
         <item>kali</item>
         <item>slackware</item>
         <item>ubuntu</item>
+        <item>docker</item>
         <item>rootfs</item>
     </string-array>
     <string-array name="distrib_entries" translatable="false">
@@ -248,16 +249,13 @@
         <item>Kali</item>
         <item>Slackware</item>
         <item>Ubuntu</item>
+        <item>Docker</item>
         <item>rootfs.tar</item>
     </string-array>
     <string-array name="init_values" translatable="false">
         <item>run-parts</item>
         <item>sysv</item>
     </string-array>
-    <string-array name="method_values" translatable="false">
-        <item>chroot</item>
-        <item>proot</item>
-    </string-array>
     <string-array name="graphics_values" translatable="false">
         <item>vnc</item>
         <item>x11</item>
@@ -391,6 +389,18 @@
         <item>x86_64</item>
     </string-array>
 
+    <!-- Docker -->
+
+    <string-array name="docker_suite_values" translatable="false">
+        <item>linux</item>
+    </string-array>
+    <string-array name="docker_arch_values" translatable="false">
+        <item>arm</item>
+        <item>arm64</item>
+        <item>386</item>
+        <item>amd64</item>
+    </string-array>
+
     <!-- RootFS -->
 
     <string-array name="rootfs_suite_values" translatable="false" />
diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml
index 29f78410..441e892b 100644
--- a/app/src/main/res/values/preferences.xml
+++ b/app/src/main/res/values/preferences.xml
@@ -17,7 +17,6 @@
     <string name="env_dir" translatable="false"></string>
     <string name="repository_url" translatable="false">http://hub.meefik.ru</string>
     <string name="path" translatable="false"></string>
-    <string name="is_cli" translatable="false">false</string>
     <string name="is_telnet" translatable="false">false</string>
     <string name="telnet_port" translatable="false">5023</string>
     <string name="telnet_localhost" translatable="false">true</string>
@@ -31,7 +30,6 @@
     <string name="logger" translatable="false">false</string>
     <string name="logfile" translatable="false">output.log</string>
     <string name="chroot_dir" translatable="false">/data/local/mnt</string>
-    <string name="method" translatable="false">chroot</string>
     <string name="distrib" translatable="false">debian</string>
     <string name="suite" translatable="false">@string/debian_suite</string>
     <string name="arch" translatable="false">@string/arm_debian_arch</string>
@@ -135,16 +133,16 @@
     <!-- Fedora -->
     <string name="fedora_suite" translatable="false">28</string>
     <!-- arm -->
-    <string name="arm_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive</string>
+    <string name="arm_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
     <string name="arm_fedora_arch" translatable="false">armhfp</string>
     <!-- arm_64 -->
-    <string name="arm_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive</string>
+    <string name="arm_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
     <string name="arm_64_fedora_arch" translatable="false">aarch64</string>
     <!-- x86 -->
-    <string name="x86_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive</string>
+    <string name="x86_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
     <string name="x86_fedora_arch" translatable="false">i386</string>
     <!-- x86_64 -->
-    <string name="x86_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive</string>
+    <string name="x86_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
     <string name="x86_64_fedora_arch" translatable="false">x86_64</string>
 
     <!-- CentOS -->
@@ -207,6 +205,21 @@
     <string name="x86_64_alpine_source_path" translatable="false">http://dl-cdn.alpinelinux.org/alpine/</string>
     <string name="x86_64_alpine_arch" translatable="false">x86_64</string>
 
+    <!-- Docker -->
+    <string name="docker_suite" translatable="false">linux</string>
+    <!-- arm -->
+    <string name="arm_docker_source_path" translatable="false">library/ubuntu:18.04</string>
+    <string name="arm_docker_arch" translatable="false">arm</string>
+    <!-- arm_64 -->
+    <string name="arm_64_docker_source_path" translatable="false">library/ubuntu:18.04</string>
+    <string name="arm_64_docker_arch" translatable="false">arm64</string>
+    <!-- x86 -->
+    <string name="x86_docker_source_path" translatable="false">library/ubuntu:18.04</string>
+    <string name="x86_docker_arch" translatable="false">386</string>
+    <!-- x86_64 -->
+    <string name="x86_64_docker_source_path" translatable="false">library/ubuntu:18.04</string>
+    <string name="x86_64_docker_arch" translatable="false">amd64</string>
+
     <!-- RootFS -->
     <string name="rootfs_suite" translatable="false" />
     <!-- arm -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa3c1b2d..6f91b1ef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,9 +118,6 @@
     <!-- SERVER_URL -->
     <string name="title_server_url_preference">Server URL</string>
     <string name="dialog_title_server_url_preference">Server URL</string>
-    <!-- CLI -->
-    <string name="title_is_cli_preference">Enable CLI</string>
-    <string name="summary_is_cli_preference">Set up a command line interface</string>
     <!-- Update ENV -->
     <string name="title_installenv_preference">Update ENV</string>
     <string name="summary_installenv_preference">Update the operating environment</string>
@@ -168,9 +165,6 @@
 
     <!-- BOOTSTRAP -->
     <string name="bootstrap_preferences">BOOTSTRAP</string>
-    <!-- METHOD -->
-    <string name="title_method_preference">Containerization method</string>
-    <string name="dialog_title_method_preference">Containerization method</string>
     <!-- DISTRIB -->
     <string name="title_distrib_preference">Distribution</string>
     <string name="dialog_title_distrib_preference">Distribution</string>
diff --git a/app/src/main/res/xml/properties.xml b/app/src/main/res/xml/properties.xml
index aff5af64..081742d4 100644
--- a/app/src/main/res/xml/properties.xml
+++ b/app/src/main/res/xml/properties.xml
@@ -2,15 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory android:title="@string/bootstrap_preferences">
-        <ListPreference
-            android:defaultValue="@string/method"
-            android:dialogTitle="@string/dialog_title_method_preference"
-            android:entries="@array/method_values"
-            android:entryValues="@array/method_values"
-            android:key="method"
-            android:summary="@string/method"
-            android:title="@string/title_method_preference" />
-
         <ListPreference
             android:defaultValue="@string/distrib"
             android:dialogTitle="@string/dialog_title_distrib_preference"
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 223ebc1e..f4ac242b 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -104,27 +104,6 @@
             android:key="path"
             android:summary="@string/path"
             android:title="@string/title_path_preference" />
-        <!--
-        <CheckBoxPreference
-            android:defaultValue="@string/is_sync"
-            android:key="is_sync"
-            android:summary="@string/summary_is_sync_preference"
-            android:title="@string/title_is_sync_preference" />
-
-        <EditTextPreference
-            android:dependency="is_sync"
-            android:defaultValue="@string/server_url"
-            android:dialogTitle="@string/dialog_title_server_url_preference"
-            android:key="server_url"
-            android:summary="@string/server_url"
-            android:title="@string/title_server_url_preference" />
-        -->
-        <CheckBoxPreference
-            android:defaultValue="@string/is_cli"
-            android:key="is_cli"
-            android:summary="@string/summary_is_cli_preference"
-            android:title="@string/title_is_cli_preference" />
-
         <PreferenceScreen
             android:key="installenv"
             android:summary="@string/summary_installenv_preference"