diff --git a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java
index 81237beb7..69ed4fd4a 100644
--- a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java
+++ b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java
@@ -10,8 +10,6 @@ package org.eclipse.hawkbit.simulator;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.security.DigestOutputStream;
 import java.security.KeyManagementException;
@@ -34,6 +32,7 @@ import org.apache.http.conn.ssl.SSLContextBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.eclipse.hawkbit.dmf.json.model.Artifact;
+import org.eclipse.hawkbit.dmf.json.model.Artifact.UrlProtocol;
 import org.eclipse.hawkbit.dmf.json.model.SoftwareModule;
 import org.eclipse.hawkbit.simulator.AbstractSimulatedDevice.Protocol;
 import org.eclipse.hawkbit.simulator.UpdateStatus.ResponseStatus;
@@ -59,7 +58,7 @@ import com.google.common.io.ByteStreams;
 public class DeviceSimulatorUpdater {
     private static final Logger LOGGER = LoggerFactory.getLogger(DeviceSimulatorUpdater.class);
 
-    private static final ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(4);
+    private static final ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(8);
 
     @Autowired
     private SpSenderService spSenderService;
@@ -198,18 +197,14 @@ public class DeviceSimulatorUpdater {
 
         private static void handleArtifacts(final String targetToken, final List<UpdateStatus> status,
                 final Artifact artifact) {
-            artifact.getUrls().entrySet().forEach(entry -> {
-                switch (entry.getKey()) {
-                case HTTP:
-                case HTTPS:
-                    status.add(downloadUrl(entry.getValue(), targetToken, artifact.getHashes().getSha1(),
-                            artifact.getSize()));
-                    break;
-                default:
-                    // not supported yet
-                    break;
-                }
-            });
+
+            if (artifact.getUrls().containsKey(UrlProtocol.HTTPS)) {
+                status.add(downloadUrl(artifact.getUrls().get(UrlProtocol.HTTPS), targetToken,
+                        artifact.getHashes().getSha1(), artifact.getSize()));
+            } else if (artifact.getUrls().containsKey(UrlProtocol.HTTP)) {
+                status.add(downloadUrl(artifact.getUrls().get(UrlProtocol.HTTP), targetToken,
+                        artifact.getHashes().getSha1(), artifact.getSize()));
+            }
         }
 
         private static UpdateStatus downloadUrl(final String url, final String targetToken, final String sha1Hash,
@@ -236,22 +231,15 @@ public class DeviceSimulatorUpdater {
                         return new UpdateStatus(ResponseStatus.ERROR, message);
                     }
 
-                    final File tempFile = File.createTempFile("uploadFile", null);
-
                     // Exception squid:S2070 - not used for hashing sensitive
                     // data
                     @SuppressWarnings("squid:S2070")
                     final MessageDigest md = MessageDigest.getInstance("SHA-1");
 
-                    try (final DigestOutputStream dos = new DigestOutputStream(new FileOutputStream(tempFile), md)) {
-                        try (final BufferedOutputStream bdos = new BufferedOutputStream(dos)) {
-                            try (BufferedInputStream bis = new BufferedInputStream(response.getEntity().getContent())) {
-                                overallread = ByteStreams.copy(bis, bdos);
-                            }
-                        }
-                    } finally {
-                        if (tempFile != null && !tempFile.delete()) {
-                            LOGGER.error("Could not delete temporary file: {}", tempFile);
+                    try (final BufferedOutputStream bdos = new BufferedOutputStream(
+                            new DigestOutputStream(ByteStreams.nullOutputStream(), md))) {
+                        try (BufferedInputStream bis = new BufferedInputStream(response.getEntity().getContent())) {
+                            overallread = ByteStreams.copy(bis, bdos);
                         }
                     }