diff --git a/menu/appguard/rebuild.sh b/menu/appguard/rebuild.sh
index caf17c1bc8..337e5e823b 100644
--- a/menu/appguard/rebuild.sh
+++ b/menu/appguard/rebuild.sh
@@ -38,7 +38,8 @@ tee <<-EOF
 
 EOF
 	sleep 2
-	ansible-playbook /opt/coreapps/apps/$app.yml
+	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""
diff --git a/menu/dlpath/rebuild.sh b/menu/dlpath/rebuild.sh
index 76314d2c7f..123418c5c6 100644
--- a/menu/dlpath/rebuild.sh
+++ b/menu/dlpath/rebuild.sh
@@ -24,7 +24,8 @@ count=$(wc -l < /var/plexguide/container.running)
 
 for ((i=1; i<$count+1; i++)); do
 	app=$(sed "${i}q;d" /var/plexguide/container.running)
-	ansible-playbook /opt/coreapps/apps/$app.yml
+	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""
diff --git a/menu/pgshield/rebuild.sh b/menu/pgshield/rebuild.sh
index 78c2346f8e..233f40a6fb 100644
--- a/menu/pgshield/rebuild.sh
+++ b/menu/pgshield/rebuild.sh
@@ -48,7 +48,8 @@ tee <<-EOF
 
 EOF
 	sleep 1.5
-	ansible-playbook /opt/coreapps/apps/$app.yml
+	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""
diff --git a/menu/portguard/rebuild.sh b/menu/portguard/rebuild.sh
index b0bb6e8ead..4e29ddb508 100644
--- a/menu/portguard/rebuild.sh
+++ b/menu/portguard/rebuild.sh
@@ -48,7 +48,7 @@ tee <<-EOF
 EOF
 	sleep 1
 	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
-	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""