diff --git a/README.md b/README.md
index 7f12f51..9969517 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ for example:
 
 {
   environment.packages = [ pkgs.vim ];
-  system.stateVersion = "20.03";
+  system.stateVersion = "20.09";
 }
 ```
 
@@ -66,7 +66,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key
 
     {
       environment.packages = [ pkgs.vim ];
-      system.stateVersion = "20.03";
+      system.stateVersion = "20.09";
     };
 }
 ```
@@ -80,7 +80,7 @@ To enable `home-manager` you simply need to follow the instructions already prov
 
 1.  Add `home-manager` channel:
     ```
-    nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
+    nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
     nix-channel --update
     ```
 2.  Configure `home-manager`:
diff --git a/default.nix b/default.nix
index 08f656d..7768531 100644
--- a/default.nix
+++ b/default.nix
@@ -25,8 +25,8 @@ rec {
       is present) there is one manual step necessary *before* running the migration script: Remove basic-environment \
       package of 'home.packages' list."
       echo
-      echo "Recommended: change home-manager channel to release-20.03:"
-      echo "  nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager"
+      echo "Recommended: change home-manager channel to release-20.09:"
+      echo "  nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager"
       echo
       echo "Recommended: set nix-on-droid channel to a505862"
       echo "  nix-channel --add https://github.com/t184256/nix-on-droid/archive/pre-module-system.tar.gz nix-on-droid"
@@ -38,8 +38,8 @@ rec {
       echo
       echo "Recommended: update with what you've used before (home-manager switch -or- nix-env -u)"
       echo
-      echo "Required if you've followed the steps above: set nix-on-droid channel to release-20.03"
-      echo "  nix-channel --add https://github.com/t184256/nix-on-droid/archive/release-20.03.tar.gz nix-on-droid"
+      echo "Required if you've followed the steps above: set nix-on-droid channel to release-20.09"
+      echo "  nix-channel --add https://github.com/t184256/nix-on-droid/archive/release-20.09.tar.gz nix-on-droid"
       echo
       echo "Finally,"
       echo "  nix-shell '<nix-on-droid>' -A migration"
@@ -73,44 +73,48 @@ rec {
           echo "Migrating home-manager installation..."
           if [[ -r "$HOME/.config/nixpkgs/home.nix" ]]; then
             ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
-              @@ -27,15 +27,9 @@
+              @@ -30,18 +30,8 @@
                  # Read the changelog before changing this value
-                 system.stateVersion = "20.03";
+                 system.stateVersion = "20.09";
 
               -  # After installing home-manager channel like
-              -  #   nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
+              -  #   nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
               -  #   nix-channel --update
               -  # you can configure home-manager in here like
               -  #home-manager.config =
               -  #  { pkgs, ... }:
               -  #  {
+              -  #    # Read the changelog before changing this value
+              -  #    system.stateVersion = "20.09";
+              -  #
               -  #    # insert home-manager config
               -  #  };
               +  # Home Manager config file
               +  home-manager.config = import ./home.nix;
-              +  home-manager.useUserPackages = true;
                }
 
                # vim: ft=nix
             ''} > /dev/null
           else
             ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
-              @@ -27,15 +27,9 @@
+              @@ -30,18 +30,8 @@
                  # Read the changelog before changing this value
-                 system.stateVersion = "20.03";
+                 system.stateVersion = "20.09";
 
               -  # After installing home-manager channel like
-              -  #   nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
+              -  #   nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
               -  #   nix-channel --update
               -  # you can configure home-manager in here like
               -  #home-manager.config =
               -  #  { pkgs, ... }:
               -  #  {
+              -  #    # Read the changelog before changing this value
+              -  #    system.stateVersion = "20.09";
+              -  #
               -  #    # insert home-manager config
               -  #  };
               +  # Home Manager config file
               +  home-manager.config = import (builtins.getEnv "HOME_MANAGER_CONFIG");
-              +  home-manager.useUserPackages = true;
                }
 
                # vim: ft=nix
diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix
index 0606056..8bc9b71 100644
--- a/modules/build/initial-build.nix
+++ b/modules/build/initial-build.nix
@@ -13,13 +13,13 @@ with lib;
     build.channel = {
       nixpkgs = mkOption {
         type = types.str;
-        default = "https://nixos.org/channels/nixos-20.03";
+        default = "https://nixos.org/channels/nixos-20.09";
         description = "Channel URL for nixpkgs.";
       };
 
       nix-on-droid = mkOption {
         type = types.str;
-        default = "https://github.com/t184256/nix-on-droid/archive/release-20.03.tar.gz";
+        default = "https://github.com/t184256/nix-on-droid/archive/release-20.09.tar.gz";
         description = "Channel URL for nix-on-droid.";
       };
     };
diff --git a/modules/environment/login/nix-on-droid.nix.default b/modules/environment/login/nix-on-droid.nix.default
index e76ccde..c6ab754 100644
--- a/modules/environment/login/nix-on-droid.nix.default
+++ b/modules/environment/login/nix-on-droid.nix.default
@@ -28,15 +28,18 @@
   environment.etcBackupExtension = ".bak";
 
   # Read the changelog before changing this value
-  system.stateVersion = "20.03";
+  system.stateVersion = "20.09";
 
   # After installing home-manager channel like
-  #   nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
+  #   nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
   #   nix-channel --update
   # you can configure home-manager in here like
   #home-manager.config =
   #  { pkgs, ... }:
   #  {
+  #    # Read the changelog before changing this value
+  #    home.stateVersion = "20.09";
+  #
   #    # insert home-manager config
   #  };
 }
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index cde139b..85ed28d 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -87,13 +87,13 @@ in
       assertions = [
         {
           assertion = assertionNixpkgs;
-          message = "You are currently using release-19.09 branch of nixpkgs, you need "
-            + "to update to the release-20.03 channel.";
+          message = "You are currently using release-19.09 branch or older of nixpkgs, you need "
+            + "to update to the release-20.03 channel or newer.";
         }
         {
           assertion = assertionHomeManager;
-          message = "You are currently using release-19.09 branch of home-manager, you need "
-            + "to update to the release-20.03 channel.";
+          message = "You are currently using release-19.09 branch or older of home-manager, you need "
+            + "to update to the release-20.03 channel or newer.";
         }
       ];
     }