diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle
index de20d29621..6bb63c49d9 100644
--- a/samples/standalone/restdocs/http-server/build.gradle
+++ b/samples/standalone/restdocs/http-server/build.gradle
@@ -63,8 +63,8 @@ test {
 }
 
 task stubsJar(type: Jar, dependsOn: ['copySnippets', 'copySources', 'copyClasses']) {
-	baseName = project.name
-	classifier = 'stubs'
+	archiveBaseName = project.name
+	archiveClassifier = 'stubs'
 	from project.file("${project.buildDir}/stubs")
 }
 
@@ -85,6 +85,13 @@ task copyClasses(type: Copy) {
 	into "${project.buildDir}/stubs/"
 }
 
+
+project.tasks.named("verifierStubsJar").get().dependsOn('copySnippets', 'copySources', 'stubsJar') // TODO: We need to fix this
+project.tasks.named("copyContracts").get().dependsOn('stubsJar')  // TODO: We need to fix this
+afterEvaluate {
+	project.tasks.matching { it.name.contains("publish") }.each { it.dependsOn('verifierStubsJar') } // TODO: We need to fix this
+}
+
 publishing {
 	publications {
 		maven(MavenPublication) {
diff --git a/samples/standalone/webclient/http-server/build.gradle b/samples/standalone/webclient/http-server/build.gradle
index 5c2efeae1c..2e5c0a9637 100644
--- a/samples/standalone/webclient/http-server/build.gradle
+++ b/samples/standalone/webclient/http-server/build.gradle
@@ -64,8 +64,8 @@ test {
 }
 
 task stubsJar(type: Jar, dependsOn: ['copySnippets', 'copySources', 'copyClasses']) {
-	baseName = project.name
-	classifier = 'stubs'
+	archiveBaseName = project.name
+	archiveClassifier = 'stubs'
 	from project.file("${project.buildDir}/stubs")
 }
 
@@ -86,6 +86,12 @@ task copyClasses(type: Copy) {
 	into "${project.buildDir}/stubs/"
 }
 
+project.tasks.named("verifierStubsJar").get().dependsOn('copySnippets', 'copySources', 'stubsJar') // TODO: We need to fix this
+project.tasks.named("copyContracts").get().dependsOn('stubsJar')  // TODO: We need to fix this
+afterEvaluate {
+	project.tasks.matching { it.name.contains("publish") }.each { it.dependsOn('verifierStubsJar') } // TODO: We need to fix this
+}
+
 publishing {
 	publications {
 		maven(MavenPublication) {