diff --git a/plugins/common/functions b/plugins/common/functions
index fca53a7d4..d6133bd2f 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -850,7 +850,6 @@ internal_get_app_urls() {
   source "$PLUGIN_AVAILABLE_PATH/certs/functions"
   source "$PLUGIN_AVAILABLE_PATH/config/functions"
   source "$PLUGIN_AVAILABLE_PATH/domains/functions"
-  source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
   local APP="$2"
   local RAW_TCP_PORTS="$(get_app_raw_tcp_ports "$APP")"
diff --git a/plugins/network/triggers.go b/plugins/network/triggers.go
index b9821dc8d..cdb3d7164 100644
--- a/plugins/network/triggers.go
+++ b/plugins/network/triggers.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/dokku/dokku/plugins/common"
 	"github.com/dokku/dokku/plugins/config"
-	"github.com/dokku/dokku/plugins/proxy"
 )
 
 // TriggerInstall runs the install step for the network plugin
@@ -25,7 +24,7 @@ func TriggerInstall() {
 		if common.PropertyExists("network", appName, "bind-all-interfaces") {
 			continue
 		}
-		if proxy.IsAppProxyEnabled(appName) {
+		if err := common.PlugnTrigger("proxy-is-enabled", []string{appName}...); err != nil {
 			common.LogVerboseQuiet("Setting network property 'bind-all-interfaces' to false")
 			if err := common.PropertyWrite("network", appName, "bind-all-interfaces", "false"); err != nil {
 				common.LogWarn(err.Error())
diff --git a/plugins/nginx-vhosts/core-post-deploy b/plugins/nginx-vhosts/core-post-deploy
index a716959fe..57dad0f23 100755
--- a/plugins/nginx-vhosts/core-post-deploy
+++ b/plugins/nginx-vhosts/core-post-deploy
@@ -4,7 +4,6 @@ set -eo pipefail
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 trigger-nginx-vhosts-core-post-deploy() {
   declare desc="nginx-vhosts core-post-deploy plugin trigger"
diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions
index ba1514dc2..98d83b280 100755
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -5,7 +5,6 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/certs/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/internal-functions"
 
diff --git a/plugins/nginx-vhosts/post-app-rename-setup b/plugins/nginx-vhosts/post-app-rename-setup
index 598b4fbd7..35f93e675 100755
--- a/plugins/nginx-vhosts/post-app-rename-setup
+++ b/plugins/nginx-vhosts/post-app-rename-setup
@@ -4,7 +4,6 @@ set -eo pipefail
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/internal-functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 trigger-nginx-vhosts-post-app-rename-setup() {
   declare desc="calls proxy-clear-config"
diff --git a/plugins/nginx-vhosts/post-domains-update b/plugins/nginx-vhosts/post-domains-update
index c80e23096..d2cb14732 100755
--- a/plugins/nginx-vhosts/post-domains-update
+++ b/plugins/nginx-vhosts/post-domains-update
@@ -3,8 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
-
 trigger-nginx-vhosts-post-domains-update() {
   declare desc="calls nginx build_config when domains are updated"
   declare trigger="post-domains-update"
diff --git a/plugins/nginx-vhosts/post-proxy-ports-update b/plugins/nginx-vhosts/post-proxy-ports-update
index 7f5514f13..499377c96 100755
--- a/plugins/nginx-vhosts/post-proxy-ports-update
+++ b/plugins/nginx-vhosts/post-proxy-ports-update
@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 trigger-nginx-vhosts-post-proxy-ports-update() {
   declare desc="calls nginx build_config when domains are updated"
diff --git a/plugins/nginx-vhosts/pre-disable-vhost b/plugins/nginx-vhosts/pre-disable-vhost
index a2bf0ea2c..e786e5322 100755
--- a/plugins/nginx-vhosts/pre-disable-vhost
+++ b/plugins/nginx-vhosts/pre-disable-vhost
@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 trigger-nginx-vhosts-pre-disable-vhost() {
   declare desc="unset port prior to vhosts being disabled"
diff --git a/plugins/nginx-vhosts/pre-enable-vhost b/plugins/nginx-vhosts/pre-enable-vhost
index e68f47f6e..bde11f963 100755
--- a/plugins/nginx-vhosts/pre-enable-vhost
+++ b/plugins/nginx-vhosts/pre-enable-vhost
@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 trigger-nginx-vhosts-pre-enable-vhost() {
   declare desc="unset port prior to vhosts being enabled"
diff --git a/plugins/nginx-vhosts/proxy-build-config b/plugins/nginx-vhosts/proxy-build-config
index 408f4b16f..f69cb6447 100755
--- a/plugins/nginx-vhosts/proxy-build-config
+++ b/plugins/nginx-vhosts/proxy-build-config
@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 trigger-nginx-vhosts-proxy-build-config() {
   declare desc="build nginx config to proxy app containers from command line"
diff --git a/plugins/nginx-vhosts/proxy-clear-config b/plugins/nginx-vhosts/proxy-clear-config
index 5cf0c3e6e..f00aea5d3 100755
--- a/plugins/nginx-vhosts/proxy-clear-config
+++ b/plugins/nginx-vhosts/proxy-clear-config
@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/internal-functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 trigger-nginx-vhosts-proxy-clear-config() {
   declare desc="clear nginx config for proxy app containers from command line"
diff --git a/plugins/nginx-vhosts/proxy-disable b/plugins/nginx-vhosts/proxy-disable
index 8c5296aed..089fc289e 100755
--- a/plugins/nginx-vhosts/proxy-disable
+++ b/plugins/nginx-vhosts/proxy-disable
@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 trigger-nginx-vhosts-proxy-disable() {
diff --git a/plugins/nginx-vhosts/proxy-enable b/plugins/nginx-vhosts/proxy-enable
index a5b20938d..4812bcae7 100755
--- a/plugins/nginx-vhosts/proxy-enable
+++ b/plugins/nginx-vhosts/proxy-enable
@@ -3,7 +3,6 @@ set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/domains/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 trigger-nginx-vhosts-proxy-enable() {
diff --git a/plugins/nginx-vhosts/subcommands/build-config b/plugins/nginx-vhosts/subcommands/build-config
index 7f7bab1cc..42c06e959 100755
--- a/plugins/nginx-vhosts/subcommands/build-config
+++ b/plugins/nginx-vhosts/subcommands/build-config
@@ -2,7 +2,6 @@
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/proxy/functions"
 
 cmd-nginx-build-config() {
   declare desc="build nginx config to proxy app containers from command line"