diff --git a/gradle.properties b/gradle.properties
index 20344ed..4df553f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@
 #  - tests/kafkatest/__init__.py
 #  - tests/kafkatest/version.py (variable DEV_VERSION)
 #  - kafka-merge-pr.py
-version=2.4.0-SNAPSHOT
+version=2.4.0
 scalaVersion=2.12.10
 task=build
 org.gradle.jvmargs=-Xmx1024m -Xss2m
diff --git a/streams/quickstart/java/pom.xml b/streams/quickstart/java/pom.xml
index 13425c0..05df221 100644
--- a/streams/quickstart/java/pom.xml
+++ b/streams/quickstart/java/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.kafka</groupId>
         <artifactId>streams-quickstart</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
index 300f72f..0ddee1e 100644
--- a/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
+++ b/streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
@@ -29,7 +29,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kafka.version>2.4.0-SNAPSHOT</kafka.version>
+        <kafka.version>2.4.0</kafka.version>
         <slf4j.version>1.7.7</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
     </properties>
diff --git a/streams/quickstart/pom.xml b/streams/quickstart/pom.xml
index 79deb93..076adb5 100644
--- a/streams/quickstart/pom.xml
+++ b/streams/quickstart/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.apache.kafka</groupId>
     <artifactId>streams-quickstart</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0</version>
 
     <name>Kafka Streams :: Quickstart</name>
 
diff --git a/tests/kafkatest/__init__.py b/tests/kafkatest/__init__.py
index 7083c2f..e40c349 100644
--- a/tests/kafkatest/__init__.py
+++ b/tests/kafkatest/__init__.py
@@ -15,11 +15,11 @@
 
 # This determines the version of kafkatest that can be published to PyPi and installed with pip
 #
-# Note that in development, this version name can't follow Kafka's convention of having a trailing "-SNAPSHOT"
+# Note that in
 # due to python version naming restrictions, which are enforced by python packaging tools
-# (see  https://www.python.org/dev/peps/pep-0440/)
+# (see  https://www.python.org
 #
-# Instead, in development branches, the version should have a suffix of the form ".devN"
+# Instead, in
 #
-# For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0.dev0"
-__version__ = '2.4.0.dev0'
+# For example, when Kafka is at version 1.0.0-SNAPSHOT, this should be something like "1.0.0
+__version__ = '2.4.0'