diff --git a/src/main/java/org/appverse/builder/build/BuildExecutorWorker.java b/src/main/java/org/appverse/builder/build/BuildExecutorWorker.java
index b8a497c..afc1a32 100644
--- a/src/main/java/org/appverse/builder/build/BuildExecutorWorker.java
+++ b/src/main/java/org/appverse/builder/build/BuildExecutorWorker.java
@@ -20,6 +20,7 @@
 
 import javax.inject.Inject;
 import java.io.*;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -164,7 +165,7 @@ private File getBuildLogFile() {
         if (currentLogFile == null) {
             try {
                 //TODO find a better place to store the log file
-                currentLogFile = File.createTempFile(currentBuildRequest.getChainId().toString() + "-" + currentBuildRequest.getId(), "log");
+                currentLogFile = Files.createTempFile(currentBuildRequest.getChainId().toString() + "-" + currentBuildRequest.getId(), "log").toFile();
             } catch (IOException e) {
                 log.warn("Could not create the temporary log file", e);
             }
diff --git a/src/test/java/org/appverse/builder/build/BuildRequestTestUtils.java b/src/test/java/org/appverse/builder/build/BuildRequestTestUtils.java
index f7c3025..0c2d98f 100644
--- a/src/test/java/org/appverse/builder/build/BuildRequestTestUtils.java
+++ b/src/test/java/org/appverse/builder/build/BuildRequestTestUtils.java
@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 
 import static org.appverse.builder.domain.enumeration.BuildStatus.QUEUED;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -51,7 +52,7 @@ public void waitStart(BuildRequestDTO buildRequest) throws InterruptedException
     }
 
     public BuildChainDTO createBuildChainFromPayload(File nativeDemoDir) throws IOException, ZipException {
-        File tempFile = File.createTempFile("payload-test", ".zip");
+        File tempFile = Files.createTempFile("payload-test", ".zip").toFile();
         tempFile.delete();
         ZipFile zipFile = new ZipFile(tempFile);
         ZipParameters parameters = new ZipParameters();
diff --git a/src/test/java/org/appverse/builder/web/rest/BuildChainResourceIntTest.java b/src/test/java/org/appverse/builder/web/rest/BuildChainResourceIntTest.java
index 3598342..414b736 100644
--- a/src/test/java/org/appverse/builder/web/rest/BuildChainResourceIntTest.java
+++ b/src/test/java/org/appverse/builder/web/rest/BuildChainResourceIntTest.java
@@ -44,6 +44,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -327,7 +328,7 @@ public void onlyOwnerCanDeleteBuildChain() throws Exception {
     @Test
     public void createBuildChainFromPayload() throws Exception {
         File nativeDemoDir = new ClassPathResource("demo/native").getFile();
-        File tempFile = File.createTempFile("payload-test", ".zip");
+        File tempFile = Files.createTempFile("payload-test", ".zip").toFile();
         tempFile.delete();
         ZipFile zipFile = new ZipFile(tempFile);
         ZipParameters parameters = new ZipParameters();
@@ -376,7 +377,7 @@ public void createBuildChainFromPayload() throws Exception {
     @Test
     public void createBuildChainFromPayloadWithOptions() throws Exception {
         File nativeDemoDir = new ClassPathResource("demo/native").getFile();
-        File tempFile = File.createTempFile("payload-test", ".zip");
+        File tempFile = Files.createTempFile("payload-test", ".zip").toFile();
         tempFile.delete();
         ZipFile zipFile = new ZipFile(tempFile);
         ZipParameters parameters = new ZipParameters();
@@ -429,7 +430,7 @@ public void createBuildChainFromPayloadWithOptions() throws Exception {
     @Test
     public void createBuildChainFromPayloadWithFlavor() throws Exception {
         File nativeDemoDir = new ClassPathResource("demo/native").getFile();
-        File tempFile = File.createTempFile("payload-test", ".zip");
+        File tempFile = Files.createTempFile("payload-test", ".zip").toFile();
         tempFile.delete();
         ZipFile zipFile = new ZipFile(tempFile);
         ZipParameters parameters = new ZipParameters();