diff --git a/langpacks.spec b/langpacks.spec
index b420737..d3ed8b1 100644
--- a/langpacks.spec
+++ b/langpacks.spec
@@ -1,6 +1,10 @@
+%global    defaultsanspkg    google-noto-sans-vf-fonts
+%global    defaultserifpkg   google-noto-serif-vf-fonts
+%global    defaultmonopkg    google-noto-sans-mono-vf-fonts
+
 Name:      langpacks
 Version:   3.0
-Release:   18%{?dist}
+Release:   19%{?dist}
 Summary:   Langpacks meta-package
 
 License:   GPLv2+
@@ -51,7 +55,7 @@ This package provides %{langname} core langpacks packages.\
 %if "%{normcode}" == "%{lowerortho}"\
 %package core-font-%{fontpkgcode}\
 Summary: %{langname} core font meta-package\
-%{-f:Requires: %{-f*}}%{!-f:Requires: dejavu-sans-fonts} \
+%{-f:Requires: %{-f*}}%{!-f:Requires: %{defaultsanspkg}} \
 %{-l:Provides: font(:lang=%{lowerortho})}  \
 %if "%{lowerortho}" != "%{fontpkgcode}"\
 Provides: langpacks-core-font-%{lowerortho} = %{version}-%{release} \
@@ -92,7 +96,8 @@ Recommends: senamirmir-washra-yigezu-bisrat-goffer-fonts
 Recommends: senamirmir-washra-yigezu-bisrat-gothic-fonts
 Recommends: senamirmir-washra-zelan-fonts
 Recommends: xorg-x11-fonts-ethiopic
-Recommends: google-noto-sans-ethiopic-vf-fonts
+Recommends: google-noto-serif-ethiopic-vf-fonts
+Recommends: sil-abyssinica-fonts
 %endif
 
 %description am
@@ -101,12 +106,12 @@ This package provides Amharic langpacks meta-package.
 %files am
 %{_datadir}/metainfo/org.fedoraproject.LangPack-am.metainfo.xml
 
-%langcore_pkg -l am -n Amharic -f sil-abyssinica-fonts
+%langcore_pkg -l am -n Amharic -f google-noto-sans-ethiopic-vf-fonts
 
 %package ar
 Summary: Arabic langpacks meta-package
 Requires: %{name}-core-ar
-Recommends: dejavu-sans-mono-fonts
+Recommends: %{defaultmonopkg}
 Recommends: paktype-naqsh-fonts
 Recommends: paktype-tehreer-fonts
 %if 0%{?fedora}
@@ -133,7 +138,7 @@ This package provides Arabic langpacks meta-package.
 %files ar
 %{_datadir}/metainfo/org.fedoraproject.LangPack-ar.metainfo.xml
 
-%langcore_pkg -l ar -n Arabic
+%langcore_pkg -l ar -n Arabic -f google-noto-sans-arabic-vf-fonts
 
 %package as
 Summary: Assamese langpacks meta-package
@@ -154,7 +159,7 @@ This package provides Assamese langpacks meta-package.
 %package ast
 Summary: Asturian langpacks meta-package
 Requires: %{name}-core-ast
-Recommends: dejavu-sans-fonts
+Recommends: %{defaultsanspkg}
 
 %description ast
 This package provides Asturian langpacks meta-package.
@@ -255,6 +260,18 @@ This package provides Catalan langpacks meta-package.
 
 %langcore_pkg -l ca -n Catalan
 
+%package chr
+Summary: Cherokee langpacks meta-package
+Requires: %{name}-core-chr
+
+%description chr
+This package provides Cherokee langpacks meta-package.
+
+%files chr
+%{_datadir}/metainfo/org.fedoraproject.LangPack-chr.metainfo.xml
+
+%langcore_pkg -l chr -n Cherokee -f google-noto-sans-cherokee-vf-fonts
+
 %package cs
 Summary: Czech langpacks meta-package
 Requires: %{name}-core-cs
