diff --git a/templates/Makefile b/templates/Makefile
index 4ef3964..9dfce2e 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,9 +6,9 @@ PROD_BUILD_DIR              = $(BUILD_DIR)/prod
 
 TEMPLATES_SRC_DIR           = .
 TEMPLATES_SRC_FILES         = $(wildcard $(TEMPLATES_SRC_DIR)/*.tmpl)
-TEMPLATES_DEVEL_BUILD_DIR   = $(DEVEL_BUILD_DIR)
+TEMPLATES_DEVEL_BUILD_DIR   = $(DEVEL_BUILD_DIR)/templates
 TEMPLATES_DEVEL_BUILD_FILES = $(patsubst $(TEMPLATES_SRC_DIR)/%, $(TEMPLATES_DEVEL_BUILD_DIR)/%, $(TEMPLATES_SRC_FILES))
-TEMPLATES_PROD_BUILD_DIR    = $(PROD_BUILD_DIR)
+TEMPLATES_PROD_BUILD_DIR    = $(PROD_BUILD_DIR)/templates
 TEMPLATES_PROD_BUILD_FILES  = $(patsubst $(TEMPLATES_SRC_DIR)/%, $(TEMPLATES_PROD_BUILD_DIR)/%, $(TEMPLATES_SRC_FILES))
 
 devel: devel-templates