diff --git a/Makefile b/Makefile
index 49a87e9..c21fde3 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,10 @@ build.%: | git/poky
 %-upload: | build.$(subst -upload,,%) git/poky
 	$(Q)cd build.$(CUR_MACHINE) && ../scripts/upload-build.sh $(CUR_MACHINE) $(FEED_NAME)
 
+%-clean: | build.$(subst -clean,,%) git/poky
+	$(Q)cd build.$(CUR_MACHINE) && rm -rf tmp
+	$(Q)cd build.$(CUR_MACHINE) && ../git/poky/scripts/sstate-cache-management.sh  --cache-dir=sstate-cache -y -L --stamps-dir=tmp/stamps/
+
 # Create all build directories, build everything, upload everything, clean everything
 setup-all: | $(foreach machine, $(MACHINES), $(machine)-setup)
 
@@ -142,6 +146,7 @@ ifndef WEB_FILES
 	$(error "Please call with make make-server-structure WEB_FILES=...")
 endif
 	$(Q)$(foreach machine, $(MACHINES), \
+		mkdir $(WEB_FILES)/$(machine); \
 		mkdir $(WEB_FILES)/$(machine)/$(SYSMOCOM_RELEASE); \
 		mkdir $(WEB_FILES)/$(machine)/$(SYSMOCOM_RELEASE)-testing; \
 		mkdir $(WEB_FILES)/$(machine)/$(SYSMOCOM_RELEASE)-nightly; \