diff --git a/Vedvfile.manjaro b/Vedvfile.manjaro
index 7ad57dd..fbc8027 100644
--- a/Vedvfile.manjaro
+++ b/Vedvfile.manjaro
@@ -7,7 +7,7 @@ RUN echo 'export IMAGE_BUILDING=true' | \
 WORKDIR /home/vedv/ydf
 
 # generate mirrors
-RUN sudo pacman-mirrors --country United_States
+RUN sudo pacman-mirrors --fasttrack
 
 # install flatpak gnome base system
 RUN sudo -H flatpak install --assumeyes --noninteractive \
diff --git a/packages.env b/packages.env
index 6210570..5d3ac3f 100644
--- a/packages.env
+++ b/packages.env
@@ -22,10 +22,14 @@ PKG_DEV_ANY_NPM=(
 #
 
 ## RUNTIME
-PKG_RUN_MANJARO_YAY=(
-
+PKG_RUN_MANJARO_PACMAN=(
+  bash
 )
 
+# PKG_RUN_MANJARO_YAY=(
+
+# )
+
 ## OPTIONAL
 PKG_OPT_MANJARO_PACMAN=(
   yay
@@ -62,7 +66,9 @@ PKG_DEV_MANJARO_NPM=("${PKG_DEV_ANY_NPM[@]}")
 #
 
 ## RUNTIME
-PKG_RUN_UBUNTU_APT=()
+PKG_RUN_UBUNTU_APT=(
+  bash
+)
 
 # PKG_RUN_UBUNTU_PIP=("${PKG_RUN_ANY_PIP[@]}")
 # PKG_RUN_UBUNTU_NPM=("${PKG_RUN_ANY_NPM[@]}")
diff --git a/src/usr/lib/ydf/components/package/ydf-package-service.bash b/src/usr/lib/ydf/components/package/ydf-package-service.bash
index 6c4aab1..e86008d 100644
--- a/src/usr/lib/ydf/components/package/ydf-package-service.bash
+++ b/src/usr/lib/ydf/components/package/ydf-package-service.bash
@@ -35,7 +35,8 @@ readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON='@flatpak @snap install docke
 readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_ANY="preinstall ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
 # MANJARO
 readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_MANJARO="preinstall @pacman @yay ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
-readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_UBUNTU="preinstall ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
+
+readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_UBUNTU="preinstall @apt @apt-get ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
 
 #
 # FUNCTIONS
@@ -556,6 +557,48 @@ ydf::package_service::__instruction_dconf_ini() {
   dconf load / <dconf.ini
 }
 
+#
+# Execute @apt instruction
+#
+# Arguments:
+#   pkg_name  string    package name
+#
+# Returns:
+#   0 on success, non-zero on error.
+#
+ydf::package_service::__instruction_@apt() {
+  local -r pkg_name="$1"
+  # select the first no empty line
+  local -r apt_pkg_name="$(ydf::utils::text_file_to_words @apt)"
+
+  sudo -E apt update -y &&
+    sudo -E apt upgrade -y
+
+  eval sudo -H DEBIAN_FRONTEND=noninteractive apt install -y \
+    "${apt_pkg_name:-"$pkg_name"}"
+}
+
+#
+# Execute @apt-get instruction
+#
+# Arguments:
+#   pkg_name  string    package name
+#
+# Returns:
+#   0 on success, non-zero on error.
+#
+ydf::package_service::__instruction_@apt-get() {
+  local -r pkg_name="$1"
+  # select the first no empty line
+  local -r apt_pkg_name="$(ydf::utils::text_file_to_words @apt-get)"
+
+  sudo -E apt-get update -y &&
+    sudo -E apt-get upgrade -y
+
+  eval sudo -H DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    "${apt_pkg_name:-"$pkg_name"}"
+}
+
 #
 # Install a ydotfile package from a directory
 #
diff --git a/tests/fixtures/packages/25bat@apt/@apt b/tests/fixtures/packages/25bat@apt/@apt
new file mode 100644
index 0000000..af53251
--- /dev/null
+++ b/tests/fixtures/packages/25bat@apt/@apt
@@ -0,0 +1,2 @@
+
+bat
diff --git a/tests/fixtures/packages/26exa@apt-get/@apt-get b/tests/fixtures/packages/26exa@apt-get/@apt-get
new file mode 100644
index 0000000..db8c346
--- /dev/null
+++ b/tests/fixtures/packages/26exa@apt-get/@apt-get
@@ -0,0 +1 @@
+exa
diff --git a/tests/fixtures/packages/bat/@apt b/tests/fixtures/packages/bat/@apt
new file mode 100644
index 0000000..e69de29
diff --git a/tests/fixtures/packages/exa/@apt-get b/tests/fixtures/packages/exa/@apt-get
new file mode 100644
index 0000000..e69de29
diff --git a/tests/usr/lib/ydf/components/package/ydf-package-command.f.bats b/tests/usr/lib/ydf/components/package/ydf-package-command.f.bats
index 9f4ada2..5373263 100644
--- a/tests/usr/lib/ydf/components/package/ydf-package-command.f.bats
+++ b/tests/usr/lib/ydf/components/package/ydf-package-command.f.bats
@@ -2,6 +2,8 @@ load test_helper
 
 setup() {
   export YDF_PACKAGE_SERVICE_DEFAULT_OS="$TEST_OS"
+  export E_YDF_PACKAGE_SERVICE_DEFAULT_OS="$TEST_OS"
+
   export E_YDF_UTILS_NO_MSG=true
 
   if [[ -f /home/vedv/.yzsh-gen.env ]]; then
@@ -860,3 +862,87 @@ preinstall: preinstall succeed"
   assert [ -L '/home/vedv/.yzsh/themes/local/24ydftheme.theme.zsh' ]
   assert [ -f '/home/vedv/.yzsh/themes/local/24ydftheme.theme.zsh' ]
 }
+
+# Tests for ydf package install 25bat@apt
+@test "ydf package install 25bat@apt Should succeed" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y bat
+
+  local -r _package_name="25bat@apt"
+
+  run ydf package install "$_package_name"
+
+  assert_success
+  assert_output --partial "Setting up bat"
+
+  run apt -qq list --installed bat
+
+  assert_success
+  assert_output --partial "bat/"
+}
+
+# Tests for ydf package install bat
+@test "ydf package install bat Should succeed with @apt" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y bat
+
+  local -r _package_name="bat"
+
+  run ydf package install "$_package_name"
+
+  assert_success
+  assert_output --partial "Setting up bat"
+
+  run apt -qq list --installed bat
+
+  assert_success
+  assert_output --partial "bat/"
+}
+
+# Tests for ydf package install 26exa@apt-get
+@test "ydf package install 26exa@apt-get Should succeed with @apt-get" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y exa
+
+  local -r _package_name="26exa@apt-get"
+
+  run ydf package install "$_package_name"
+
+  assert_success
+  assert_output --partial "Setting up exa"
+
+  run apt -qq list --installed exa
+
+  assert_success
+  assert_output --partial "exa/"
+}
+
+# Tests for ydf package install exa
+@test "ydf package install exa Should succeed with @apt-get" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y exa
+
+  local -r _package_name="exa"
+
+  run ydf package install "$_package_name"
+
+  assert_success
+  assert_output --partial "Setting up exa"
+
+  run apt -qq list --installed exa
+
+  assert_success
+  assert_output --partial "exa/"
+}
diff --git a/tests/usr/lib/ydf/components/package/ydf-package-service.i.bats b/tests/usr/lib/ydf/components/package/ydf-package-service.i.bats
index 978ea10..da9a5f7 100644
--- a/tests/usr/lib/ydf/components/package/ydf-package-service.i.bats
+++ b/tests/usr/lib/ydf/components/package/ydf-package-service.i.bats
@@ -1334,3 +1334,87 @@ install: HOME: /home/vedv"
   assert [ -L '/home/vedv/.yzsh/themes/local/24ydftheme.theme.zsh' ]
   assert [ -f '/home/vedv/.yzsh/themes/local/24ydftheme.theme.zsh' ]
 }
