diff --git a/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.installer.yaml b/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.installer.yaml
new file mode 100644
index 000000000000..58d3357e4326
--- /dev/null
+++ b/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.installer.yaml
@@ -0,0 +1,29 @@
+# Created with komac v2.16.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.12.0.schema.json
+
+PackageIdentifier: KeeperSecurity.Commander
+PackageVersion: 18.0.5
+InstallerLocale: en-US
+InstallerType: inno
+Scope: machine
+InstallModes:
+- interactive
+- silent
+- silentWithProgress
+UpgradeBehavior: install
+Commands:
+- keeper
+ProductCode: '{006266E3-17D6-4166-918C-0B8F4C663D4C}_is1'
+ReleaseDate: 2026-06-05
+AppsAndFeaturesEntries:
+- DisplayName: Keeper Commander 18.0.5
+  ProductCode: '{006266E3-17D6-4166-918C-0B8F4C663D4C}_is1'
+ElevationRequirement: elevatesSelf
+InstallationMetadata:
+  DefaultInstallLocation: '%ProgramFiles%\Keeper Commander'
+Installers:
+- Architecture: x86
+  InstallerUrl: https://github.com/Keeper-Security/Commander/releases/download/v18.0.5/keeper-commander-windows-v18.0.5.exe
+  InstallerSha256: 7DDC897E7A25BE61CE48BD36DDC9F9F1847E6EE7F2C34A506654F7CFC36C0064
+ManifestType: installer
+ManifestVersion: 1.12.0
diff --git a/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.locale.en-US.yaml b/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.locale.en-US.yaml
new file mode 100644
index 000000000000..2f6c2d210ae1
--- /dev/null
+++ b/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.locale.en-US.yaml
@@ -0,0 +1,49 @@
+# Created with komac v2.16.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.12.0.schema.json
+
+PackageIdentifier: KeeperSecurity.Commander
+PackageVersion: 18.0.5
+PackageLocale: en-US
+Publisher: Keeper Security, Inc.
+PublisherUrl: https://www.keepersecurity.com/
+PublisherSupportUrl: https://github.com/Keeper-Security/Commander/issues
+PackageName: Keeper Commander
+PackageUrl: https://github.com/Keeper-Security/Commander
+License: MIT
+LicenseUrl: https://github.com/Keeper-Security/Commander/blob/HEAD/LICENSE
+Copyright: Copyright (c) Keeper Security, Inc.
+CopyrightUrl: https://github.com/Keeper-Security/Commander/blob/master/LICENSE
+ShortDescription: Keeper Commander is a python-based CLI and SDK interface to the Keeper Security platform. Provides administrative controls, reporting, import/export and vault management.
+Description: Keeper Commander is a command-line and SDK interface to Keeper® Password Manager. Commander can be used to access and control your Keeper vault, perform administrative functions (such as end-user onboarding and data import/export), launch remote sessions, rotate passwords, eliminate hardcoded passwords and more. Keeper Commander is an open source project with contributions from Keeper's engineering team and partners.
+Moniker: keeper
+Tags:
+- cli
+- password
+- password-manager
+- secrets
+- security-tools
+ReleaseNotes: |-
+  Keeper Commander 18.0.5
+  ✨ New Features
+  - Universal Secret Sync — new commands for syncing secrets across providers.
+  - Cloud secret import to Nested Shared Folders — import cloud secrets directly into Nested Shared Folders.
+  - CyberArk import — import users and teams from CyberArk, with membership download support.
+  - PAM RBI file transfers — added Remote Browser Isolation file uploads/downloads, plus pam connection edit --scrollback.
+  - Combined folder search — find/search now supports multiple -c flags to search across folders.
+  - NSF folder data in share-report — share-report now includes NSF (non-shared folder) data.
+  🐛 Bug Fixes
+  - pam connection edit — fixed editing of connection settings and launch/admin credentials.
+  - Service mode — exempt the /health endpoint from API rate limiting; fixed Service Mode delete response handling.
+  - Tunnel — close and unregister the tube when the connection state changes to closed.
+  - Nested Shared Folders CLI — fixed record updates and nested directory creation.
+  - Enterprise — limit enterprise object name lengths; ei role column now a string instead of a dict.
+  - Workflow — removed force-close escalation on lease expiry; soft-close only.
+  - epm scim (AzureAD) — use UPN as the username; improved epm scim ad manual.
+  - Slack — fixed keyring slack-app issue.
+  - KCM import — resolved Windows file-permissions mismatch during sync.
+  🔧 Internal / Maintenance
+  - Updated generated proto files.
+  - Docker image build now uses the config.json file from params.
+ReleaseNotesUrl: https://github.com/Keeper-Security/Commander/releases/tag/v18.0.5
+ManifestType: defaultLocale
+ManifestVersion: 1.12.0
diff --git a/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.yaml b/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.yaml
new file mode 100644
index 000000000000..8984048731a7
--- /dev/null
+++ b/manifests/k/KeeperSecurity/Commander/18.0.5/KeeperSecurity.Commander.yaml
@@ -0,0 +1,8 @@
+# Created with komac v2.16.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.12.0.schema.json
+
+PackageIdentifier: KeeperSecurity.Commander
+PackageVersion: 18.0.5
+DefaultLocale: en-US
+ManifestType: version
+ManifestVersion: 1.12.0