3 files changed, 4 insertions, 31 deletions
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
index 8e645445a..e01c315d6 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-flutter.bb
@@ -16,24 +16,10 @@ RDEPENDS:${PN} += "\
     packagegroup-agl-demo \
     "
 
-AGL_APPS = " \
-    flutter-dashboard \
-    flutter-hvac \
-    ondemandnavi \
-    settings \
-    mediaplayer \
-    messaging \
-    phone \
-    radio \
-    "
-
 RDEPENDS:${PN}:append = " \
     agl-compositor \
     flutter-auto \
-    flutter-homescreen \
-    qtquickcontrols2-agl \
-    qtquickcontrols2-agl-style \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip mpc' , '', d)} \
-    ${AGL_APPS} \
+    agl-flutter-env \
+    applaunchd-template-agl-app-flutter \
     psplash-portrait-config \
     "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 6095f7103..cf8268d44 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -16,26 +16,11 @@ RDEPENDS:${PN} += "\
     packagegroup-agl-demo \
     "
 
-AGL_APPS = " \
-    dashboard \
-    hvac \
-    ondemandnavi \
-    settings \
-    mediaplayer \
-    messaging \
-    phone \
-    radio \
-    window-management-client-grpc \
-    camera-gstreamer \
-    "
-
 RDEPENDS:${PN}:append = " \
     weston-ini-conf-no-activate \
     homescreen \
     launcher \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'unzip mpc' , '', d)} \
-    ${AGL_APPS} \
     psplash-portrait-config \
     "
diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
index b76942642..e4a4a9d0f 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb
@@ -8,6 +8,8 @@ PACKAGES = "\
     "
 
 RDEPENDS:${PN} += "\
+    applaunchd \
+    applaunchd-template-agl-app \
     agl-service-hvac \
     agl-service-audiomixer \
     agl-service-radio \