diff --git a/build.gradle b/build.gradle
index 64511fa72d3..8a97c25ffdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -379,19 +379,29 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
         into baseName
     }
     from(project.rootDir) {
-        include 'samples/**'
         include 'INTEROP.md'
         include 'RELEASE_NOTES.md'
         include 'GRADLE_PLUGIN.md'
         include 'PLATFORM_LIBS.md'
-        exclude '**/gradle.properties'
-        exclude '**/settings.gradle'
+        include 'samples/**'
+        exclude 'samples/gradle.properties'
+        exclude 'samples/settings.gradle'
         exclude '**/build'
         exclude '**/.gradle'
         exclude 'samples/**/*.kt.bc-build'
-        rename('(.*)\\.for_bundle', '$1')
         into baseName
     }
+
+    from(project.file("samples/settings.gradle")) {
+        into "$baseName/samples"
+        filter { it.startsWith("includeBuild") ? null : it }
+    }
+
+    from(project.file("samples/gradle.properties")) {
+        into "$baseName/samples"
+        filter { it.startsWith("konan.home=") ? "konan.home=../.." : it }
+    }
+
     destinationDir = file('.')
     if (!isWindows()) {
         extension = 'tar.gz'
diff --git a/samples/gradle.properties.for_bundle b/samples/gradle.properties.for_bundle
deleted file mode 100644
index 8116d13bea0..00000000000
--- a/samples/gradle.properties.for_bundle
+++ /dev/null
@@ -1,2 +0,0 @@
-konan.home=../..
-konan.jvmArgs=-Xmx3G
\ No newline at end of file
diff --git a/samples/settings.gradle.for_bundle b/samples/settings.gradle.for_bundle
deleted file mode 100644
index 4fc25b0efa3..00000000000
--- a/samples/settings.gradle.for_bundle
+++ /dev/null
@@ -1,10 +0,0 @@
-include ':csvparser'
-include ':gitchurn'
-include ':gtk'
-include ':libcurl'
-include ':nonBlockingEchoServer'
-include ':opengl'
-include ':socket'
-include ':tetris'
-include ':tensorflow'
-include ':concurrent'