@@ -303,6 +320,18 @@ This package provides German langpacks meta-package.
 
 %langcore_pkg -l de -n German
 
+%package dv
+Summary: Divehi langpacks meta-package
+Requires: %{name}-core-dv
+
+%description dv
+This package provides Divehi langpacks meta-package.
+
+%files dv
+%{_datadir}/metainfo/org.fedoraproject.LangPack-dv.metainfo.xml
+
+%langcore_pkg -l dv -n Divehi -f google-noto-sans-thaana-vf-fonts
+
 %package dz
 Summary: Bhutanese langpacks meta-package
 Requires: %{name}-core-dz
@@ -494,9 +523,7 @@ Recommends: culmus-simple-clm-fonts
 Recommends: culmus-stamashkenaz-clm-fonts
 Recommends: culmus-stamsefarad-clm-fonts
 Recommends: culmus-yehuda-clm-fonts
-%if 0%{?fedora}
-Recommends: google-noto-sans-hebrew-vf-fonts
-%endif
+Recommends: google-noto-rashi-hebrew-vf-fonts
 
 %description he
 This package provides Hebrew langpacks meta-package.
@@ -504,7 +531,7 @@ This package provides Hebrew langpacks meta-package.
 %files he
 %{_datadir}/metainfo/org.fedoraproject.LangPack-he.metainfo.xml
 
-%langcore_pkg -l he -n Hebrew
+%langcore_pkg -l he -n Hebrew -f google-noto-sans-hebrew-vf-fonts
 
 %package hi
 Summary: Hindi langpacks meta-package
@@ -547,6 +574,19 @@ This package provides Hungarian langpacks meta-package.
 
 %langcore_pkg -l hu -n Hungarian
 
+%package hy
+Summary: Armenian langpacks meta-package
+Requires: %{name}-core-hy
+Recommends: google-noto-serif-armenian-vf-fonts
+
+%description hy
+This package provides Armenian langpacks meta-package.
+
+%files hy
+%{_datadir}/metainfo/org.fedoraproject.LangPack-hy.metainfo.xml
+
+%langcore_pkg -l hy -n Armenian -f google-noto-sans-armenian-vf-fonts
+
 %package ia
 Summary: Interlingua langpacks meta-package
 Requires: %{name}-core-ia
@@ -595,6 +635,18 @@ This package provides Italian langpacks meta-package.
 
 %langcore_pkg -l it -n Italian
 
+%package iu
+Summary: Inuktitut langpacks meta-package
+Requires: %{name}-core-iu
+
+%description iu
+This package provides Inuktitut langpacks meta-package.
+
+%files iu
+%{_datadir}/metainfo/org.fedoraproject.LangPack-iu.metainfo.xml
+
+%langcore_pkg -l iu -n Inuktitut -f google-noto-sans-canadian-aboriginal-vf-fonts
+
 %package ja
 Summary: Japanese langpacks meta-package
 Requires: %{name}-core-ja
@@ -618,11 +670,10 @@ Requires: %{name}-core-ka
 Recommends: bpg-chveulebrivi-fonts
 Recommends: bpg-courier-fonts
 Recommends: bpg-glaho-fonts
-Recommends: google-noto-sans-georgian-vf-fonts
 Recommends: google-noto-serif-georgian-vf-fonts
 %endif
-Recommends: dejavu-sans-mono-fonts
-Recommends: dejavu-serif-fonts
+Recommends: %{defaultmonopkg}
+Recommends: %{defaultserifpkg}
 
 %description ka
 This package provides Georgian langpacks meta-package.
@@ -630,7 +681,7 @@ This package provides Georgian langpacks meta-package.
 %files ka
 %{_datadir}/metainfo/org.fedoraproject.LangPack-ka.metainfo.xml
 
-%langcore_pkg -l ka -n Georgian
+%langcore_pkg -l ka -n Georgian -f google-noto-sans-georgian-vf-fonts
 
 %package kk
 Summary: Kazakh langpacks meta-package
