diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dd19630..c7a646cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.8.0] - 2020-05-23
+
 ### Added
 - Allow user to abort password move when it is replacing an existing file
 - Allow setting a default username for Autofill
@@ -140,7 +142,8 @@ All notable changes to this project will be documented in this file.
 - Fix elements overlapping.
 
 
-[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/v1.7.2...HEAD
+[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/v1.8.0...HEAD
+[1.8.0]: https://github.com/android-password-store/Android-Password-Store/compare/v1.7.2..v1.8.0
 [1.7.2]: https://github.com/android-password-store/Android-Password-Store/compare/v1.7.1..v1.7.2
 [1.7.1]: https://github.com/android-password-store/Android-Password-Store/compare/v1.7.0..v1.7.1
 [1.7.0]: https://github.com/android-password-store/Android-Password-Store/compare/v1.6.0..v1.7.0
diff --git a/app/build.gradle b/app/build.gradle
index 92eb301c..f1387f43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
 
     defaultConfig {
         applicationId 'dev.msfjarvis.aps'
-        versionCode 10721
-        versionName '1.8.0-SNAPSHOT'
+        versionCode 10800
+        versionName '1.8.0'
     }
 
     lintOptions {