diff --git a/engine/src/main/java/org/n52/javaps/utils/IOUtils.java b/engine/src/main/java/org/n52/javaps/utils/IOUtils.java
index c9e07972..06ecde77 100644
--- a/engine/src/main/java/org/n52/javaps/utils/IOUtils.java
+++ b/engine/src/main/java/org/n52/javaps/utils/IOUtils.java
@@ -71,7 +71,7 @@ public static File writeBase64ToFile(InputStream input,
 
     public static File writeStreamToFile(InputStream inputStream,
             String extension) throws IOException {
-        File file = File.createTempFile(FILE + UUID.randomUUID(), "." + extension);
+        File file = Files.createTempFile(FILE + UUID.randomUUID(), "." + extension).toFile();
         return writeStreamToFile(inputStream, extension, file);
     }
 
@@ -112,7 +112,7 @@ public static File writeStreamToFile(InputStream inputStream,
      *             if the zipping process fails.
      */
     public static File zip(File... files) throws IOException {
-        File zip = File.createTempFile("zip" + UUID.randomUUID(), ".zip");
+        File zip = Files.createTempFile("zip" + UUID.randomUUID(), ".zip").toFile();
 
         try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(zip))) {
             byte[] buffer = new byte[4096];
diff --git a/engine/src/main/java/org/n52/javaps/utils/LargeBufferStream.java b/engine/src/main/java/org/n52/javaps/utils/LargeBufferStream.java
index 3aa72280..220fc2b1 100644
--- a/engine/src/main/java/org/n52/javaps/utils/LargeBufferStream.java
+++ b/engine/src/main/java/org/n52/javaps/utils/LargeBufferStream.java
@@ -21,6 +21,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
 
 /**
@@ -127,7 +128,7 @@ private boolean reachedInCoreLimit() throws IOException {
             return false;
         }
 
-        onDiskFile = File.createTempFile("jgit_", ".buffer");
+        onDiskFile = Files.createTempFile("jgit_", ".buffer").toFile();
         diskOut = new FileOutputStream(onDiskFile);
 
         final Block last = blocks.remove(blocks.size() - 1);