diff --git a/android/app/src/main/java/aza/instant/MainActivity.kt b/android/app/src/main/java/aza/instant/MainActivity.kt
index 9baf721..e0f99f4 100644
--- a/android/app/src/main/java/aza/instant/MainActivity.kt
+++ b/android/app/src/main/java/aza/instant/MainActivity.kt
@@ -120,7 +120,7 @@ fun FileListerScreen(modifier: Modifier = Modifier) {
                             try {
                                 val templateStream = context.resources.openRawResource(R.raw.postcard4)
                                 val template = BufferedReader(InputStreamReader(templateStream)).readText()
-                                val svg = genSvg(template, latestImage.absolutePath)
+                                val (svg, exif) = genSvg(template, latestImage.absolutePath)
                                 picture = renderSvgAndroid(context, svg)
 
                                 // Save picture to file
@@ -133,7 +133,7 @@ fun FileListerScreen(modifier: Modifier = Modifier) {
                                 feedbackText = "Rendered ${latestImage.name}, now uploading..."
 
                                 val response = backendClient.uploadImage(
-                                    id = UUID.randomUUID().toString(),
+                                    id = exif.urlName,
                                     ownerKey = "1234",
                                     originalPhoto = latestImage,
                                     editedPhoto = renderedImageFile
diff --git a/android/app/src/main/java/aza/instant/SvgUtil.kt b/android/app/src/main/java/aza/instant/SvgUtil.kt
index 1211ce1..fc681e1 100644
--- a/android/app/src/main/java/aza/instant/SvgUtil.kt
+++ b/android/app/src/main/java/aza/instant/SvgUtil.kt
@@ -21,7 +21,7 @@ fun createQRCode(url: String) =
     QRCode.ofSquares().withSize(5).withMargin(0).withErrorCorrectionLevel(ErrorCorrectionLevel.LOW)
         .withInnerSpacing(0).build(url).render()
 
-suspend fun genSvg(template: String, imagePath: String): String {
+suspend fun genSvg(template: String, imagePath: String): Pair<String, ExifResult> {
     var svg = template
 
     // Read target image's EXIF data
@@ -41,7 +41,7 @@ suspend fun genSvg(template: String, imagePath: String): String {
             """<image id=\"_Image1\" width=\"${exif.w}px\" height=\"${exif.h}px\" xlink:href=\"data:image/jpeg;base64,${Base64.getEncoder().encodeToString(imageData)}\"/>""")
         .replace("""<image id="_Image3" width="100px" height="100px" xlink:href="data:image/png;base64,.*?"/>""".toRegex(),
             """<image id=\"_Image3\" width=\"100px\" height=\"100px\" xlink:href=\"data:image/png;base64,${Base64.getEncoder().encodeToString(stream.toByteArray())}\"/>""")
-    return svg
+    return svg to exif
 }
 
 class FontResolver(private val context: Context) : SVGExternalFileResolver() {