diff --git a/dokku b/dokku
index 0beb34e94..2f0ec3b93 100755
--- a/dokku
+++ b/dokku
@@ -132,8 +132,8 @@ case "$1" in
 
   # temporary hack for https://github.com/progrium/dokku/issues/82
   deploy:all)
-    for app in $(ls -d $DOKKU_ROOT/*/); do
-      APP=$(basename $app);
+    for app in $(ls -d $DOKKU_ROOT/*/CONTAINER); do
+      APP=$(basename $(dirname $app));
       dokku deploy $APP
     done
     ;;
diff --git a/plugins/apps/commands b/plugins/apps/commands
index 770f772f4..0f26481d7 100755
--- a/plugins/apps/commands
+++ b/plugins/apps/commands
@@ -4,7 +4,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 case "$1" in
   apps)
     echo "=== My Apps"
-    find $DOKKU_ROOT -maxdepth 1 -type d  \( ! -iname ".*" \) | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2
+    find $DOKKU_ROOT -maxdepth 1 -type d  \( ! -iname ".*" \)  -not -path $DOKKU_ROOT/tls | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2
     ;;
 
   apps:create)
@@ -33,6 +33,11 @@ case "$1" in
       exit 1
     fi
 
+    if [[ "$APP" == "tls" ]]; then
+      echo "Unable to destroy tls directory"
+      exit 1
+    fi
+
     echo " !    WARNING: Potentially Destructive Action"
     echo " !    This command will destroy $APP (including all add-ons)."
     echo " !    To proceed, type \"$APP\""