diff --git a/plugins/buildpacks/subcommands.go b/plugins/buildpacks/subcommands.go
index 61ae6c704..525e790ef 100644
--- a/plugins/buildpacks/subcommands.go
+++ b/plugins/buildpacks/subcommands.go
@@ -153,7 +153,7 @@ func CommandSetProperty(appName string, property string, value string) error {
 			return common.PlugnTrigger("post-stack-set", []string{appName, value}...)
 		}
 
-		apps, err := common.DokkuApps()
+		apps, err := apps.DokkuApps()
 		if err != nil {
 			return err
 		}
diff --git a/plugins/domains/install b/plugins/domains/install
index 3a220e1a5..05e19a657 100755
--- a/plugins/domains/install
+++ b/plugins/domains/install
@@ -8,9 +8,8 @@ trigger-domains-install() {
   declare trigger="install"
 
   shopt -s nullglob
-  for app in $DOKKU_ROOT/*/CONTAINER; do
-    APP=$(basename "$(dirname "$app")")
-    domains_setup "$APP"
+  for app in $(dokku_apps); do
+    domains_setup "$app"
   done
 }