diff --git a/Dockerfile b/Dockerfile
index 06bdadf1..1f9a5840 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,7 @@ WORKDIR ODrive/Firmware
 # Must attach the firmware tree into the container
 CMD \
 	# Regenerate python interface
+	mkdir ../Firmware/autogen; \
 	python interface_generator_stub.py \
 	--definitions odrive-interface.yaml \
 	--template ../tools/enums_template.j2 \
@@ -26,6 +27,7 @@ CMD \
 	--definitions odrive-interface.yaml \
 	--template ../tools/arduino_enums_template.j2 \
 	--output ../Arduino/ODriveArduino/ODriveEnums.h && \
+	python ../tools/odrive/version.py --output ../Firmware/autogen/version.c && \
 	# Hack around Tup's dependency on FUSE
 	tup init && \
 	tup generate build.sh && \
diff --git a/dockerbuild.sh b/dockerbuild.sh
index acf77e9d..62959930 100755
--- a/dockerbuild.sh
+++ b/dockerbuild.sh
@@ -17,7 +17,7 @@ function build {
     docker build -t odrive-build-img .
 
     echo "Build in container"
-    docker run -v $(pwd):/ODrive --name odrive-build-cont odrive-build-img:latest
+    docker run -it -v $(pwd):/ODrive --name odrive-build-cont --user $(id -u)  odrive-build-img:latest 
 }
 
 function usage {