diff --git a/packages/analytics/blueprints/@projectcaluma/ember-analytics/index.js b/packages/analytics/blueprints/@projectcaluma/ember-analytics/index.js
index d27f4c71f..10fd47b58 100644
--- a/packages/analytics/blueprints/@projectcaluma/ember-analytics/index.js
+++ b/packages/analytics/blueprints/@projectcaluma/ember-analytics/index.js
@@ -4,12 +4,22 @@ module.exports = {
   normalizeEntityName() {},
 
   afterInstall() {
+    /**
+     * Automatically install all ember addons that expose helpers / components
+     * used in templates of the addon itself. Other dependencies that are only
+     * used in JS code don't need to be installed in the host app and therefore
+     * don't have to be included here.
+     */
     return this.addAddonsToProject({
       packages: [
         { name: "@projectcaluma/ember-core" },
-        { name: "ember-engines" },
+        { name: "ember-changeset" },
         { name: "ember-composable-helpers" },
+        { name: "ember-concurrency" },
+        { name: "ember-engines" },
+        { name: "ember-sortable" },
         { name: "ember-power-select" },
+        { name: "ember-validated-form" },
       ],
     });
   },
diff --git a/packages/core/blueprints/@projectcaluma/ember-core/index.js b/packages/core/blueprints/@projectcaluma/ember-core/index.js
index 8c34ae3cb..8a5f95611 100644
--- a/packages/core/blueprints/@projectcaluma/ember-core/index.js
+++ b/packages/core/blueprints/@projectcaluma/ember-core/index.js
@@ -4,6 +4,12 @@ module.exports = {
   normalizeEntityName() {},
 
   afterInstall() {
+    /**
+     * Automatically install all ember addons that expose helpers / components
+     * used in templates of the addon itself. Other dependencies that are only
+     * used in JS code don't need to be installed in the host app and therefore
+     * don't have to be included here.
+     */
     return this.addAddonsToProject({
       packages: [
         { name: "ember-apollo-client" },
diff --git a/packages/distribution/blueprints/@projectcaluma/ember-distribution/index.js b/packages/distribution/blueprints/@projectcaluma/ember-distribution/index.js
new file mode 100644
index 000000000..f6e951b7a
--- /dev/null
+++ b/packages/distribution/blueprints/@projectcaluma/ember-distribution/index.js
@@ -0,0 +1,25 @@
+"use strict";
+
+module.exports = {
+  normalizeEntityName() {},
+
+  afterInstall() {
+    /**
+     * Automatically install all ember addons that expose helpers / components
+     * used in templates of the addon itself. Other dependencies that are only
+     * used in JS code don't need to be installed in the host app and therefore
+     * don't have to be included here.
+     */
+    return this.addAddonsToProject({
+      packages: [
+        { name: "@ember/legacy-built-in-components" },
+        { name: "@projectcaluma/ember-core" },
+        { name: "@projectcaluma/ember-form" },
+        { name: "@projectcaluma/ember-workflow" },
+        { name: "ember-concurrency" },
+        { name: "ember-engines" },
+        { name: "ember-svg-jar" },
+      ],
+    });
+  },
+};
diff --git a/packages/form-builder/blueprints/@projectcaluma/ember-form-builder/index.js b/packages/form-builder/blueprints/@projectcaluma/ember-form-builder/index.js
index af4ad8a02..5266e4fdd 100644
--- a/packages/form-builder/blueprints/@projectcaluma/ember-form-builder/index.js
+++ b/packages/form-builder/blueprints/@projectcaluma/ember-form-builder/index.js
@@ -4,14 +4,24 @@ module.exports = {
   normalizeEntityName() {},
 
   afterInstall() {
+    /**
+     * Automatically install all ember addons that expose helpers / components
+     * used in templates of the addon itself. Other dependencies that are only
+     * used in JS code don't need to be installed in the host app and therefore
+     * don't have to be included here.
+     */
     return this.addAddonsToProject({
       packages: [
+        { name: "@ember/legacy-built-in-components" },
         { name: "@projectcaluma/ember-core" },
         { name: "@projectcaluma/ember-form" },
+        { name: "ember-changeset" },
+        { name: "ember-composable-helpers" },
         { name: "ember-engines" },
-        { name: "ember-math-helpers" },
         { name: "ember-flatpickr" },
+        { name: "ember-math-helpers" },
         { name: "ember-power-select" },
+        { name: "ember-validated-form" },
       ],
     });
   },
diff --git a/packages/form/blueprints/@projectcaluma/ember-form/index.js b/packages/form/blueprints/@projectcaluma/ember-form/index.js
index f38fe7551..46288ba9c 100644
--- a/packages/form/blueprints/@projectcaluma/ember-form/index.js
+++ b/packages/form/blueprints/@projectcaluma/ember-form/index.js
@@ -4,15 +4,23 @@ module.exports = {
   normalizeEntityName() {},
 
   afterInstall() {
+    /**
+     * Automatically install all ember addons that expose helpers / components
+     * used in templates of the addon itself. Other dependencies that are only
+     * used in JS code don't need to be installed in the host app and therefore
+     * don't have to be included here.
+     */
     return this.addAddonsToProject({
       packages: [
         { name: "@projectcaluma/ember-core" },
+        { name: "ember-autoresize-modifier" },
         { name: "ember-cli-showdown" },
         { name: "ember-composable-helpers" },
-        { name: "ember-math-helpers" },
+        { name: "ember-concurrency" },
         { name: "ember-flatpickr" },
+        { name: "ember-in-viewport" },
+        { name: "ember-math-helpers" },
         { name: "ember-power-select" },
-        { name: "ember-autoresize-modifier" },
       ],
     });
   },
diff --git a/packages/testing/blueprints/@projectcaluma/ember-testing/index.js b/packages/testing/blueprints/@projectcaluma/ember-testing/index.js
index 188d87c58..6b6bbd51a 100644
--- a/packages/testing/blueprints/@projectcaluma/ember-testing/index.js
+++ b/packages/testing/blueprints/@projectcaluma/ember-testing/index.js
@@ -4,6 +4,12 @@ module.exports = {
   normalizeEntityName() {},
 
   afterInstall() {
+    /**
+     * Automatically install all ember addons that expose helpers / components
+     * used in templates of the addon itself. Other dependencies that are only
+     * used in JS code don't need to be installed in the host app and therefore
+     * don't have to be included here.
+     */
     return this.addAddonsToProject({
       packages: [{ name: "ember-cli-mirage" }],
     }).then(() => this.addPackagesToProject([{ name: "faker" }]));
diff --git a/packages/workflow/blueprints/@projectcaluma/ember-workflow/index.js b/packages/workflow/blueprints/@projectcaluma/ember-workflow/index.js
index c52fcc432..8638bed99 100644
--- a/packages/workflow/blueprints/@projectcaluma/ember-workflow/index.js
+++ b/packages/workflow/blueprints/@projectcaluma/ember-workflow/index.js
@@ -4,10 +4,17 @@ module.exports = {
   normalizeEntityName() {},
 
   afterInstall() {
+    /**
+     * Automatically install all ember addons that expose helpers / components
+     * used in templates of the addon itself. Other dependencies that are only
+     * used in JS code don't need to be installed in the host app and therefore
+     * don't have to be included here.
+     */
     return this.addAddonsToProject({
       packages: [
         { name: "@projectcaluma/ember-core" },
         { name: "ember-composable-helpers" },
+        { name: "ember-concurrency" },
         { name: "ember-truth-helpers" },
       ],
     });