+
+# Tests for ydf::package_service::__instruction_@apt()
+@test "ydf::package_service::__instruction_@apt() Should succeed With 25bat@apt" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y bat
+
+  cd "${TEST_FIXTURES_DIR}/packages/25bat@apt"
+
+  run ydf::package_service::__instruction_@apt '25bat@apt'
+
+  assert_success
+  assert_output --partial "Setting up bat"
+
+  run apt -qq list --installed bat
+
+  assert_success
+  assert_output --partial "bat/"
+}
+
+# Tests for ydf::package_service::__instruction_@apt()
+@test "ydf::package_service::__instruction_@apt() Should succeed With bat" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y bat
+
+  cd "${TEST_FIXTURES_DIR}/packages/bat"
+
+  run ydf::package_service::__instruction_@apt 'bat'
+
+  assert_success
+  assert_output --partial "Setting up bat"
+
+  run apt -qq list --installed bat
+
+  assert_success
+  assert_output --partial "bat/"
+}
+
+# Tests for ydf::package_service::__instruction_@apt-get()
+@test "ydf::package_service::__instruction_@apt-get() Should succeed With 25exa@apt-get" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y exa
+
+  cd "${TEST_FIXTURES_DIR}/packages/26exa@apt-get"
+
+  run ydf::package_service::__instruction_@apt-get '26exa@apt-get'
+
+  assert_success
+  assert_output --partial "Setting up exa"
+
+  run apt -qq list --installed exa
+
+  assert_success
+  assert_output --partial "exa/"
+}
+
+# Tests for ydf::package_service::__instruction_@apt-get()
+@test "ydf::package_service::__instruction_@apt-get() Should succeed With exa" {
+  if [[ "$YDF_PACKAGE_SERVICE_DEFAULT_OS" != ubuntu ]]; then
+    skip "Only for ubuntu"
+  fi
+
+  sudo -E DEBIAN_FRONTEND=noninteractive apt remove -y exa
+
+  cd "${TEST_FIXTURES_DIR}/packages/exa"
+
+  run ydf::package_service::__instruction_@apt-get 'exa'
+
+  assert_success
+  assert_output --partial "Setting up exa"
+
+  run apt -qq list --installed exa
+
+  assert_success
+  assert_output --partial "exa/"
+}
diff --git a/tools/install-dev-manjaro b/tools/install-dev-manjaro
index 681e863..ee530d8 100755
--- a/tools/install-dev-manjaro
+++ b/tools/install-dev-manjaro
@@ -12,11 +12,13 @@ readonly IMAGE_BUILDING="${IMAGE_BUILDING:-false}"
 
 sudo pacman -Syu --noconfirm --needed yay
 
