diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index ed8cd71a9c..046b449f2e 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -291,7 +291,7 @@ task downloadWorldMiniBasemap {
 task setupHuaweiConfig {
 	doLast {
 		if (System.getenv("HUAWEI_SDK_JSON")) {
-			new File("agconnect-services.json").text = System.getenv("HUAWEI_SDK_JSON")
+			new File("OsmAnd/agconnect-services.json").text = System.getenv("HUAWEI_SDK_JSON")
 		}
 	}
 }
diff --git a/OsmAnd/osmand_hw_key b/OsmAnd/osmand_hw_key
new file mode 100644
index 0000000000..7dace502e7
Binary files /dev/null and b/OsmAnd/osmand_hw_key differ