diff --git a/app/build.gradle b/app/build.gradle
index 2190aafd..c2d44ab1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,6 +69,7 @@ android {
         }
 
         debug {
+            debuggable true
             minifyEnabled false
             manifestPlaceholders = [enableCrashReporting: "false"]
         }
diff --git a/app/src/main/java/ro/code4/monitorizarevot/data/model/UpdateApp.kt b/app/src/main/java/ro/code4/monitorizarevot/data/model/UpdateApp.kt
new file mode 100644
index 00000000..d6f57e1f
--- /dev/null
+++ b/app/src/main/java/ro/code4/monitorizarevot/data/model/UpdateApp.kt
@@ -0,0 +1,15 @@
+package ro.code4.monitorizarevot.data.model
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+import org.parceler.Parcel
+
+/*
+    CREATED BY @PEDROFSN IN 31/10/20 16:29
+*/
+
+@Parcelize
+data class UpdateApp(
+    val hasUpdate : Boolean,
+    val needForceUpdate : Boolean
+) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/ro/code4/monitorizarevot/helper/Constants.kt b/app/src/main/java/ro/code4/monitorizarevot/helper/Constants.kt
index cdfc412c..773f47b7 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/helper/Constants.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/helper/Constants.kt
@@ -22,6 +22,8 @@ object Constants {
     const val REMOTE_CONFIG_PRIVACY_POLICY_URL = "privacy_policy_url"
     const val REMOTE_CONFIG_OBSERVER_GUIDE_URL = "observer_guide_url"
     const val REMOTE_CONFIG_SAFETY_GUIDE_URL = "safety_guide_url"
+    const val REMOTE_CONFIG_UPDATE_CHECK = "android_check_update_available"
+    const val REMOTE_CONFIG_UPDATE_FORCE = "android_force_update"
 
     const val PUSH_NOTIFICATION_TITLE = "title"
     const val PUSH_NOTIFICATION_BODY = "body"
diff --git a/app/src/main/java/ro/code4/monitorizarevot/helper/Utils.kt b/app/src/main/java/ro/code4/monitorizarevot/helper/Utils.kt
index 24895fae..367320fb 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/helper/Utils.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/helper/Utils.kt
@@ -483,3 +483,13 @@ fun collapseKeyboardIfFocusOutsideEditText(
                 ?.hideSoftInputFromWindow(newFocusedView.windowToken, 0)
     }
 }
+
+fun Context.openAppInPlayStore(appPackageName: String = packageName) {
+    val uri = try {
+        Uri.parse("market://details?id=$appPackageName")
+    } catch (exception: ActivityNotFoundException) {
+        Uri.parse("https://play.google.com/store/apps/details?id=$appPackageName")
+    }
+    val intent = Intent(Intent.ACTION_VIEW, uri)
+    startActivity(intent)
+}
diff --git a/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginActivity.kt b/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginActivity.kt
index 650e56dc..54f600bb 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginActivity.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginActivity.kt
@@ -1,15 +1,20 @@
 package ro.code4.monitorizarevot.ui.login
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.text.TextWatcher
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.Observer
+import androidx.lifecycle.observe
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_login.*
 import org.koin.android.viewmodel.ext.android.viewModel
 import ro.code4.monitorizarevot.BuildConfig
 import ro.code4.monitorizarevot.R
+import ro.code4.monitorizarevot.data.model.UpdateApp
 import ro.code4.monitorizarevot.helper.TextWatcherDelegate
 import ro.code4.monitorizarevot.helper.isOnline
+import ro.code4.monitorizarevot.helper.openAppInPlayStore
 import ro.code4.monitorizarevot.helper.startActivityWithoutTrace
 import ro.code4.monitorizarevot.ui.base.BaseAnalyticsActivity
 import ro.code4.monitorizarevot.widget.ProgressDialogFragment
@@ -51,6 +56,28 @@ class LoginActivity : BaseAnalyticsActivity<LoginViewModel>() {
                 loginButton.isEnabled = !p0.isNullOrEmpty() && !phone.text.isNullOrEmpty()
             }
         })
