diff --git a/.travis.yml b/.travis.yml
index ce10c5224..2d8ecbdd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,6 +93,7 @@ after_success:
   - timeout 180 sudo /snap/bin/transfer *.snap
   # Decrypt the snapcraft login information
   - openssl aes-256-cbc -K $encrypted_d506bd5213c4_key -iv $encrypted_d506bd5213c4_iv -in .snapcraft/credentials.enc -out .snapcraft/credentials -d
+  - export SNAPCRAFT_STORE_CREDENTIALS=$(cat .snapcraft/credentials)
 
 after_failure:
   - test "$TRAVIS_OS_NAME" = "linux" && sudo journalctl -u snapd || true
@@ -102,5 +103,5 @@ deploy:
     branch: master
     condition: $TRAVIS_OS_NAME = linux
   provider: script
-  script: sudo snapcraft login --with .snapcraft/credentials && sudo snapcraft push *.snap --release edge || true
+  script: sudo snapcraft push *.snap --release edge || true
   skip_cleanup: true
diff --git a/app/build/resources/linux/mailspring.appdata.xml.in b/app/build/resources/linux/mailspring.appdata.xml.in
index c79810739..f1714ee06 100644
--- a/app/build/resources/linux/mailspring.appdata.xml.in
+++ b/app/build/resources/linux/mailspring.appdata.xml.in
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>
-    <null>
-  </id>
+  <id><%= name %></id>
   <metadata_license>CC0-1.0</metadata_license>
-  <name>
-    <null>
-  </name>
-  <summary>
-    <null>
-  </summary>
+  <name><%= productName %></name>
+  <summary><%= description %></summary>
   <description>
     <p>
       Mailspring is a new version of Nylas Mail maintained by one of the original authors. It's
@@ -29,9 +23,7 @@
   <url type="homepage">https://getmailspring.com/</url>
   <url type="bugtracker">https://github.com/Foundry376/Mailspring/issues</url>
   <url type="help">http://support.getmailspring.com/</url>
-  <launchable type="desktop-id">
-    <null>.desktop
-  </launchable>
+  <launchable type="desktop-id"><%= productName %>.desktop</launchable>
 
   <developer_name>Mailspring</developer_name>
   <project_license>GPL-3.0+</project_license>
@@ -41,17 +33,17 @@
   </screenshots>
 
   <releases>
-    <release version="1.10.6" date="2022-10-10" />
-    <release version="1.10.5" date="2022-08-10" />
-    <release version="1.10.4" date="2022-08-09" />
-    <release version="1.10.3" date="2022-04-18" />
-    <release version="1.10.2" date="2022-03-29" />
-    <release version="1.10.1" date="2022-03-12" />
-    <release version="1.10.0" date="2022-02-28" />
-    <release version="1.9.2" date="2021-09-06" />
-    <release version="1.9.1" date="2021-04-16" />
-    <release version="1.9.0" date="2021-04-14" />
-    <release version="1.8.0" date="2021-01-20" />
+    <release version="1.10.6" date="2022-08-10"/>
+    <release version="1.10.5" date="2022-08-10"/>
+    <release version="1.10.4" date="2022-08-09"/>
+    <release version="1.10.3" date="2022-04-18"/>
+    <release version="1.10.2" date="2022-03-29"/>
+    <release version="1.10.1" date="2022-03-12"/>
+    <release version="1.10.0" date="2022-02-28"/>
+    <release version="1.9.2" date="2021-09-06"/>
+    <release version="1.9.1" date="2021-04-16"/>
+    <release version="1.9.0" date="2021-04-14"/>
+    <release version="1.8.0" date="2021-01-20"/>
   </releases>
   <content_rating type="oars-1.0" />
-</component>
\ No newline at end of file
+</component>