diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ec2279a1cd21bf8df575059425288951aa549d1..e9a10b5301a2ad2b39f8ee1df7e0edb0eebe46c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,20 @@
 stages:
   - update-from-upstream
+  - build
+  - sign
 
 include:
   - project: 'e/priv/os/build'
     ref: master
     file: '/templates/.gitlab-ci-update-from-upstream.yml'
+  - project: 'e/priv/os/build'
+    ref: master
+    file: '/templates/.gitlab-ci-build-module.yml'
+
+build Updater:
+  extends: .build-module
+  variables:
+    BRANCH_NAME: "v1-nougat"
+    MODULE_NAME: "Updater"
+    MODULE_PATH: "packages/apps/Updater"
+    PRIV_APP: "true"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33b0a49365ed375d25d95f64dcd79e42b77ce773..0f8121d167d3173c6c93804a2c01bc352a166108 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -137,5 +137,5 @@
 
     <string name="blocked_update_dialog_title">Update blocked</string>
     <string name="blocked_update_dialog_message">This update cannot be installed using the updater app.  Please read <xliff:g id="info_url">%1$s</xliff:g> for more information.</string>
-    <string name="blocked_update_info_url" translatable="false">http://wiki.lineageos.org/upgrading.html</string>
+    <string name="blocked_update_info_url" translatable="false">https://doc.e.foundation/devices/<xliff:g id="device_name">%1$s</xliff:g>/upgrade</string>
 </resources>
diff --git a/src/org/lineageos/updater/UpdatesDbHelper.java b/src/org/lineageos/updater/UpdatesDbHelper.java
index 01e6fc2674b66215fb0a461ae5700b17410b59d6..cd9fda4538fdd5474e118d9cb5ff6ff46daabcc6 100644
--- a/src/org/lineageos/updater/UpdatesDbHelper.java
+++ b/src/org/lineageos/updater/UpdatesDbHelper.java
@@ -30,7 +30,7 @@ import java.util.List;
 
 public class UpdatesDbHelper extends SQLiteOpenHelper {
 
-    public static final int DATABASE_VERSION = 2;
+    public static final int DATABASE_VERSION = 3;
     public static final String DATABASE_NAME = "updates.db";
 
     public static class UpdateEntry implements BaseColumns {
@@ -42,6 +42,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
         public static final String COLUMN_NAME_TYPE = "type";
         public static final String COLUMN_NAME_VERSION = "version";
         public static final String COLUMN_NAME_DISPLAY_VERSION = "display_version";
+        public static final String COLUMN_NAME_ANDROID_VERSION = "android_version";
         public static final String COLUMN_NAME_SIZE = "size";
     }
 
@@ -55,6 +56,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
                     UpdateEntry.COLUMN_NAME_TYPE + " TEXT," +
                     UpdateEntry.COLUMN_NAME_VERSION + " TEXT," +
                     UpdateEntry.COLUMN_NAME_DISPLAY_VERSION + " TEXT," +
+                    UpdateEntry.COLUMN_NAME_ANDROID_VERSION + " TEXT," +
                     UpdateEntry.COLUMN_NAME_SIZE + " INTEGER)";
 
     private static final String SQL_DELETE_ENTRIES =
@@ -87,6 +89,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
         values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());
         values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion());
         values.put(UpdateEntry.COLUMN_NAME_DISPLAY_VERSION, update.getDisplayVersion());
+        values.put(UpdateEntry.COLUMN_NAME_ANDROID_VERSION, update.getAndroidVersion());
         values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());
         return db.insert(UpdateEntry.TABLE_NAME, null, values);
     }
@@ -101,6 +104,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
         values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());
         values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion());
         values.put(UpdateEntry.COLUMN_NAME_DISPLAY_VERSION, update.getDisplayVersion());
+        values.put(UpdateEntry.COLUMN_NAME_ANDROID_VERSION, update.getAndroidVersion());
         values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());
         return db.insertWithOnConflict(UpdateEntry.TABLE_NAME, null, values, conflictAlgorithm);
     }
@@ -166,6 +170,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
                 UpdateEntry.COLUMN_NAME_TYPE,
                 UpdateEntry.COLUMN_NAME_VERSION,
                 UpdateEntry.COLUMN_NAME_DISPLAY_VERSION,
+                UpdateEntry.COLUMN_NAME_ANDROID_VERSION,
                 UpdateEntry.COLUMN_NAME_STATUS,
                 UpdateEntry.COLUMN_NAME_SIZE,
         };
@@ -189,6 +194,8 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
                 update.setVersion(cursor.getString(index));
                 index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_DISPLAY_VERSION);
                 update.setDisplayVersion(cursor.getString(index));
+                index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_ANDROID_VERSION);
+                update.setAndroidVersion(cursor.getString(index));
                 index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_STATUS);
                 update.setPersistentStatus(cursor.getInt(index));
                 index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_SIZE);
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index dc5b57edf0e897afe72207d345aa59aa3e8aaa95..a5bd463b681a30f9190b2d3efade06986393d4c1 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -253,7 +253,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
           buildVersion = mActivity.getString(R.string.list_build_version,
                   update.getVersion());
         }
-        
+
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -537,7 +537,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
     private void showInfoDialog() {
         String messageString = String.format(StringGenerator.getCurrentLocale(mActivity),
                 mActivity.getString(R.string.blocked_update_dialog_message),
-                mActivity.getString(R.string.blocked_update_info_url));
+                Utils.getUpgradeBlockedURL(mActivity));
         SpannableString message = new SpannableString(messageString);
         Linkify.addLinks(message, Linkify.WEB_URLS);
         AlertDialog dialog = new AlertDialog.Builder(mActivity)
