diff --git a/Makefile b/Makefile
index e9ff16e7..0f38724d 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ run-supervisor: supervisor-dind
 	cd tools/dind \
 	&& ./resinos-in-container/resinos-in-container.sh \
 		--detach \
-		--config "$$(pwd)/$(CONFIG_FILENAME)" \
+		--config "$(CONFIG_FILENAME)" \
 		--image $(DIND_IMAGE) \
 		--id $(CONTAINER_NAME) \
 		--extra-args "${SUPERVISOR_DIND_MOUNTS}"
diff --git a/dindctl b/dindctl
index 919ba12b..6a530919 100755
--- a/dindctl
+++ b/dindctl
@@ -107,7 +107,7 @@ function parseOptions {
 				CLEAN_VOLUMES="false"
 				;;
 			*)
-				echo "Warning: unknown argument: $arg"
+				echo "Warning: unknown argument: $1"
 				;;
 		esac
 		shift
@@ -136,8 +136,8 @@ function refreshSupervisorSrc {
 }
 
 function runDind {
-	if [ ! -f "tools/dind/resinos-in-container/resinos-in-container.sh" ]; then
-		git submodule update --init
+	if [ ! -f "$SUPERVISOR_BASE_DIR/tools/dind/resinos-in-container/resinos-in-container.sh" ]; then
+		(cd $SUPERVISOR_BASE_DIR; git submodule update --init)
 	fi
 	if [ "$MOUNT_DIST" = "true" ]; then
 		buildSupervisorSrc