diff --git a/packages/deb/module.mk b/packages/deb/module.mk
index 217d1d3e7..fedc25732 100644
--- a/packages/deb/module.mk
+++ b/packages/deb/module.mk
@@ -77,7 +77,7 @@ astute \
 fuel-agent \
 fuel-library$(FUEL_LIBRARY_VERSION) \
 fuel-mirror \
-fuel-nailgun-agent \
+nailgun-agent \
 network-checker
 
 $(eval $(foreach pkg,$(fuel_debian_packages),$(call build_deb,$(pkg))$(NEWLINE)))
diff --git a/packages/module.mk b/packages/module.mk
index c0cbbf5f4..75aeee0ed 100644
--- a/packages/module.mk
+++ b/packages/module.mk
@@ -70,7 +70,7 @@ $(eval $(call prepare_git_source,python-fuelclient,python-fuelclient-$(PACKAGE_V
 #FUEL_AGENT_PKGS
 $(eval $(call prepare_git_source,fuel-agent,fuel-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-agent,HEAD,$(FUEL_AGENT_GERRIT_COMMIT)))
 #FUEL_NAILGUN_AGENT_PKGS
-$(eval $(call prepare_git_source,fuel-nailgun-agent,fuel-nailgun-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-nailgun-agent,HEAD,$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
+$(eval $(call prepare_git_source,nailgun-agent,nailgun-agent-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/nailgun-agent,HEAD,$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
 #FUEL-IMAGE PKGS
 $(eval $(call prepare_git_source,fuel-main,fuel-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-main,HEAD,$(FUELMAIN_GERRIT_COMMIT)))
 #FUEL-MIRROR PKGS
diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk
index 4cacd39bf..b235f1d72 100644
--- a/packages/rpm/module.mk
+++ b/packages/rpm/module.mk
@@ -85,12 +85,12 @@ astute \
 fuel-agent \
 fuel-library$(FUEL_LIBRARY_VERSION) \
 fuel-main \
-fuelmenu \
 fuel-mirror \
 fuel-nailgun \
-fuel-nailgun-agent \
 fuel-ostf \
 fuel-ui \
+fuelmenu \
+nailgun-agent \
 network-checker \
 python-fuelclient \
 shotgun
diff --git a/repos.mk b/repos.mk
index 34343dd83..b467bbfec 100644
--- a/repos.mk
+++ b/repos.mk
@@ -32,7 +32,7 @@ endef
 $(eval $(call build_repo,fuel-nailgun,$(NAILGUN_REPO),$(NAILGUN_COMMIT),$(NAILGUN_GERRIT_URL),$(NAILGUN_GERRIT_COMMIT)))
 $(eval $(call build_repo,python-fuelclient,$(PYTHON_FUELCLIENT_REPO),$(PYTHON_FUELCLIENT_COMMIT),$(PYTHON_FUELCLIENT_GERRIT_URL),$(PYTHON_FUELCLIENT_GERRIT_COMMIT)))
 $(eval $(call build_repo,fuel-agent,$(FUEL_AGENT_REPO),$(FUEL_AGENT_COMMIT),$(FUEL_AGENT_GERRIT_URL),$(FUEL_AGENT_GERRIT_COMMIT)))
-$(eval $(call build_repo,fuel-nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NAILGUN_AGENT_COMMIT),$(FUEL_NAILGUN_AGENT_GERRIT_URL),$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
+$(eval $(call build_repo,nailgun-agent,$(FUEL_NAILGUN_AGENT_REPO),$(FUEL_NAILGUN_AGENT_COMMIT),$(FUEL_NAILGUN_AGENT_GERRIT_URL),$(FUEL_NAILGUN_AGENT_GERRIT_COMMIT)))
 $(eval $(call build_repo,astute,$(ASTUTE_REPO),$(ASTUTE_COMMIT),$(ASTUTE_GERRIT_URL),$(ASTUTE_GERRIT_COMMIT)))
 $(eval $(call build_repo,fuel-library,$(FUELLIB_REPO),$(FUELLIB_COMMIT),$(FUELLIB_GERRIT_URL),$(FUELLIB_GERRIT_COMMIT)))
 $(eval $(call build_repo,fuel-ostf,$(OSTF_REPO),$(OSTF_COMMIT),$(OSTF_GERRIT_URL),$(OSTF_GERRIT_COMMIT)))