diff --git a/src/org/lineageos/updater/misc/BuildInfoUtils.java b/src/org/lineageos/updater/misc/BuildInfoUtils.java
index 6a647faf2517460c8cd0084a87e285dfddb68b1d..37718c4e1091257b252db9d9c65c2f4b919a6303 100644
--- a/src/org/lineageos/updater/misc/BuildInfoUtils.java
+++ b/src/org/lineageos/updater/misc/BuildInfoUtils.java
@@ -33,4 +33,8 @@ public final class BuildInfoUtils {
     public static String getDisplayVersion() {
         return SystemProperties.get(Constants.PROP_BUILD_DISPLAY_VERSION);
     }
+
+    public static String getAndroidVersion() {
+        return SystemProperties.get(Constants.PROP_BUILD_ANDROID_VERSION);
+    }
 }
diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
index 1e92f91b134976866e94675917687429b6fd86d0..ab60d8d6ecdfb868c755223896d10a2f77a10b77 100644
--- a/src/org/lineageos/updater/misc/Constants.java
+++ b/src/org/lineageos/updater/misc/Constants.java
@@ -35,6 +35,7 @@ public final class Constants {
     public static final String PROP_BUILD_DATE = "ro.build.date.utc";
     public static final String PROP_BUILD_VERSION = "ro.cm.build.version";
     public static final String PROP_BUILD_DISPLAY_VERSION = "ro.cm.display.version";
+    public static final String PROP_BUILD_ANDROID_VERSION = "ro.build.version.release";
     public static final String PROP_BUILD_VERSION_INCREMENTAL = "ro.build.version.incremental";
     public static final String PROP_DEVICE = "ro.cm.device";
     public static final String PROP_NEXT_DEVICE = "ro.updater.next_device";
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 44dbecfd0e7132daa65c7a0938e1d9af3288c780..439c9d877e6b7d23bcb937c8298fa01d17359b72 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -91,6 +91,12 @@ public class Utils {
         update.setDownloadUrl(object.getString("url"));
         update.setVersion(object.getString("version"));
         update.setDisplayVersion(object.getString("display_version"));
+        update.setAndroidVersion(object.getString("android_version"));
+
+        Log.d(TAG, object.toString());
+        Log.d(TAG, object.getString("android_version"));
+        Log.d(TAG, update.getAndroidVersion());
+
         return update;
     }
 
@@ -108,8 +114,15 @@ public class Utils {
     }
 
     public static boolean canInstall(UpdateBaseInfo update) {
+
+
+        Log.d(TAG, "System Android version: "+SystemProperties.get(Constants.PROP_BUILD_ANDROID_VERSION));
+        Log.d(TAG, "Update Android version: "+update.getAndroidVersion());
+
+
         return (SystemProperties.getBoolean(Constants.PROP_UPDATER_ALLOW_DOWNGRADING, false) ||
-                update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0));
+                update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0) ||
+                update.getAndroidVersion().equals(SystemProperties.get(Constants.PROP_BUILD_ANDROID_VERSION)));
     }
 
     public static List<UpdateInfo> parseJson(File file, boolean compatibleOnly)
@@ -160,6 +173,13 @@ public class Utils {
                 .replace("{incr}", incrementalVersion);
     }
 
+    public static String getUpgradeBlockedURL(Context context) {
+        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
+                SystemProperties.get(Constants.PROP_DEVICE));
+        return context.getString(R.string.blocked_update_info_url, device);
+    }
+
+
     public static String getChangelogURL(Context context) {
         String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
                 SystemProperties.get(Constants.PROP_DEVICE));
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index cfa2027ed82bec55334483be351c1447e195a00b..f31aafe94e43274bac4ebc0cb989a041a2ce793a 100644
--- a/src/org/lineageos/updater/model/UpdateBase.java
+++ b/src/org/lineageos/updater/model/UpdateBase.java
@@ -24,6 +24,7 @@ public class UpdateBase implements UpdateBaseInfo {
     private String mType;
     private String mVersion;
     private String mDisplayVersion;
+    private String mAndroidVersion;
     private long mFileSize;
 
     public UpdateBase() {
@@ -37,6 +38,7 @@ public class UpdateBase implements UpdateBaseInfo {
         mType = update.getType();
         mVersion = update.getVersion();
         mDisplayVersion = update.getDisplayVersion();
+        mAndroidVersion = update.getAndroidVersion();
         mFileSize = update.getFileSize();
     }
 
@@ -94,6 +96,15 @@ public class UpdateBase implements UpdateBaseInfo {
         mDisplayVersion = displayVersion;
     }
 
+    @Override
+    public String getAndroidVersion() {
+        return mAndroidVersion;
+    }
+
+    public void setAndroidVersion(String androidVersion) {
+        mAndroidVersion = androidVersion;
+    }
+
     @Override
     public String getDownloadUrl() {
         return mDownloadUrl;
diff --git a/src/org/lineageos/updater/model/UpdateBaseInfo.java b/src/org/lineageos/updater/model/UpdateBaseInfo.java
index 2921e96fc57c93c510348eb301abdc961ca3bae9..a1bfb022bd181756eacbf0865e1c5d525327e05e 100644
--- a/src/org/lineageos/updater/model/UpdateBaseInfo.java
+++ b/src/org/lineageos/updater/model/UpdateBaseInfo.java
@@ -28,6 +28,8 @@ public interface UpdateBaseInfo {
 
     String getDisplayVersion();
 
+    String getAndroidVersion();
+
     String getDownloadUrl();
 
     long getFileSize();