@@ -712,6 +763,19 @@ This package provides Kurdish langpacks meta-package.
 
 %langcore_pkg -l ku -n Kurdish
 
+%package lo
+Summary: Lao langpacks meta-package
+Requires: %{name}-core-lo
+Requires: google-noto-serif-lao-vf-fonts
+
+%description lo
+This package provides Lao langpacks meta-package.
+
+%files lo
+%{_datadir}/metainfo/org.fedoraproject.LangPack-lo.metainfo.xml
+
+%langcore_pkg -l lo -n Lao -f google-noto-sans-lao-vf-fonts
+
 %package lt
 Summary: Lithuanian langpacks meta-package
 Requires: %{name}-core-lt
@@ -930,6 +994,7 @@ Requires: %{name}-core-pa
 Recommends: saab-fonts
 %if 0%{?fedora}
 Recommends: lohit-gurmukhi-fonts
+Recommends: google-noto-serif-gurmukhi-vf-fonts
 %endif
 
 %description pa
@@ -1004,6 +1069,7 @@ This package provides Russian langpacks meta-package.
 %package si
 Summary: Sinhala langpacks meta-package
 Requires: %{name}-core-si
+Recommends: google-noto-serif-sinhala-vf-fonts
 
 %description si
 This package provides Sinhala langpacks meta-package.
@@ -1200,8 +1266,8 @@ This package provides Ukrainian langpacks meta-package.
 %package ur
 Summary: Urdu langpacks meta-package
 Requires: %{name}-core-ur
-Recommends: dejavu-sans-fonts
-Recommends: dejavu-sans-mono-fonts
+Recommends: %{defaultsanspkg}
+Recommends: %{defaultmonopkg}
 %if 0%{?fedora}
 Recommends: nafees-nastaleeq-fonts
 Recommends: nafees-web-naskh-fonts
@@ -1349,6 +1415,11 @@ DESTDIR=%{buildroot} appstream-util split-appstream %{SOURCE1}
 DESTDIR=%{buildroot} appstream-util split-appstream %{SOURCE2}
 
 %changelog
+* Fri Jan 21 2022 Akira TAGOH <tagoh@redhat.com> - 3.0-19
+- Replace dejavu to google-noto.
+- Add more sub-packages to make sure the upgrade-path for Noto Default:
+  Cherokee, Divehi, Armenian, Inuktitut, Lao
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/org.fedoraproject.LangPacks-Core-Font.xml b/org.fedoraproject.LangPacks-Core-Font.xml
index f5f7dae..8503f87 100644
--- a/org.fedoraproject.LangPacks-Core-Font.xml
+++ b/org.fedoraproject.LangPacks-Core-Font.xml
@@ -133,6 +133,17 @@
       </p>
     </description>
   </component>
+  <component type="font">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-Font-chr</id>
+    <name>Cherokee</name>
+    <summary>Localization Font support for Cherokee</summary>
+    <description>
+      <p>
+        Core font package to install default font.
+      </p>
+    </description>
+  </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-Font-cs</id>
@@ -177,6 +188,17 @@
       </p>
     </description>
   </component>
+  <component type="font">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-Font-dv</id>
+    <name>Divehi</name>
+    <summary>Localization Font support for Divehi</summary>
+    <description>
+      <p>
+        Core font package to install default font.
+      </p>
+    </description>
+  </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-Font-dz</id>
@@ -364,6 +386,17 @@
       </p>
     </description>
   </component>
+  <component type="font">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-Font-hy</id>
+    <name>Armenian</name>
+    <summary>Localization Font support for Armenian</summary>
+    <description>
+      <p>
+        Core font package to install default font.
+      </p>
+    </description>
+  </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-Font-ia</id>
@@ -408,6 +441,17 @@
       </p>
     </description>
   </component>
