diff --git a/hermit/include/hermit/config.h b/hermit/include/hermit/config.h
index a5da3bf1b..17780bde6 100644
--- a/hermit/include/hermit/config.h
+++ b/hermit/include/hermit/config.h
@@ -32,8 +32,8 @@
 extern "C" {
 #endif
 
-#define MAX_CORES		128
-#define MAX_TASKS		16
+#define MAX_CORES		64
+#define MAX_TASKS		(MAX_CORES*2+2)
 #define MAX_ISLE		8
 #define MAX_FNAME		128
 #define TIMER_FREQ		100 /* in HZ */