diff --git a/Makefile b/Makefile
index 26de91c00..f14987636 100644
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,20 @@ db ?= -cf
 help:
 	@echo "Nothing to see here, go away"
 
+# TODO: dockerify
 .PHONY: build
 build: frontend-build backend-build
 
+# TODO: dockerify
 #.PHONY: start
 #start: frontend-build
 #	$(MAKE) --jobs=2 frontend-watch backend-start
 
+# TODO: dockerify
 .PHONY: lint
 lint: frontend-lint backend-lint
 
+# TODO: dockerify
 .PHONY: test
 test: frontend-test backend-test i18n-check
 
diff --git a/docker/fradrive/Dockerfile b/docker/fradrive/Dockerfile
index d404a2775..5e4e37c8e 100644
--- a/docker/fradrive/Dockerfile
+++ b/docker/fradrive/Dockerfile
@@ -1,3 +1,8 @@
+# When making changes to and/or building fradrive-env locally, 
+# please remember to use the full url below as tag for the 
+# local image to ensure that the local instead of the upstream 
+# image will be used!
+# TODO: switch to pinned versions instead of latest!
 FROM registry.uniworx.de/fradrive/fradrive/fradrive-env:latest
 
 USER root