diff --git a/templates/app/dna/dnas/{{dna_name}}/dna.nix.hbs b/templates/app/dna/dnas/{{dna_name}}/dna.nix.hbs
index 5b51c0f..6e91be2 100644
--- a/templates/app/dna/dnas/{{dna_name}}/dna.nix.hbs
+++ b/templates/app/dna/dnas/{{dna_name}}/dna.nix.hbs
@@ -19,8 +19,7 @@
     , system
     , ...
     }: {
-  	  packages.{{dna_name}} = inputs.hc-infra.outputs.lib.dna {
-        inherit system;
+  	  packages.{{dna_name}} = inputs.hc-infra.outputs.builders.${system}.dna {
         dnaManifest = ./workdir/dna.yaml;
         zomes = {
           # Include here the zome packages for this DNA, e.g.:
diff --git a/templates/app/web-app/happ.nix.hbs b/templates/app/web-app/happ.nix.hbs
index 3d7e391..70399af 100644
--- a/templates/app/web-app/happ.nix.hbs
+++ b/templates/app/web-app/happ.nix.hbs
@@ -14,8 +14,7 @@
     , system
     , ...
     }: {
-  	  packages.{{app_name}} = inputs.hc-infra.outputs.lib.happ {
-        inherit system;
+  	  packages.{{app_name}} = inputs.hc-infra.outputs.builders.${system}.happ {
         happManifest = ./workdir/happ.yaml;
         dnas = {
           # Include here the DNA packages for this hApp, e.g.: