diff --git a/app/build.gradle b/app/build.gradle
index e1fbdc3..68baccc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@
         applicationId "nl.digital_me.dummyandroidapp"
         minSdkVersion 10
         targetSdkVersion 24
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 21
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 22
         versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.1"
     }
     buildTypes {
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 58765ff..42c236e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -45,8 +45,8 @@
       message: "Increment version code to #{lane_context[SharedValues::VERSION_CODE]} new tag",
     )
     add_git_tag(
-      tag: "#{lane_context[SharedValues::VERSION_CODE]}-#{ENV['VERSION']}",
-      message: "Create new tag for version #{lane_context[SharedValues::VERSION_CODE]} (#{ENV['VERSION']})",
+      tag: "#{ENV['VERSION']}-#{lane_context[SharedValues::VERSION_CODE]}",
+      message: "Create new tag for version #{ENV['VERSION']}-#{lane_context[SharedValues::VERSION_CODE]}",
     )
     push_to_git_remote(
       local_branch: "HEAD",
@@ -62,12 +62,16 @@
       build_type: 'Release',
     )
     sh("mv -vf metadata/android/en-US/changelogs/latest.txt metadata/android/en-US/changelogs/#{lane_context[SharedValues::VERSION_CODE]}.txt")
-    sh("mv -vf metadata/android/nl-NL/changelogs/latest.txt metadata/android/nl-NL/changelogs/#{lane_context[SharedValues::VERSION_CODE]}.txt")
     sh("git add metadata/android/en-US/changelogs/#{lane_context[SharedValues::VERSION_CODE]}.txt")
+    sh("git add metadata/android/en-US/changelogs/latest.txt")
+    sh("mv -vf metadata/android/nl-NL/changelogs/latest.txt metadata/android/nl-NL/changelogs/#{lane_context[SharedValues::VERSION_CODE]}.txt")
     sh("git add metadata/android/nl-NL/changelogs/#{lane_context[SharedValues::VERSION_CODE]}.txt")
+    sh("git add metadata/android/nl-NL/changelogs/latest.txt")
     git_commit(
       path: [
+        "fastlane/metadata/android/en-US/changelogs/latest.txt",
         "fastlane/metadata/android/en-US/changelogs/#{lane_context[SharedValues::VERSION_CODE]}.txt",
+        "fastlane/metadata/android/nl-NL/changelogs/latest.txt",
         "fastlane/metadata/android/nl-NL/changelogs/#{lane_context[SharedValues::VERSION_CODE]}.txt",
       ],
       message: "Provide changelogs for this version",