diff --git a/docker/Makefile b/docker/Makefile
index 8dbf4d47cd59b982a7b1826ad40fdeb63722b593..080d1b8f4aa2a7124c2c6a6ff842c7bb33a46f1c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -14,14 +14,14 @@ FILES 		  = $(realpath ../../src)
 all: build run
 
 build:
-	docker build -t $(SANCUS_DOCKER_NODE1) --build-arg SANCUS_SECURITY=$(SANCUS_SECURITY) --build-arg SANCUS_KEY=$(SANCUS_KEY) -f $(DOCKERFILE_NODE1) .
-	docker build -t $(SANCUS_DOCKER_NODE2) --build-arg SANCUS_SECURITY=$(SANCUS_SECURITY) --build-arg SANCUS_KEY=$(SANCUS_KEY) -f $(DOCKERFILE_NODE2) .
-	docker build -t $(SANCUS_DOCKER_SWP) --build-arg SANCUS_SECURITY=$(SANCUS_SECURITY) --build-arg SANCUS_KEY=$(SANCUS_KEY) -f $(DOCKERFILE_SWP) .
+	docker build -t $(SANCUS_DOCKER_NODE1) --build-arg SANCUS_SECURITY=$(SANCUS_SECURITY) --build-arg SANCUS_KEY=$(SANCUS_KEY1) -f $(DOCKERFILE_NODE1) .
+	docker build -t $(SANCUS_DOCKER_NODE2) --build-arg SANCUS_SECURITY=$(SANCUS_SECURITY) --build-arg SANCUS_KEY=$(SANCUS_KEY2) -f $(DOCKERFILE_NODE2) .
+	docker build -t $(SANCUS_DOCKER_SWP) --build-arg SANCUS_SECURITY=$(SANCUS_SECURITY) --build-arg SANCUS_KEY=$(SANCUS_KEY3) -f $(DOCKERFILE_SWP) .
 
 container:
-	docker run -d --network="host" -v '$(FILES):/src' -w /src --name $(CONTAINER_NODE1) $(SANCUS_DOCKER_NODE1) #/bin/bash
-	docker run -d --network="host" -v '$(FILES):/src' -w /src --name $(CONTAINER_NODE2) $(SANCUS_DOCKER_NODE2) #/bin/bash
-	docker run -d --network="host" -v '$(FILES):/src' -w /src --name $(CONTAINER_SWP) $(SANCUS_DOCKER_SWP) #/bin/bash
+	docker run -it -d --network="host" -v '$(FILES):/src' -w /src --name $(CONTAINER_NODE1) $(SANCUS_DOCKER_NODE1) /bin/bash
+	docker run -it -d --network="host" -v '$(FILES):/src' -w /src --name $(CONTAINER_NODE2) $(SANCUS_DOCKER_NODE2) /bin/bash
+	docker run -it -d --network="host" -v '$(FILES):/src' -w /src --name $(CONTAINER_SWP) $(SANCUS_DOCKER_SWP) /bin/bash
 
 run:
 	@echo "Starting container $(CONTAINER)"
diff --git a/docker/Makefile.config b/docker/Makefile.config
index ee0f2850871e69e225cd7c05cb42522db346af85..5e01f219b6d49819db1f958b8c641167e42ade6a 100644
--- a/docker/Makefile.config
+++ b/docker/Makefile.config
@@ -11,14 +11,38 @@ SUPPORT_PKGS_URL = https://distrinet.cs.kuleuven.be/software/sancus/downloads
 ifndef SANCUS_SECURITY
     SANCUS_SECURITY=64
 endif
-ifndef SANCUS_KEY
+ifndef SANCUS_KEY1
     ifeq ($(SANCUS_SECURITY), 64)
-        SANCUS_KEY=deadbeefcafebabe
+        SANCUS_KEY1=deadbeefcafebabe
     else
         ifeq ($(SANCUS_SECURITY), 128)
-            SANCUS_KEY=deadbeefcafebabec0defeeddefec8ed
+            SANCUS_KEY1=deadbeefcafebabec0defeeddefec8ed
         else
-            $(error SANCUS_KEY not defined (security level $(SANCUS_SECURITY)))
+            $(error SANCUS_KEY1 not defined (security level $(SANCUS_SECURITY)))
+        endif
+    endif
+endif
+
+ifndef SANCUS_KEY2
+    ifeq ($(SANCUS_SECURITY), 64)
+        SANCUS_KEY2=aaaabeefcafeaaaa
+    else
+        ifeq ($(SANCUS_SECURITY), 128)
+            SANCUS_KEY2=aaaabeefcafebabec0defeeddefeaaaa
+        else
+            $(error SANCUS_KEY2 not defined (security level $(SANCUS_SECURITY)))
+        endif
+    endif
+endif
+
+ifndef SANCUS_KEY3
+    ifeq ($(SANCUS_SECURITY), 64)
+        SANCUS_KEY3=bbbbbeefcafebbbb
+    else
+        ifeq ($(SANCUS_SECURITY), 128)
+            SANCUS_KEY3=bbbbbeefcafebabec0defeeddefebbbb
+        else
+            $(error SANCUS_KEY3 not defined (security level $(SANCUS_SECURITY)))
         endif
     endif
 endif
@@ -30,4 +54,4 @@ endif
 
 # ---------------------------------------------------------------------------
 SET_ENV = export PATH=$(SANCUS_INSTALL_PREFIX)/bin:$$PATH; \
-          export LD_LIBRARY_PATH=$(SANCUS_INSTALL_PREFIX)/lib:$$LD_LIBRARY_PATH; 
+          export LD_LIBRARY_PATH=$(SANCUS_INSTALL_PREFIX)/lib:$$LD_LIBRARY_PATH;