diff --git a/include/villas/kernel/rt.h b/include/villas/kernel/rt.h
index b6310ea55..c704735e4 100644
--- a/include/villas/kernel/rt.h
+++ b/include/villas/kernel/rt.h
@@ -9,8 +9,11 @@
 
 #pragma once
 
-int rt_init(int affinity, int priority);
+int rt_init(struct cfg *cfg);
 
+int rt_set_affinity(int affinity);
+
+int rt_set_priority(int priority);
 
 /** Checks for realtime (PREEMPT_RT) patched kernel.
  *
diff --git a/include/villas/kernel/vfio.h b/include/villas/kernel/vfio.h
index 4c662ad98..6c7c2868b 100644
--- a/include/villas/kernel/vfio.h
+++ b/include/villas/kernel/vfio.h
@@ -19,7 +19,7 @@
 
 #define VFIO_DEV(x)	"/dev/vfio/" x
 
-/* Forward declaration */
+/* Forward declarations */
 struct pci_dev;
 
 struct vfio_group {
diff --git a/lib/kernel/rt.c b/lib/kernel/rt.c
index e5202dba7..e8cac2b08 100644
--- a/lib/kernel/rt.c
+++ b/lib/kernel/rt.c
@@ -9,71 +9,90 @@
 #include <sched.h>
 
 #include "utils.h"
+#include "cfg.h"
+
 #include "kernel/kernel.h"
 #include "kernel/rt.h"
 
-int rt_init(int affinity, int priority)
+int rt_init(struct cfg *cfg)
 { INDENT
-	char isolcpus[255];
-	int is_isol, is_rt, ret;
+	int is_rt;
 
 	/* Use FIFO scheduler with real time priority */
 	is_rt = rt_is_preemptible();
 	if (is_rt)
 		warn("We recommend to use an PREEMPT_RT patched kernel!");
 
+	if (cfg->priority)
+		rt_set_priority(cfg->priority);
+	else
+		warn("You might want to use the 'priority' setting to increase VILLASnode's process priority");
+
+	if (cfg->affinity)
+		rt_set_affinity(cfg->affinity);
+	else
+		warn("You should use the 'affinity' setting to pin VILLASnode to dedicate CPU cores");
+
+	return 0;
+}
+
+int rt_set_affinity(int affinity)
+{
+	char isolcpus[255];
+	int is_isol, ret;
+
+	/* Pin threads to CPUs by setting the affinity */
+	cpu_set_t cset_pin, cset_isol, cset_non_isol;
+
+	cpuset_from_integer(affinity, &cset_pin);
+
+	is_isol = kernel_get_cmdline_param("isolcpus", isolcpus, sizeof(isolcpus));
+	if (is_isol) {
+		warn("You should reserve some cores for VILLASnode (see 'isolcpus')");
+
+		CPU_ZERO(&cset_isol);
+	}
+	else {
+		ret = cpulist_parse(isolcpus, &cset_isol, 0);
+		if (ret)
+			error("Invalid isolcpus cmdline parameter: %s", isolcpus);
+
+		CPU_XOR(&cset_non_isol, &cset_isol, &cset_pin);
+		if (CPU_COUNT(&cset_non_isol) > 0) {
+			char isol[128], pin[128];
+	
+			cpulist_create(isol, sizeof(isol), &cset_isol);
+			cpulist_create(pin, sizeof(pin), &cset_pin);
+
+			warn("Affinity setting includes cores which are not isolated: affinity=%s isolcpus=%s", pin, isol);
+		}
+	}
+
+	char list[128];
+	cpulist_create(list, sizeof(list), &cset_pin);
+
+	ret = sched_setaffinity(0, sizeof(cpu_set_t), &cset_pin);
+	if (ret)
+		serror("Failed to set CPU affinity to %s", list);
+
+	debug(LOG_KERNEL | 3, "Set affinity to %s", list);
+	
+	return 0;
+}
+
+int rt_set_priority(int priority)
+{
+	int ret;
 	struct sched_param param = {
 		.sched_priority = priority
 	};
 
-	if (priority) {
-		ret = sched_setscheduler(0, SCHED_FIFO, &param);
-		if (ret)
-			serror("Failed to set real time priority");
-
-		debug(3, "Task priority set to %u", priority);
-	}
-
-	if (affinity) {
-		/* Pin threads to CPUs by setting the affinity */
-		cpu_set_t cset_pin, cset_isol, cset_non_isol;
-
-		cpuset_from_integer(affinity, &cset_pin);
-
-		is_isol = kernel_get_cmdline_param("isolcpus", isolcpus, sizeof(isolcpus));
-		if (is_isol) {
-			warn("You should reserve some cores for VILLASnode (see 'isolcpus')");
-
-			CPU_ZERO(&cset_isol);
-		}
-		else {
-			ret = cpulist_parse(isolcpus, &cset_isol, 0);
-			if (ret)
-				error("Invalid isolcpus cmdline parameter: %s", isolcpus);
-
-			CPU_XOR(&cset_non_isol, &cset_isol, &cset_pin);
-			if (CPU_COUNT(&cset_non_isol) > 0) {
-				char isol[128], pin[128];
-		
-				cpulist_create(isol, sizeof(isol), &cset_isol);
-				cpulist_create(pin, sizeof(pin), &cset_pin);
-
-				warn("Affinity setting includes cores which are not isolated: affinity=%s isolcpus=%s", pin, isol);
-			}
-		}
-
-		char list[128];
-		cpulist_create(list, sizeof(list), &cset_pin);
-
-		ret = sched_setaffinity(0, sizeof(cpu_set_t), &cset_pin);
-		if (ret)
-			serror("Failed to set CPU affinity to %s", list);
-
-		debug(3, "Set affinity to %s", list);
-	}
-	else
-		warn("You should use the 'affinity' setting to pin VILLASnode to dedicate CPU cores");
+	ret = sched_setscheduler(0, SCHED_FIFO, &param);
+	if (ret)
+		serror("Failed to set real time priority");
 
+	debug(LOG_KERNEL | 3, "Task priority set to %u", priority);
+	
 	return 0;
 }