diff --git a/iso/module.mk b/iso/module.mk
index 0d310101ee..36de814dfe 100644
--- a/iso/module.mk
+++ b/iso/module.mk
@@ -12,7 +12,7 @@ $(BUILD_DIR)/iso/isoroot-centos.done: \
 		$(BUILD_DIR)/iso/isoroot-dotfiles.done
 	mkdir -p $(ISOROOT)
 	rsync -rp $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ $(ISOROOT)
-	createrepo -g $(ISOROOT)/repodata/comps.xml -x 'rhel/*' \
+	createrepo -g $(ISOROOT)/comps.xml -x 'rhel/*' \
 		-u media://`head -1 $(ISOROOT)/.discinfo` $(ISOROOT)
 	$(ACTION.TOUCH)
 
diff --git a/mirror/centos/repo.mk b/mirror/centos/repo.mk
index 0158fba1e7..653bbcb5cc 100644
--- a/mirror/centos/repo.mk
+++ b/mirror/centos/repo.mk
@@ -52,9 +52,9 @@ show-yum-urls-centos: \
 		--destdir=$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages \
 		$(REQUIRED_RPMS)
 
-$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml: \
+$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml: \
 		export COMPSXML=$(shell wget -qO- $(MIRROR_CENTOS_OS_BASEURL)/repodata/repomd.xml | grep -m 1 '$(@F)' | awk -F'"' '{ print $$2 }')
-$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml:
+$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml:
 	@mkdir -p $(@D)
 	if ( echo $${COMPSXML} | grep -q '\.gz$$' ); then \
 		wget -O $@.gz $(MIRROR_CENTOS_OS_BASEURL)/$${COMPSXML}; \
@@ -65,7 +65,7 @@ $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml:
 
 $(BUILD_DIR)/mirror/centos/repo.done: \
 		$(BUILD_DIR)/mirror/centos/yum.done \
-		| $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml
-	createrepo -g $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml \
+		| $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml
+	createrepo -g $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml \
 		-o $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/
 	$(ACTION.TOUCH)
diff --git a/mirror/rhel/repo.mk b/mirror/rhel/repo.mk
index 8dbcd5f4a0..b736134887 100644
--- a/mirror/rhel/repo.mk
+++ b/mirror/rhel/repo.mk
@@ -52,9 +52,9 @@ show-yum-urls-rhel: \
 		--destdir=$(LOCAL_MIRROR_RHEL)/Packages \
 		`echo $(REQ_RHEL_RPMS) | /bin/sed 's/-[0-9][0-9\.a-zA-Z_-]\+//g'`
 
-$(LOCAL_MIRROR_RHEL)/repodata/comps.xml: \
+$(LOCAL_MIRROR_RHEL)/comps.xml: \
 		export COMPSXML=$(shell wget -qO- $(MIRROR_RHEL)/repodata/repomd.xml | grep -m 1 '$(@F)' | awk -F'"' '{ print $$2 }')
-$(LOCAL_MIRROR_RHEL)/repodata/comps.xml:
+$(LOCAL_MIRROR_RHEL)/comps.xml:
 	@mkdir -p $(@D)
 	if ( echo $${COMPSXML} | grep -q '\.gz$$' ); then \
 		wget -O $@.gz $(MIRROR_RHEL)/$${COMPSXML}; \
@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/rhel/fuel.done:
 $(BUILD_DIR)/mirror/rhel/repo.done: \
 		$(BUILD_DIR)/mirror/rhel/yum.done \
 		$(BUILD_DIR)/mirror/rhel/fuel.done \
-		| $(LOCAL_MIRROR_RHEL)/repodata/comps.xml
-	createrepo -g $(LOCAL_MIRROR_RHEL)/repodata/comps.xml \
+		| $(LOCAL_MIRROR_RHEL)/comps.xml
+	createrepo -g $(LOCAL_MIRROR_RHEL)/comps.xml \
 		-o $(LOCAL_MIRROR_RHEL)/ $(LOCAL_MIRROR_RHEL)/
 	$(ACTION.TOUCH)
diff --git a/mirror/src/module.mk b/mirror/src/module.mk
index a93078c93a..7731020879 100644
--- a/mirror/src/module.mk
+++ b/mirror/src/module.mk
@@ -7,14 +7,16 @@ else
 endif
 
 #
-# Download ostf packages directry from the github, because
+# Download ostf packages directly from the github, because
 # it updates often and we don't want to update main mirrors
 # on each commit
 #
-$(BUILD_DIR)/mirror/src/build.done: $(call depv,OSTF_TESTS_SHA)
-$(BUILD_DIR)/mirror/src/build.done: $(call depv,OSTF_PLUGIN_SHA)
-$(BUILD_DIR)/mirror/src/build.done: $(SOURCE_DIR)/requirements-src.txt \
-		| $(addprefix $(LOCAL_MIRROR_SRC)/, $(notdir $(REQUIRED_SRCS)))
+$(LOCAL_MIRROR_SRC)/$(OSTF_TESTS_SHA).zip:
 	wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) https://github.com/Mirantis/fuel-ostf-tests/archive/$(OSTF_TESTS_SHA).zip
+
+$(LOCAL_MIRROR_SRC)/$(OSTF_PLUGIN_SHA).zip:
 	wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) https://github.com/Mirantis/fuel-ostf-plugin/archive/$(OSTF_PLUGIN_SHA).zip
+
+$(BUILD_DIR)/mirror/src/build.done: $(SOURCE_DIR)/requirements-src.txt \
+		| $(addprefix $(LOCAL_MIRROR_SRC)/, $(notdir $(REQUIRED_SRCS)) $(OSTF_TESTS_SHA).zip $(OSTF_PLUGIN_SHA).zip)
 	$(ACTION.TOUCH)
diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk
index f32ee6fdf1..9ac8170e82 100644
--- a/packages/rpm/module.mk
+++ b/packages/rpm/module.mk
@@ -102,11 +102,11 @@ $(BUILD_DIR)/packages/rpm/repo.done: \
 		$(BUILD_DIR)/packages/rpm/rpm-rbenv-ruby.done \
 		$(BUILD_DIR)/packages/rpm/rpm-mcollective.done
 	find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' -exec cp -u {} $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages \;
-	createrepo -g $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/repodata/comps.xml \
+	createrepo -g $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml \
 		-o $(LOCAL_MIRROR_CENTOS_OS_BASEURL) $(LOCAL_MIRROR_CENTOS_OS_BASEURL)
 ifeq ($(CACHE_RHEL),1)
 	find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' -exec cp -u {} $(LOCAL_MIRROR_RHEL)/Packages \;
-	createrepo -g $(LOCAL_MIRROR_RHEL)/repodata/comps.xml \
+	createrepo -g $(LOCAL_MIRROR_RHEL)/comps.xml \
 		-o $(LOCAL_MIRROR_RHEL) $(LOCAL_MIRROR_RHEL)
 endif
 	$(ACTION.TOUCH)