diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cf0fadb5425d..8065425973f9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3484,6 +3484,12 @@
     githubId = 1298344;
     name = "Daniel Fullmer";
   };
+  daniyalsuri6 = {
+    email = "daniyal.suri@gmail.com";
+    github = "daniyalsuri6";
+    githubId = 107034852;
+    name = "Daniyal Suri";
+  };
   dansbandit = {
     github = "dansbandit";
     githubId = 4530687;
diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix
new file mode 100644
index 000000000000..7906837fe059
--- /dev/null
+++ b/pkgs/tools/admin/okta-aws-cli/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "okta-aws-cli";
+  version = "1.0.1";
+
+  subPackages = [ "cmd/okta-aws-cli" ];
+
+  src = fetchFromGitHub {
+    owner  = "okta";
+    repo   = "okta-aws-cli";
+    rev    = "v${version}";
+    sha256 = "1qlc04fydcqnifbhrzdw63wq3ndzsyzp4s1bdvfhvizbhdi03mpp";
+  };
+
+  vendorSha256 = "1gzaadpf9zrci7yv88f434mvc7gralb7dj6wl6r4vsv3qk291680";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "A CLI for having Okta as the IdP for AWS CLI operations";
+    homepage = "https://github.com/okta/okta-aws-cli";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ daniyalsuri6 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 165af1d1b129..f6f52a246d63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2942,6 +2942,8 @@ with pkgs;
 
   awscli2 = callPackage ../tools/admin/awscli2 { };
 
+  okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { };
+
   awsebcli = callPackage ../tools/virtualization/awsebcli { };
 
   awslimitchecker = callPackage ../tools/admin/awslimitchecker { };