diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/DataTransferWsLocator.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/DataTransferWsLocator.java
index 1dc61a04660f483f846936fc20b81eb064e9ca51..40d2bbabb680ea7d0f4066b024802507e51610aa 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/DataTransferWsLocator.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/DataTransferWsLocator.java
@@ -22,7 +22,7 @@ public class DataTransferWsLocator extends org.apache.axis.client.Service implem
     }
 
     // Use to get a proxy class for DataTransferWsSoap
-    private java.lang.String DataTransferWsSoap_address = "http://utepstorage.it4i.cz/HaasWsFiji/DataTransferWs.asmx";
+    private java.lang.String DataTransferWsSoap_address = "http://haas.vsb.cz/HaasWsFiji/DataTransferWs.asmx";
 
     public java.lang.String getDataTransferWsSoapAddress() {
         return DataTransferWsSoap_address;
diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsLocator.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsLocator.java
index cb0904a3f749ff9ca72b149d447c54c04527164b..265ada8778c08eb35fbbf6824b831ea677fac018 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsLocator.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/FileTransferWsLocator.java
@@ -22,7 +22,7 @@ public class FileTransferWsLocator extends org.apache.axis.client.Service implem
     }
 
     // Use to get a proxy class for FileTransferWsSoap
-    private java.lang.String FileTransferWsSoap_address = "http://utepstorage.it4i.cz/HaasWsFiji/FileTransferWs.asmx";
+    private java.lang.String FileTransferWsSoap_address = "http://haas.vsb.cz/HaasWsFiji/FileTransferWs.asmx";
 
     public java.lang.String getFileTransferWsSoapAddress() {
         return FileTransferWsSoap_address;
@@ -67,7 +67,7 @@ public class FileTransferWsLocator extends org.apache.axis.client.Service implem
 
 
     // Use to get a proxy class for FileTransferWsSoap12
-    private java.lang.String FileTransferWsSoap12_address = "http://utepstorage.it4i.cz/HaasWsFiji/FileTransferWs.asmx";
+    private java.lang.String FileTransferWsSoap12_address = "http://haas.vsb.cz/HaasWsFiji/FileTransferWs.asmx";
 
     public java.lang.String getFileTransferWsSoap12Address() {
         return FileTransferWsSoap12_address;
diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsLocator.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsLocator.java
index 1d29566ea4093b3b7a6dcb17870bcfaddeb87bd2..b3fc4fc57c275a4cdd14af1300b559d8566b4cd1 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsLocator.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/JobManagementWsLocator.java
@@ -22,7 +22,7 @@ public class JobManagementWsLocator extends org.apache.axis.client.Service imple
     }
 
     // Use to get a proxy class for JobManagementWsSoap
-    private java.lang.String JobManagementWsSoap_address = "http://utepstorage.it4i.cz/HaasWsFiji/JobManagementWS.asmx";
+    private java.lang.String JobManagementWsSoap_address = "http://haas.vsb.cz/HaasWsFiji/JobManagementWS.asmx";
 
     public java.lang.String getJobManagementWsSoapAddress() {
         return JobManagementWsSoap_address;
diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWsLocator.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWsLocator.java
index f8822a40d7bc346ae18d9b58e0ee32e70c1f9fa7..22e5606eeb413c2dafecfc547d67113164669d25 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWsLocator.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/proxy/UserAndLimitationManagementWsLocator.java
@@ -22,7 +22,7 @@ public class UserAndLimitationManagementWsLocator extends org.apache.axis.client
     }
 
     // Use to get a proxy class for UserAndLimitationManagementWsSoap
-    private java.lang.String UserAndLimitationManagementWsSoap_address = "http://utepstorage.it4i.cz/HaasWsFiji/UserAndLimitationManagementWs.asmx";
+    private java.lang.String UserAndLimitationManagementWsSoap_address = "http://haas.vsb.cz/HaasWsFiji/UserAndLimitationManagementWs.asmx";
 
     public java.lang.String getUserAndLimitationManagementWsSoapAddress() {
         return UserAndLimitationManagementWsSoap_address;
@@ -67,7 +67,7 @@ public class UserAndLimitationManagementWsLocator extends org.apache.axis.client
 
 
     // Use to get a proxy class for UserAndLimitationManagementWsSoap12
-    private java.lang.String UserAndLimitationManagementWsSoap12_address = "http://utepstorage.it4i.cz/HaasWsFiji/UserAndLimitationManagementWs.asmx";
+    private java.lang.String UserAndLimitationManagementWsSoap12_address = "http://haas.vsb.cz/HaasWsFiji/UserAndLimitationManagementWs.asmx";
 
     public java.lang.String getUserAndLimitationManagementWsSoap12Address() {
         return UserAndLimitationManagementWsSoap12_address;
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
index 300159a1dfd7ede7ee2323dbfb2b548cf99704ea..979d118452fd0f7f336d3dd5fb6b12d94699005c 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java
@@ -10,7 +10,7 @@ public interface Constants {
 	int HAAS_CLUSTER_NODE_TYPE = 6;
 	int HAAS_TEMPLATE_ID = 4;
 	String HAAS_PROJECT_ID = "DD-17-31";
-	int HAAS_TIMEOUT = 9600;
+	int HAAS_TIMEOUT = 9600; //Walltime in seconds
 
 	String SPIM_OUTPUT_FILENAME_PATTERN = "spim.outputFilenamePattern";
 	String CONFIG_YAML = "config.yaml";