diff --git a/CHANGES b/CHANGES
index 6219833a9a..2d85d5d3ee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4.2.0-dev.333 | 2021-11-17 11:57:04 -0800
+
+  * Clean up fully after successful Docker btests (Christian Kreibich, Corelight)
+
 4.2.0-dev.331 | 2021-11-15 10:10:52 -0800
 
   * Fix ref-naming typo in the Github Docker workflow (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index a10f45f805..ee0040bb14 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.0-dev.331
+4.2.0-dev.333
diff --git a/docker/btest/Makefile b/docker/btest/Makefile
index 65d4d65c98..30d0348a72 100644
--- a/docker/btest/Makefile
+++ b/docker/btest/Makefile
@@ -1,11 +1,11 @@
 DIAG=diag.log
 BTEST=../../auxil/btest/btest
 
-all: cleanup btest-verbose
+all: btest-verbose clean
 
 # Showing all tests.
 btest-verbose:
 	@$(BTEST) -d -j -f $(DIAG)
 
-cleanup:
-	@rm -f $(DIAG)
+clean:
+	@rm -rf $(DIAG) .tmp .btest.failed.dat