diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 7186ef071..137db9b00 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -6,8 +6,8 @@ Mattermost is secure, workplace messaging from behind your firewall.
 - Personalize your experience with custom colors, formatting and fonts
 - Connect in-house systems with webhooks and Slack-compatible integrations
 
-To use this app, you need a "Team URL" from a Mattermost server. To host your own server go to http://www.mattermost.org/download/
+To use this app, you need a "Server URL" from a Mattermost server. To host your own server go to http://www.mattermost.org/download/
 
 Find the Terms of Service for this app here: https://about.mattermost.com/terms
 
-This is a reference implementation of an open source Mattermost Android app available at: https://github.com/mattermost/android
\ No newline at end of file
+This is a reference implementation of an open source Mattermost Android app available at: https://github.com/mattermost/mattermost-mobile
diff --git a/fastlane/metadata/copyright.txt b/fastlane/metadata/copyright.txt
index 8b1378917..3347782b3 100644
--- a/fastlane/metadata/copyright.txt
+++ b/fastlane/metadata/copyright.txt
@@ -1 +1 @@
-
+Copyright 2017 Mattermost, Inc. All Rights Reserved
diff --git a/fastlane/metadata/en-US/description.txt b/fastlane/metadata/en-US/description.txt
index 8b1378917..724db469b 100644
--- a/fastlane/metadata/en-US/description.txt
+++ b/fastlane/metadata/en-US/description.txt
@@ -1 +1,13 @@
+Mattermost is workplace messaging from behind your firewall.
 
+- Discuss topics in private groups, one-to-one or team-wide
+- Find what you're looking for with full text search, filters and #hashtags
+- Easily share images, video, audio and files 
+- Personalize your experience with custom colors, formatting and fonts
+- Connect in-house systems with webhooks and Slack-compatible integrations
+
+To use this app, you need a "Server URL" from a Mattermost server. To host your own server go to https://about.mattermost.com/download
+
+Find the Terms of Service for this app here: http://www.mattermost.com/terms/
+
+This is a reference implementation of an open source Mattermost app available at: https://github.com/mattermost/mattermost-mobile
diff --git a/fastlane/metadata/en-US/keywords.txt b/fastlane/metadata/en-US/keywords.txt
index 8b1378917..ac80065a9 100644
--- a/fastlane/metadata/en-US/keywords.txt
+++ b/fastlane/metadata/en-US/keywords.txt
@@ -1 +1,3 @@
-
+Mattermost
+Team Communication
+Messaging
diff --git a/fastlane/metadata/en-US/marketing_url.txt b/fastlane/metadata/en-US/marketing_url.txt
index 8b1378917..65ed5b38b 100644
--- a/fastlane/metadata/en-US/marketing_url.txt
+++ b/fastlane/metadata/en-US/marketing_url.txt
@@ -1 +1 @@
-
+https://about.mattermost.com/
diff --git a/fastlane/metadata/en-US/privacy_url.txt b/fastlane/metadata/en-US/privacy_url.txt
index 8b1378917..b26bf4e6a 100644
--- a/fastlane/metadata/en-US/privacy_url.txt
+++ b/fastlane/metadata/en-US/privacy_url.txt
@@ -1 +1 @@
-
+https://about.mattermost.com/privacy/
diff --git a/fastlane/metadata/en-US/support_url.txt b/fastlane/metadata/en-US/support_url.txt
index 8b1378917..5e88882c4 100644
--- a/fastlane/metadata/en-US/support_url.txt
+++ b/fastlane/metadata/en-US/support_url.txt
@@ -1 +1 @@
-
+https://forum.mattermost.org/c/general/trouble-shoot
diff --git a/fastlane/metadata/primary_category.txt b/fastlane/metadata/primary_category.txt
index 8b1378917..f89d64ebb 100644
--- a/fastlane/metadata/primary_category.txt
+++ b/fastlane/metadata/primary_category.txt
@@ -1 +1 @@
-
+Business