diff --git a/.circleci/config.yml b/.circleci/config.yml
index b411a58..d3d405a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -56,6 +56,7 @@ jobs:
             rm -rf plugins
             rm -rf resources/icons
             rm -rf resources/splash
+            sed -i.bkp 's/android-versionCode="[[:digit:]]*"/android-versionCode="'3$CIRCLE_BUILD_NUM'"/' config.xml
             node hooks/downloadCache.js
             cordova prepare android
 
diff --git a/config.xml b/config.xml
index 8fb5a32..48a46f6 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="3000" id="com.konecty.rocket.chat" ios-CFBundleVersion="22" version="2.8.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="3002" id="com.konecty.rocket.chat" ios-CFBundleVersion="23" version="2.8.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Rocket.Chat Cordova Legacy</name>
     <description>
         Rocket.Chat mobile application
@@ -114,10 +114,6 @@
             <string>Upload photos from library</string>
         </config-file>
     </platform>
-    <preference name="xwalkVersion" value="23" />
-    <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
-    <preference name="xwalkMode" value="embedded" />
-    <preference name="xwalkMultipleApk" value="true" />
     <preference name="webviewbounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="AutoHideSplashScreen" value="false" />
@@ -144,7 +140,6 @@
         <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="Upload photos from library" />
     </plugin>
     <plugin name="cordova-plugin-console" spec="1.0.5" />
-    <plugin name="cordova-plugin-crosswalk-webview" spec="2.3.0" />
     <plugin name="cordova-plugin-device" spec="1.1.4" />
     <plugin name="cordova-plugin-dialogs" spec="1.3.1" />
     <plugin name="cordova-plugin-file" spec="4.3.1" />