diff --git a/modules/common/packages.nix b/modules/common/packages.nix
index cccaadf..4fff5e1 100644
--- a/modules/common/packages.nix
+++ b/modules/common/packages.nix
@@ -31,6 +31,7 @@
     scc # code counter with complexity calculations and COCOMO estimates
     fzf # fuzzy finder
     graphviz # graph visualization software
+    plantuml # plantuml diagram generator
     tex-fmt # latex formatter
     devcontainer # devcontainer cli
 
diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index 73ca248..aa8896a 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -14,6 +14,7 @@ let
 
     # Security
     "nordpass"
+    "nordvpn"
 
     # Productivity
     "todoist-app"
diff --git a/users/gkhaykin/awscli.nix b/users/gkhaykin/awscli.nix
new file mode 100644
index 0000000..4f4e15f
--- /dev/null
+++ b/users/gkhaykin/awscli.nix
@@ -0,0 +1,42 @@
+{ ... }: {
+  programs.zsh = {
+    initContent = ''
+      # >>> AWS
+      export AWS_SDK_LOAD_CONFIG=1
+      # <<< AWS
+    '';
+  };
+  programs.awscli = {
+    enable = true;
+    settings = {
+      default = {
+        region = "us-west-2";
+        output = "json";
+      };
+      "sso-session together" = {
+        sso_start_url = "https://together-aws-portal.awsapps.com/start";
+        sso_region = "us-west-2";
+      };
+      "profile together-prod" = {
+        sso_session = "together";
+        sso_account_id = "598726163780";
+        sso_role_name = "PowerUserAccess";
+      };
+      "profile together-qa" = {
+        sso_session = "together";
+        sso_account_id = "905418226616";
+        sso_role_name = "PowerUserAccess";
+      };
+      "profile together-research" = {
+        sso_session = "together";
+        sso_account_id = "805380815601";
+        sso_role_name = "PowerUserAccess";
+      };
+      "profile together-dev" = {
+        sso_session = "together";
+        sso_account_id = "997151384078";
+        sso_role_name = "PowerUserAccess";
+      };
+    };
+  };
+}
diff --git a/users/gkhaykin/default.nix b/users/gkhaykin/default.nix
index 1338712..2762c71 100644
--- a/users/gkhaykin/default.nix
+++ b/users/gkhaykin/default.nix
@@ -5,6 +5,8 @@
 
     ../shared/completions.nix
     ../shared/fonts.nix
+
+    ./awscli.nix
   ];
 
   home = {
diff --git a/users/shared/scripts/asdf.sh b/users/shared/scripts/asdf.sh
index f62f90c..5d13ce6 100755
--- a/users/shared/scripts/asdf.sh
+++ b/users/shared/scripts/asdf.sh
@@ -30,7 +30,7 @@ plugins=(
     "kube-linter 0.7.2"  # k8s linter
     "kustomize 5.6.0"  # k8s manifest generator
     "tilt 0.33.22"  # k8s developer experience
-    "argocd 2.10.1"  # k8s gitops
+    "argocd 3.1.8"  # k8s gitops
     "awscli 2.23.3"  # aws cli
     "nodejs 23.6.1"  # javascript runtime
     "pnpm 9.15.5"  # javascript package manager