-# Install yay packages
+# Install packages
+
+## yay packages
 yay -Sy --noconfirm --needed "${PKG_DEV_MANJARO_YAY[@]}"
 
+### install vedv
 if [[ "$IMAGE_BUILDING" == false ]]; then
-  # Install vedv
   yay -Sy --noconfirm --needed vedv-git &&
     sudo pacman -Syu --noconfirm --needed "$(mhwd-kernel -li | grep -Po '\(\Klinux\d+\S*(?=\))')-virtualbox-host-modules" &&
     sudo vboxreload
@@ -25,7 +27,7 @@ if [[ "$IMAGE_BUILDING" == false ]]; then
 EOF
 fi
 
-# Install npm packages
+## npm packages
 sudo -H npm install -g "${PKG_DEV_MANJARO_NPM[@]}"
 
 # Configure
diff --git a/tools/install-dev-ubuntu b/tools/install-dev-ubuntu
index 04d9d0b..1cf4e01 100755
--- a/tools/install-dev-ubuntu
+++ b/tools/install-dev-ubuntu
@@ -15,31 +15,32 @@ export DEBIAN_FRONTEND=noninteractive
 sudo -E apt-get update -y &&
   sudo -E apt-get upgrade -y
 
-sudo -E apt-get install -y "${PKG_DEV_UBUNTU_APT[@]}"
+# Install Packages
 
-if command -v fdfind >/dev/null; then
-  sudo ln -s "$(command -v fdfind)" "$(dirname "$(command -v fdfind)")/fd"
-fi
+## apt packages
+sudo -E apt-get install -y "${PKG_DEV_UBUNTU_APT[@]}"
 
-# Install snap packages
+# snap packages
 # shellcheck disable=SC2086
 for s in "${PKG_DEV_UBUNTU_SNAP[@]}"; do sudo snap install $s; done
 
-# Install npm packages
+# npm packages
 sudo -H npm install -g "${PKG_DEV_UBUNTU_NPM[@]}"
 
-# Install bash bats libs
+## github packages
+
+### Install bash bats libs
 for bats_lib in bats-support bats-assert bats-file; do
   repo="https://github.com/bats-core/${bats_lib}.git"
   tag="$(git ls-remote --tags --exit-code --sort='v:refname' --refs "$repo" | tail -n 1 | cut -d/ -f3)"
 
   sudo -H git clone "$repo" --depth 1 --branch "$tag" "/usr/lib/bash-${bats_lib}-git" >/dev/null
 done
-
+#### configure bash libs
 sudo ln -s /usr/lib/bash-bats-file-git /usr/lib/bats-file
 
+### Install vedv
 if [[ "$IMAGE_BUILDING" == false ]]; then
-  # Install vedv
   (
     cd "$(mktemp -d)"
 
@@ -57,7 +58,14 @@ EOF
   )
 fi
 
+# Configure
+
+## configure fd
+if command -v fdfind >/dev/null; then
+  sudo ln -s "$(command -v fdfind)" "$(dirname "$(command -v fdfind)")/fd"
+fi
+
+## configure git hooks
 if [[ "$IMAGE_BUILDING" == false ]]; then
-  # configure git hooks
   git config core.hooksPath .githooks
 fi
diff --git a/tools/install-opt-manjaro b/tools/install-opt-manjaro
index aa6c0e2..9f91382 100755
--- a/tools/install-opt-manjaro
+++ b/tools/install-opt-manjaro
@@ -57,5 +57,10 @@ if [[ -f .ydf.env ]]; then
 fi
 
 cd "$(mktemp -d)"
