diff --git a/templates/android-make/vars.mk b/templates/android-make/vars.mk
index e182240..223393d 100644
--- a/templates/android-make/vars.mk
+++ b/templates/android-make/vars.mk
@@ -20,6 +20,7 @@
 
 BUNDLE_NAME := {{=it.product.bundleName}}
 JAVA_PACKAGE_NAME := {{=it.android.javaPackageName}}
+ANDROID_VERSION := {{=it.android.androidVersion}}
 
 {{?(it.android_make?.commonDir || it.make?.commonDir)}}
 COMMON_DIR := {{=it.android_make?.commonDir ?? (it.make?.commonDir ?? "")}}
diff --git a/templates/android/data/AndroidManifest.xml b/templates/android/data/AndroidManifest.xml
index 46d8787..f1ce3e3 100644
--- a/templates/android/data/AndroidManifest.xml
+++ b/templates/android/data/AndroidManifest.xml
@@ -8,7 +8,7 @@
 {{??}}
     <uses-sdk android:minSdkVersion="26" /> <!-- for androidx core and AAudio -->
 {{?}}
-    <uses-sdk android:targetSdkVersion="34" />
+    <uses-sdk android:targetSdkVersion="{{=it.android.androidVersion}}" />
     <application android:label="{{=it.product.name}}">
       <activity android:name=".MainActivity" android:label="{{=it.product.name}}" android:exported="true">
         <intent-filter>
diff --git a/test/android.json b/test/android.json
index 8ff614f..d8909e6 100644
--- a/test/android.json
+++ b/test/android.json
@@ -1,5 +1,6 @@
 {
 	"android": {
-		"javaPackageName": "com.example.tibia_test"
+		"javaPackageName": "com.example.tibia_test",
+		"androidVersion": "36"
 	}
 }
diff --git a/test/ios-make.json b/test/ios-make.json
index dc4c477..c6dad55 100644
--- a/test/ios-make.json
+++ b/test/ios-make.json
@@ -1,6 +1,6 @@
 {
 	"ios_make": {
 		"headerSearchPaths": [ "../../../../../miniaudio" ],
-		"deploymentTarget": 16.6
+		"deploymentTarget": "16.6"
 	}
 }
diff --git a/test/vars-pre.mk b/test/vars-pre.mk
index 9532b2a..404b727 100644
--- a/test/vars-pre.mk
+++ b/test/vars-pre.mk
@@ -57,7 +57,6 @@ ifeq ($(TEMPLATE), android)
 	KOTLIN_DIR := $(HOME)/Android/kotlin
 	NDK_VERSION := 28.0.13004108
 	BUILD_TOOLS_VERSION := 36.0.0
-	ANDROID_VERSION := 36
 	ANDROIDX_CORE_VERSION := 1.16.0
 	ANDROIDX_LIFECYCLE_COMMON_VERSION := 2.8.7
 	ANDROIDX_VERSIONEDPARCELABLE_VERSION := 1.2.1