diff --git a/samples-android/ButtonClicker/build.gradle b/samples-android/ButtonClicker/build.gradle
index 074cdf7..d4d294c 100644
--- a/samples-android/ButtonClicker/build.gradle
+++ b/samples-android/ButtonClicker/build.gradle
@@ -17,9 +17,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -38,7 +37,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }
diff --git a/samples-android/CollectAllTheStarsNative/build.gradle b/samples-android/CollectAllTheStarsNative/build.gradle
index 5c53267..9e624ec 100644
--- a/samples-android/CollectAllTheStarsNative/build.gradle
+++ b/samples-android/CollectAllTheStarsNative/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -39,7 +38,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }
diff --git a/samples-android/Minimalist/build.gradle b/samples-android/Minimalist/build.gradle
index 3ab9b4d..cbf2c50 100644
--- a/samples-android/Minimalist/build.gradle
+++ b/samples-android/Minimalist/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -40,7 +39,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }
                 source {
diff --git a/samples-android/TbmpSkeletonNative/build.gradle b/samples-android/TbmpSkeletonNative/build.gradle
index 5bb2d9a..ada5f88 100644
--- a/samples-android/TbmpSkeletonNative/build.gradle
+++ b/samples-android/TbmpSkeletonNative/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -42,7 +41,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg"  linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }
diff --git a/samples-android/Teapot/build.gradle b/samples-android/Teapot/build.gradle
index 9c58e4b..e0c4009 100644
--- a/samples-android/Teapot/build.gradle
+++ b/samples-android/Teapot/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -38,7 +37,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }
diff --git a/samples-android/TrivialQuestNative/build.gradle b/samples-android/TrivialQuestNative/build.gradle
index 65ffeaf..6eb45bc 100644
--- a/samples-android/TrivialQuestNative/build.gradle
+++ b/samples-android/TrivialQuestNative/build.gradle
@@ -16,9 +16,8 @@ model {
         libs(PrebuiltLibraries) {
             gpg {
                 headers.srcDir "${gpg_cpp_path}/include"
-                // StaticLibraryBinary does not work, use SharedLibraryBinary for now
-                binaries.withType(SharedLibraryBinary) {
-                    sharedLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
+                binaries.withType(StaticLibraryBinary) {
+                    staticLibraryFile = file("${gpg_cpp_path}/lib/${stlportType}/${targetPlatform.getName()}/libgpg.a")
                 }
             }
         }
@@ -39,7 +38,7 @@ model {
         main {
             jni {
                 dependencies {
-                    library "gpg"
+                    library "gpg" linkage "static"
                     project ":cpufeatures" linkage "static"
                     project ":native_app_glue" linkage "static"
                 }