diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 7bafdbef782..9c539aaea5f 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -18,6 +18,7 @@ body:
       label: ExoPlayer Version
       description: What version of ExoPlayer are you using?
       options:
+        - 2.18.4
         - 2.18.3
         - 2.18.2
         - 2.18.1
diff --git a/constants.gradle b/constants.gradle
index b25526aa41b..fe6f6c299ce 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.18.3'
-    releaseVersionCode = 2_018_003
+    releaseVersion = '2.18.4'
+    releaseVersionCode = 2_018_004
     minSdkVersion = 16
     appTargetSdkVersion = 33
     // API version before restricting local file access.
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index 735838d253b..e02c09c8c5c 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -27,11 +27,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.18.3";
+  public static final String VERSION = "2.18.4";
 
   /** The version of the library expressed as {@code TAG + "/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.18.3";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.18.4";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -41,7 +41,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2_018_003;
+  public static final int VERSION_INT = 2_018_004;
 
   /** Whether the library was compiled with {@link Assertions} checks enabled. */
   public static final boolean ASSERTIONS_ENABLED = true;