diff --git a/nix/home-manager/apps/cloud/aws.nix b/nix/home-manager/apps/cloud/aws.nix
new file mode 100644
index 0000000..fab5b4e
--- /dev/null
+++ b/nix/home-manager/apps/cloud/aws.nix
@@ -0,0 +1,13 @@
+{ config, inputs, pkgs, lib, ... }: {
+  home.packages = with pkgs; [
+    ###################################"
+    # AWS and other tools used with AWS
+    ###################################"
+    awscli2 # AWS CLI
+    kubectl # Kubernetes CLI
+    kubectx # Kubernetes CLI
+    k9s # Kubernetes CLI
+    kubernetes-helm # Helm
+    argocd # ArgoCD CLI
+  ];
+}
diff --git a/nix/home-manager/features/term/tools/zsh.nix b/nix/home-manager/features/term/tools/zsh.nix
index acbd962..1d27686 100644
--- a/nix/home-manager/features/term/tools/zsh.nix
+++ b/nix/home-manager/features/term/tools/zsh.nix
@@ -96,8 +96,6 @@ in
             echo "$RESULT ms"
         }
 
-        test -e "$PRJ_DEVTOOLS/alias.sh" && source "$PRJ_DEVTOOLS/alias.sh"
-
         # function assume_role() {
         #   ~/ghq/github.com/cynapps/poc-devtools/aws-assume-role.sh $@
         #   source /tmp/.sso_exported
@@ -127,6 +125,9 @@ in
         bindkey "^F"     fzf-cd-widget # [CTRL-F] Goto FZF selected folder
         bindkey "^J"    fzf-zoxide # [CTRL-J] zoxide autojump ZFS list
         bindkey "^G"    _navi_widget # [CTRL-G] Show local navi
+
+        test -e "~/.araiko.env" && source "~/.araiko.env"
+        test -e "${prj_devtools}/alias.sh" && source "${prj_devtools}/alias.sh"
       '';
 
       shellAliases = with pkgs; {
diff --git a/users/badele/b4d14.nix b/users/badele/b4d14.nix
index 6ae10cb..913d9e4 100644
--- a/users/badele/b4d14.nix
+++ b/users/badele/b4d14.nix
@@ -29,6 +29,7 @@ in
     ../../nix/home-manager/features/term/security
 
     # Language
+    ../../nix/home-manager/apps/cloud/aws.nix
     ../../nix/home-manager/features/language/c.nix
     ../../nix/home-manager/features/language/go.nix
     ../../nix/home-manager/features/language/python.nix