diff --git a/Makefile b/Makefile
index 7ef5709..907024e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,18 @@ DEVICE_PORT=$(shell bash conf-tool.sh read DEVICE_PORT)
 USER_KEY=$(shell bash conf-tool.sh read USER_KEY)
 USER_EMAIL=$(shell bash conf-tool.sh read USER_EMAIL)
 
-all:
+all: .config
+
+.config:
+	bash conf-tool.sh
+	echo "Please re-run the command"
+	exit 2
 
 clean:
 	rm -rf *.img *.model *.manifest snaps
 
 %.model: boards/%.yaml # sign a model file
-	cat definition.yaml $< | python -c "import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=2)" | sed "s|TIMESTAMP|$(shell date -Iseconds --utc)|g" | snap sign -k "$USER_KEY" > $@
+	cat definition.yaml $< | python -c "import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=2)" | sed "s|TIMESTAMP|$(shell date -Iseconds --utc)|g" | snap sign -k "$(USER_KEY)" > $@
 snaps/%: deps/%.yaml
 	node build-tool.js --env $(ENV) --channel $(CHANNEL) --board $*
 %.img: %.model snaps/% $(ENV).cloud-init.yaml # build an image
diff --git a/conf-tool.sh b/conf-tool.sh
index 22bb2cc..9dbe3e2 100644
--- a/conf-tool.sh
+++ b/conf-tool.sh
@@ -11,6 +11,7 @@ if [ "x$1" == "xread" ]; then
   fi
   . .config
   echo "${!2}"
+  exit
 fi
 
 signing_key=$(snap keys | tail -n 1 | sed "s| |\n|g" | head -n 1) # value if no key exists: "No"