+  <component type="font">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-Font-iu</id>
+    <name>Inuktitut</name>
+    <summary>Localization Font support for Inuktitut</summary>
+    <description>
+      <p>
+        Core font package to install default font.
+      </p>
+    </description>
+  </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-Font-ja</id>
@@ -485,6 +529,17 @@
       </p>
     </description>
   </component>
+  <component type="font">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-Font-lo</id>
+    <name>Lao</name>
+    <summary>Localization Font support for Lao</summary>
+    <description>
+      <p>
+        Core font package to install default font.
+      </p>
+    </description>
+  </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-Font-lt</id>
diff --git a/org.fedoraproject.LangPacks-Core.xml b/org.fedoraproject.LangPacks-Core.xml
index 8ed009f..0b70c67 100644
--- a/org.fedoraproject.LangPacks-Core.xml
+++ b/org.fedoraproject.LangPacks-Core.xml
@@ -133,6 +133,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-chr</id>
+    <name>Cherokee</name>
+    <summary>Core Localization support for Cherokee</summary>
+    <description>
+      <p>
+        Core Meta-package to install default font, glibc locale and input-method if available.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-cs</id>
@@ -177,6 +188,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-dv</id>
+    <name>Divehi</name>
+    <summary>Core Localization support for Divehi</summary>
+    <description>
+      <p>
+        Core Meta-package to install default font, glibc locale and input-method if available.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-dz</id>
@@ -375,6 +397,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-hy</id>
+    <name>Armenian</name>
+    <summary>Core Localization support for Armenian</summary>
+    <description>
+      <p>
+        Core Meta-package to install default font, glibc locale and input-method if available.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-ia</id>
@@ -419,6 +452,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-iu</id>
+    <name>Inuktitut</name>
+    <summary>Core Localization support for Inuktitut</summary>
+    <description>
+      <p>
+        Core Meta-package to install default font, glibc locale and input-method if available.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-ja</id>
@@ -496,6 +540,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-Core-lo</id>
+    <name>Lao</name>
+    <summary>Core Localization support for Lao</summary>
+    <description>
+      <p>
+        Core Meta-package to install default font, glibc locale and input-method if available.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-Core-lt</id>
diff --git a/org.fedoraproject.LangPacks.xml b/org.fedoraproject.LangPacks.xml
index 8223152..41ce00a 100644
--- a/org.fedoraproject.LangPacks.xml
+++ b/org.fedoraproject.LangPacks.xml
@@ -133,6 +133,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-chr</id>
+    <name>Cherokee</name>
+    <summary>Localization support for Cherokee</summary>
+    <description>
+      <p>
+        Meta-package to install available langpacks for the language available for the installed packages.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-cs</id>
@@ -177,6 +188,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-dv</id>
+    <name>Divehi</name>
+    <summary>Localization support for Divehi</summary>
+    <description>
+      <p>
+        Meta-package to install available langpacks for the language available for the installed packages.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-dz</id>
@@ -375,6 +397,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-hy</id>
+    <name>Armenian</name>
+    <summary>Localization support for Armenian</summary>
+    <description>
+      <p>
+        Meta-package to install available langpacks for the language available for the installed packages.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-ia</id>
@@ -419,6 +452,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-iu</id>
+    <name>Inuktitut</name>
+    <summary>Localization support for Inuktitut</summary>
+    <description>
+      <p>
+        Meta-package to install available langpacks for the language available for the installed packages.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-ja</id>
@@ -496,6 +540,17 @@
       </p>
     </description>
   </component>
+  <component type="localization">
+    <metadata_license>CC0-1.0</metadata_license>
+    <id>org.fedoraproject.LangPack-lo</id>
+    <name>Lao</name>
+    <summary>Localization support for Lao</summary>
+    <description>
+      <p>
+        Meta-package to install available langpacks for the language available for the installed packages.
+      </p>
+    </description>
+  </component>
   <component type="localization">
     <metadata_license>CC0-1.0</metadata_license>
     <id>org.fedoraproject.LangPack-lt</id>