diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22902f5b..e78ae743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 Only listing significant user-visible, not internal code cleanups and minor bug fixes.
 
-## 0.4.0 (upcoming)
+## 0.4.0 (May 10, 2021)
 
 * Update upstream toree to 0.5.0-incubating
 * [ROCK-3840] Update to Scala 2.12 and Spark 3
diff --git a/VERSION b/VERSION
index 10145c26..1d0ba9ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.0-SNAPSHOT
+0.4.0
diff --git a/VERSION_HISTORY.md b/VERSION_HISTORY.md
deleted file mode 100644
index 760b8212..00000000
--- a/VERSION_HISTORY.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Version History
-
-
-#### 0.3.0-2dd6ee6 (Built: March 19, 2020 | Released: March 19, 2020)
-
-#### 0.2.0-ca9cbea (Built: October 22, 2019 | Released: October 22, 2019)
-
-#### 0.1.0-491c615 (Built: September 03, 2018 | Released: September 14, 2018)
-