diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 54e0a97..898f7d6 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -56,6 +56,9 @@
         <option name="TAB_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Markdown">
+      <option name="WRAP_ON_TYPING" value="0" />
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57e7635..8f4f2c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
+# 3.7.0
+### Features and Improvements
+* Added an API to ignore disabled system animations (setIgnoreDisabledSystemAnimations(boolean)) ([#1747](https://github.com/airbnb/lottie-android/pull/1747))
+* Added support for jpgs as image assets ([#1769](https://github.com/airbnb/lottie-android/pull/1769))
+### Bugs Fixed
+* Prevented duplicate positions in gradients which caused hardware accelerated rendering bugs on some phones ([#1768](https://github.com/airbnb/lottie-android/pull/1768))
+* Fixed some parsing errors that occurred in some animations exported with Flow ([#1771](https://github.com/airbnb/lottie-android/pull/1771))
+
 # 3.6.1
 ### Bugs Fixed
-* Fixe a bug that would cause animations to stop animating if the same LottieAnimationView was used with multiple animations ([#1727](https://github.com/airbnb/lottie-android/pull/1737))
+* Fixed a bug that would cause animations to stop animating if the same LottieAnimationView was used with multiple animations ([#1727](https://github.com/airbnb/lottie-android/pull/1737))
 
 # 3.6.0
 ### Features and Improvements
diff --git a/CHANGELOG_COMPOSE.md b/CHANGELOG_COMPOSE.md
index e155e0a..389a0db 100644
--- a/CHANGELOG_COMPOSE.md
+++ b/CHANGELOG_COMPOSE.md
@@ -1,6 +1,13 @@
 #### Note: For the time being, we won't provide numbered releases for every new Jetpack Compose
 version. Check out our [snapshot builds](https://github.com/airbnb/lottie/blob/master/android-compose.md#getting-started) instead.
 
+# 1.0.0-beta03-1
+* Update versioning scheme to match the underlying Compose version
+* Compatible with Jetpack Compose Beta 03
+* Added support for images ([#1766](https://github.com/airbnb/lottie-android/pull/1766))
+* Added the ability to control whether merge paths are enabled or not ([#1744](https://github.com/airbnb/lottie-android/pull/1744))
+* Swapped modifier application order to follow Compose guidelines (and support setting specific sizes) ([#1765](https://github.com/airbnb/lottie-android/pull/1765))
+
 # 1.0.0-alpha07-SNAPSHOT
 * Add flag for merge paths to LottieAnimationState
 * Compatible with Jetpack Compose Beta 02
diff --git a/gradle.properties b/gradle.properties
index 770ca81..4fd61ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=3.6.2-SNAPSHOT
+VERSION_NAME=3.7.0
 GROUP=com.airbnb.android
 
 POM_DESCRIPTION=Lottie is an animation library that renders Adobe After Effects animations natively in realtime.
diff --git a/lottie-compose/gradle.properties b/lottie-compose/gradle.properties
index e657676..0e2b14e 100644
--- a/lottie-compose/gradle.properties
+++ b/lottie-compose/gradle.properties
@@ -4,4 +4,4 @@
 POM_ARTIFACT_ID=lottie-compose
 POM_PACKAGING=aar
 GROUP=com.airbnb.android
-VERSION_NAME=1.0.0-alpha07-SNAPSHOT
+VERSION_NAME=1.0.0-beta03-1