diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 73c24e2bf..6849030f1 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.8.4-SNAPSHOT
+current_version = 5.8.4
 commit = True
 tag = True
 sign_tags = True
diff --git a/build.gradle b/build.gradle
index 800093caa..0301cf6f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "org.openmicroscopy"
-version = "5.8.4-SNAPSHOT"
+version = "5.8.4"
 
 repositories {
     mavenLocal()
diff --git a/docs/conf.py b/docs/conf.py
index 054b65ff1..d4935b3e5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,7 +36,7 @@
 
 # The full version, including alpha/beta/rc tags
 # The short X.Y version.
-version = '5.8.4-SNAPSHOT'
+version = '5.8.4'
 release = version