diff --git a/config.mk b/config.mk
index 9b115067e..4108b005a 100644
--- a/config.mk
+++ b/config.mk
@@ -78,6 +78,7 @@ FUELMENU_COMMIT?=master
 SHOTGUN_COMMIT?=master
 NETWORKCHECKER_COMMIT?=master
 FUELUPGRADE_COMMIT?=master
+FUEL_UI?=master
 
 FUELLIB_REPO?=https://github.com/openstack/fuel-library.git
 NAILGUN_REPO?=https://github.com/openstack/fuel-web.git
@@ -91,6 +92,7 @@ FUELMENU_REPO?=https://github.com/openstack/fuel-menu.git
 SHOTGUN_REPO?=https://github.com/openstack/shotgun.git
 NETWORKCHECKER_REPO?=https://github.com/openstack/network-checker.git
 FUELUPGRADE_REPO?=https://github.com/openstack/fuel-upgrade.git
+FUEL_UI_REPO?=https://github.com/openstack/fuel-ui.git
 
 # Gerrit URLs and commits
 FUELLIB_GERRIT_URL?=https://review.openstack.org/openstack/fuel-library
@@ -105,6 +107,7 @@ FUELMENU_GERRIT_URL?=https://review.openstack.org/openstack/fuel-menu
 SHOTGUN_GERRIT_URL?=https://review.openstack.org/openstack/shotgun
 NETWORKCHECKER_GERRIT_URL?=https://review.openstack.org/openstack/network-checker
 FUELUPGRADE_GERRIT_URL?=https://review.openstack.org/openstack/fuel-upgrade
+FUEL_UI_GERRIT_URL?=https://review.openstack.org/openstack/fuel-ui
 
 FUELLIB_GERRIT_COMMIT?=none
 NAILGUN_GERRIT_COMMIT?=none
@@ -119,6 +122,7 @@ FUELMENU_GERRIT_COMMIT?=none
 SHOTGUN_GERRIT_COMMIT?=none
 NETWORKCHECKER_GERRIT_COMMIT?=none
 FUELUPGRADE_GERRIT_COMMIT?=none
+FUEL_UI_GERRIT_COMMIT?=none
 
 LOCAL_MIRROR_CENTOS:=$(LOCAL_MIRROR)/centos
 LOCAL_MIRROR_CENTOS_OS_BASEURL:=$(LOCAL_MIRROR_CENTOS)/os/$(CENTOS_ARCH)
diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
index 7944bb7f9..11d1eae65 100755
--- a/iso/bootstrap_admin_node.sh
+++ b/iso/bootstrap_admin_node.sh
@@ -29,6 +29,7 @@ fuel \
 fuel-bootstrap-cli \
 fuel-openstack-metadata \
 fuel-utils \
+fuel-ui \
 gdisk \
 lrzip \
 lsof \
diff --git a/packages/module.mk b/packages/module.mk
index ddff4aa77..c0cbbf5f4 100644
--- a/packages/module.mk
+++ b/packages/module.mk
@@ -77,6 +77,8 @@ $(eval $(call prepare_git_source,fuel-main,fuel-$(PACKAGE_VERSION).tar.gz,$(BUIL
 $(eval $(call prepare_git_source,fuel-mirror,fuel-mirror-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-mirror,HEAD,$(FUEL_MIRROR_GERRIT_COMMIT)))
 #FUEL-MENU PKGS
 $(eval $(call prepare_git_source,fuelmenu,fuelmenu-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuelmenu,HEAD,$(FUELMENU_GERRIT_COMMIT)))
+#FUEL-UI PKGS
+$(eval $(call prepare_git_source,fuel-ui,fuel-ui-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-ui,HEAD,$(FUEL_UI_GERRIT_COMMIT)))
 #SHOTGUN PKGS
 $(eval $(call prepare_git_source,shotgun,shotgun-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/shotgun,HEAD,$(SHOTGUN_GERRIT_COMMIT)))
 #NETWORK-CHECKER PKGS
diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk
index b80f351a1..4cacd39bf 100644
--- a/packages/rpm/module.mk
+++ b/packages/rpm/module.mk
@@ -90,6 +90,7 @@ fuel-mirror \
 fuel-nailgun \
 fuel-nailgun-agent \
 fuel-ostf \
+fuel-ui \
 network-checker \
 python-fuelclient \
 shotgun
diff --git a/repos.mk b/repos.mk
index ddb11e8a4..34343dd83 100644
--- a/repos.mk
+++ b/repos.mk
@@ -41,6 +41,7 @@ $(eval $(call build_repo,fuelmenu,$(FUELMENU_REPO),$(FUELMENU_COMMIT),$(FUELMENU
 $(eval $(call build_repo,shotgun,$(SHOTGUN_REPO),$(SHOTGUN_COMMIT),$(SHOTGUN_GERRIT_URL),$(SHOTGUN_GERRIT_COMMIT)))
 $(eval $(call build_repo,network-checker,$(NETWORKCHECKER_REPO),$(NETWORKCHECKER_COMMIT),$(NETWORKCHECKER_GERRIT_URL),$(NETWORKCHECKER_GERRIT_COMMIT)))
 $(eval $(call build_repo,fuel-upgrade,$(FUELUPGRADE_REPO),$(FUELUPGRADE_COMMIT),$(FUELUPGRADE_GERRIT_URL),$(FUELUPGRADE_GERRIT_COMMIT)))
+$(eval $(call build_repo,fuel-ui,$(FUEL_UI_REPO),$(FUEL_UI_COMMIT),$(FUEL_UI_GERRIT_URL),$(FUEL_UI_GERRIT_COMMIT)))
 
 $(BUILD_DIR)/repos/fuel-main.done:
 	ln -s $(SOURCE_DIR) $(BUILD_DIR)/repos/fuel-main