diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7df43cb9d..a6e5b1d17 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -2,7 +2,7 @@ FROM dokku/dokku:latest
 
 RUN apt-get update
 RUN apt-get install --no-install-recommends -y build-essential file nano && \
-  apt-get install --no-install-recommends -y shellcheck xmlstarlet && \
+  apt-get install --no-install-recommends -y shellcheck uuid-runtime xmlstarlet && \
   apt-get clean autoclean && \
   apt-get autoremove --yes && \
   rm -rf /var/lib/apt/lists/*
@@ -10,8 +10,10 @@ RUN apt-get install --no-install-recommends -y build-essential file nano && \
 ADD https://raw.githubusercontent.com/dokku/dokku/master/tests/dhparam.pem /mnt/dokku/etc/nginx/dhparam.pem
 
 COPY .devcontainer/bin/ /usr/local/bin/
-COPY . .
-
+COPY ["tests.mk", "Makefile"]
 RUN make ci-dependencies
 
+COPY . .
+
 ENV DOKKU_HOSTNAME=dokku.me
+LABEL org.label-schema.schema-version=1.0 org.label-schema.vendor=dokku com.dokku.devcontainer=true
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 756124adf..7af15371b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
     "context": ".."
   },
   "containerEnv": {
-    "DOKKU_HOST_ROOT": "${localWorkspaceFolder}/tmp/data",
+    "DOKKU_HOST_ROOT": "${localWorkspaceFolder}/tmp/data/home/dokku",
     "GO_ROOT_MOUNT": "${localWorkspaceFolder}:/go/src/github.com/dokku/dokku"
   },
   "initializeCommand": ["mkdir", "-p", "tmp/data"],
diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash
index 254c2d0c0..da08bfff6 100644
--- a/tests/unit/test_helper.bash
+++ b/tests/unit/test_helper.bash
@@ -34,16 +34,13 @@ global_teardown() {
 cleanup_apps() {
   rm -rf $DOKKU_ROOT/*/nginx.conf
 
-  apps=$(dokku --quiet apps:list)
-  if [[ -n "${apps}" ]]; then
-    dokku --quiet apps:list | xargs -n1 dokku --force apps:destroy
-  fi
+  dokku --quiet apps:list | xargs --no-run-if-empty -n1 dokku --force apps:destroy
 }
 
 cleanup_containers() {
   containers=$(docker container ls --quiet)
   if [[ -n "$containers" ]]; then
-    docker container ls --quiet | xargs -n1 docker container rm -f || true
+    docker inspect -f '{{ if ne "true" (index .Config.Labels "com.dokku.devcontainer") }}{{.ID}} {{ end }}' $(docker ps -q) | xargs --no-run-if-empty -n1 docker container rm -f || true
   fi
 }