diff --git a/software/Makefile b/software/Makefile
index af71efbcf107aa68bafeb40283419b53392fb3b2..57a42974482477660a1a55402528e73ff19d281c 100644
--- a/software/Makefile
+++ b/software/Makefile
@@ -1,6 +1,6 @@
 APPLICATION=software
 #BOARD ?= inga_blue
-RIOTBASE ?= ../../../RIOT/PinChangeInterruptBranch/RIOT
+RIOTBASE ?= ../../RIOT/
 
 BOARD_USES_I2C := inga_red inga_blue /
 
@@ -18,7 +18,9 @@ ifneq (,$(filter $(BOARD),$(BOARD_USES_I2C)))
 	USEMODULE += periph_i2c
 endif
 
-NODE_ID ?= 0
+export DOCKER_ENV_VARS += NODE_ID 
+
+NODE_ID ?= 0x00
 CFLAGS += -DNODE_ID=$(NODE_ID)
 CFLAGS += -DDEBUG_ASSERT_VERBOSE
 CFLAGS += -DGNRC_PKTBUF_SIZE=512