diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b99b28..bf0bfbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Latest
+
+- [Bugfix] Fix Android app image build
+
 ## 3.3.1 (2019-03-25)
 
 - [Improvement] Improve assets building for development
diff --git a/tutor/config.py b/tutor/config.py
index c086b7c..59b8fd2 100644
--- a/tutor/config.py
+++ b/tutor/config.py
@@ -166,7 +166,7 @@ def load_defaults(config):
 
     # Add extra configuration parameters that need to be computed separately
     config["lms_cms_common_domain"] = utils.common_domain(config["LMS_HOST"], config["CMS_HOST"])
-    config["lms_host_reverse"] = config["LMS_HOST"].split(".")[::-1]
+    config["lms_host_reverse"] = ".".join(config["LMS_HOST"].split(".")[::-1])
 
 def ask(question, key, config):
     default = env.render_str(config, config[key])
diff --git a/tutor/templates/android/gradle.properties b/tutor/templates/android/gradle.properties
index d09ea98..8703267 100644
--- a/tutor/templates/android/gradle.properties
+++ b/tutor/templates/android/gradle.properties
@@ -1,5 +1,5 @@
 APPLICATION_ID={{ lms_host_reverse }}
 RELEASE_STORE_FILE=/openedx/config/app.keystore
-RELEASE_STORE_PASSWORD={{ ANDROID_STORE_PASSWORD }}
-RELEASE_KEY_PASSWORD={{ ANDROID_KEY_PASSWORD }}
+RELEASE_STORE_PASSWORD={{ ANDROID_RELEASE_STORE_PASSWORD }}
+RELEASE_KEY_PASSWORD={{ ANDROID_RELEASE_KEY_PASSWORD }}
 RELEASE_KEY_ALIAS={{ ANDROID_RELEASE_KEY_ALIAS }}