-git clone https://github.com/yunielrc/yzsh.git && cd yzsh
-make install
+
+for pkg in "${PKG_OPT_MANJARO_GITHUB[@]}"; do
+  (
+    git clone "https://github.com/${pkg}.git" && cd "${pkg#*/}"
+    make install
+  )
+done
diff --git a/tools/install-opt-ubuntu b/tools/install-opt-ubuntu
index 7a63ce5..bdc56f3 100755
--- a/tools/install-opt-ubuntu
+++ b/tools/install-opt-ubuntu
@@ -16,16 +16,13 @@ export DEBIAN_FRONTEND=noninteractive
 sudo -E apt-get update -y &&
   sudo -E apt-get upgrade -y
 
-# Install flatpak
-sudo -E add-apt-repository ppa:flatpak/stable -y &&
-  sudo -E apt-get update -y &&
-  sudo -E apt-get install flatpak -y &&
-  sudo -H flatpak remote-add --if-not-exists \
-    flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+# Add apt repositories
 
-# Install docker
+## Add flatpak repo
+sudo -E add-apt-repository ppa:flatpak/stable -y &&
+  sudo -E apt-get update -y
 
-## Add Docker's official GPG key:
+## Add docker's official GPG key
 sudo -E apt-get update -y
 sudo -E apt-get install -y ca-certificates curl gnupg
 sudo install -m 0755 -d /etc/apt/keyrings
@@ -33,17 +30,38 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
   sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 sudo chmod a+r /etc/apt/keyrings/docker.gpg
 
-## Add the repository to Apt sources:
+## Add docker repo
 echo \
   "deb [arch=\"$(dpkg --print-architecture)\" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
   \"$(. /etc/os-release && echo "$VERSION_CODENAME")\" stable" |
   sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
 sudo -E apt-get update -y
 
-## Install
-sudo -E apt-get install -y docker-ce docker-ce-cli \
-  containerd.io docker-buildx-plugin docker-compose-plugin
+# Install Packages
+
+## apt packages
+sudo -E apt-get install -y "${PKG_OPT_UBUNTU_APT[@]}"
+
+## github packages
+sudo -E apt-get install -y make git
+
+cd "$(mktemp -d)"
 
+for pkg in "${PKG_OPT_MANJARO_GITHUB[@]}"; do
+  (
+    git clone "https://github.com/${pkg}.git" && cd "${pkg#*/}"
+    make install
+  )
+done
+cd -
+
+# Configure
+
+## configure flatpak
+sudo -H flatpak remote-add --if-not-exists \
+  flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+## configure docker
 sudo systemctl enable docker
 
 if [[ "$IMAGE_BUILDING" == false ]]; then
@@ -53,7 +71,7 @@ fi
 sudo groupadd docker || :
 sudo usermod -aG docker "$USER"
 
-# Install YZSH
+## configure YZSH
 
 if [[ -f .ydf.env ]]; then
   # shellcheck source=../.ydf.env
@@ -66,8 +84,3 @@ if [[ -f .ydf.env ]]; then
 ##
 
 fi
-
-sudo -E apt-get install -y make git
-cd "$(mktemp -d)"
-git clone https://github.com/yunielrc/yzsh.git && cd yzsh
-make install
diff --git a/tools/list-pkgs-run-manjaro b/tools/list-pkgs-run-manjaro
index 6a9183b..0a6be50 100755
--- a/tools/list-pkgs-run-manjaro
+++ b/tools/list-pkgs-run-manjaro
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# List manjaro prod dependencies
+# List manjaro runtime dependencies
 #
 
 set -eu
@@ -11,4 +11,7 @@ set -eu
 echo "# SYSTEM: $(uname -a)"
 
 echo '# PACMAN'
-pacman --color never -Q bash "${PKG_RUN_MANJARO_YAY[@]}"
+pacman --color never -Q "${PKG_RUN_MANJARO_PACMAN[@]}"
+
+# echo '# YAY'
+# pacman --color never -Q "${PKG_RUN_MANJARO_YAY[@]}"
diff --git a/tools/list-pkgs-run-ubuntu b/tools/list-pkgs-run-ubuntu
index bc5ced9..05b8346 100755
--- a/tools/list-pkgs-run-ubuntu
+++ b/tools/list-pkgs-run-ubuntu
@@ -10,7 +10,7 @@ set -eu
 echo "# SYSTEM: $(uname -a)"
 
 echo '# APT'
-apt -qq list --installed bash "${PKG_RUN_UBUNTU_APT[@]}" 2>/dev/null |
+apt -qq list --installed "${PKG_RUN_UBUNTU_APT[@]}" 2>/dev/null |
   sed -E 's/\/\S+//' |
   awk '{print $1, $2}'