+        observeAppUpdates()
+    }
+
+    private fun observeAppUpdates() {
+        viewModel.shouldUpdateAppVersion().observe(this) { shouldUpdateApp(update = it) }
+    }
+
+    private fun shouldUpdateApp(update: UpdateApp) {
+        if (update.hasUpdate) {
+            AlertDialog.Builder(this)
+                .setTitle(R.string.app_update_dialog_title)
+                .setMessage(R.string.app_update_dialog_message)
+                .setCancelable(update.needForceUpdate.not())
+                .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _ ->
+                    if (update.needForceUpdate) {
+                        openAppInPlayStore()
+                    }
+                    dialog.dismiss()
+                }
+                .create()
+                .show()
+        }
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginViewModel.kt b/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginViewModel.kt
index c83c1bd3..155954f8 100644
--- a/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/ro/code4/monitorizarevot/ui/login/LoginViewModel.kt
@@ -1,19 +1,22 @@
 package ro.code4.monitorizarevot.ui.login
 
 import android.content.SharedPreferences
-import android.util.Log
 import androidx.lifecycle.LiveData
+import com.google.firebase.FirebaseApp
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.koin.android.ext.android.inject
 import org.koin.core.inject
 import ro.code4.monitorizarevot.BuildConfig
 import ro.code4.monitorizarevot.analytics.Event
+import ro.code4.monitorizarevot.data.model.UpdateApp
 import ro.code4.monitorizarevot.data.model.User
 import ro.code4.monitorizarevot.data.model.response.LoginResponse
 import ro.code4.monitorizarevot.helper.*
+import ro.code4.monitorizarevot.helper.Constants.REMOTE_CONFIG_UPDATE_CHECK
+import ro.code4.monitorizarevot.helper.Constants.REMOTE_CONFIG_UPDATE_FORCE
 import ro.code4.monitorizarevot.repositories.Repository
 import ro.code4.monitorizarevot.ui.base.BaseViewModel
 import ro.code4.monitorizarevot.ui.onboarding.OnboardingActivity
@@ -26,6 +29,16 @@ class LoginViewModel : BaseViewModel() {
     private val firebaseAnalytics: FirebaseAnalytics by inject()
 
     private val loginLiveData = SingleLiveEvent<Result<Class<*>>>()
+    private val updates = SingleLiveEvent<UpdateApp>()
+
+    fun shouldUpdateAppVersion(): LiveData<UpdateApp> {
+        FirebaseRemoteConfig.getInstance().run {
+            val needForceUpdate = getBoolean(REMOTE_CONFIG_UPDATE_FORCE)
+            val hasUpdate = getBoolean(REMOTE_CONFIG_UPDATE_CHECK)
+            updates.postValue(UpdateApp(hasUpdate, needForceUpdate))
+        }
+        return updates
+    }
 
     fun loggedIn(): LiveData<Result<Class<*>>> = loginLiveData
 
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 8a2f755f..1fa67b73 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -150,4 +150,8 @@
     <string name="about_privacy_policy">Politică de confidențialitate</string>
     <string name="about_send_mail_via">Trimiteți email prin</string>
     <string name="about_app_version">v%1$S build %2$d aplicație dezvoltată de</string>
+
+    <!-- Updates -->
+    <string name="app_update_dialog_title">Actualizare disponibilă</string>
+    <string name="app_update_dialog_message">O nouă versiune a aplicației este disponibilă. Te rugăm să faci update pentru a folosi cele mai recente funcționalități.</string>
  </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b39e68b..6a48e67d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,4 +155,8 @@
     <string name="about_privacy_policy">Privacy policy</string>
     <string name="about_send_mail_via">Send email via</string>
     <string name="about_app_version">v%1$S build %2$d app developed by</string>
+
+    <!-- Updates -->
+    <string name="app_update_dialog_title">App UpdateAvailable</string>
+    <string name="app_update_dialog_message">A new app version is available. Please update the app to use the latest features.</string>
 </resources>