diff --git a/Dockerfile.template b/Dockerfile.template
index fed7f1290..20d2dd208 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -206,7 +206,6 @@ COPY --from=build-prod /usr/src/app/node_modules ./node_modules
 
 COPY entry.sh .
 
-VOLUME /data
 HEALTHCHECK --interval=5m --start-period=1m --timeout=30s --retries=3 \
 	CMD wget http://127.0.0.1:${LISTEN_PORT:-48484}/v1/healthy -O - -q
 
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index cb8b8ce60..5e5b09783 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -60,9 +60,6 @@ services:
     environment:
       DOCKER_TLS_CERTDIR: ''
     command: --tls=false # --debug
-    tmpfs:
-    # Prevent dind creating a bunch of anonymous volumes on host
-      - /var/lib/docker
 
   sut:
     # Build the supervisor code for development and testing
diff --git a/package.json b/package.json
index 81d255b0e..e7a1d9a88 100644
--- a/package.json
+++ b/package.json
@@ -17,10 +17,10 @@
     "test:integration:single": "find test/integration -name *.spec.ts | xargs mocha --config test/integration/.mocharc.js",
     "test:legacy": "mocha --config test/legacy/.mocharc.js",
     "test:node": "npm run test:unit && npm run test:integration && npm run test:legacy",
-    "test:env": "ARCH=$(./build-utils/detect-arch.sh) docker-compose -f docker-compose.test.yml -f docker-compose.dev.yml up --build; npm run compose:down",
-    "test:compose": "ARCH=$(./build-utils/detect-arch.sh) docker-compose -f docker-compose.yml -f docker-compose.test.yml up --build --remove-orphans --exit-code-from=sut ; npm run compose:down",
+    "test:env": "ARCH=$(./build-utils/detect-arch.sh) docker compose -f docker-compose.test.yml -f docker-compose.dev.yml up --build; npm run compose:down",
+    "test:compose": "ARCH=$(./build-utils/detect-arch.sh) docker compose -f docker-compose.yml -f docker-compose.test.yml up --build --remove-orphans --exit-code-from=sut ; npm run compose:down",
     "test": "npm run lint && npm run test:build && npm run test:unit",
-    "compose:down": "docker-compose -f docker-compose.test.yml down && docker volume rm $(docker volume ls -f name=balena-supervisor -q)",
+    "compose:down": "docker compose -f docker-compose.test.yml down --volumes",
     "prettify": "balena-lint -e ts -e js --fix src/ test/ typings/ build-utils/ webpack.config.js",
     "release": "tsc --project tsconfig.release.json && mv build/src/* build",
     "sync": "ts-node --files sync/sync.ts",