diff --git a/.asf.yaml b/.asf.yaml
index 3b2f7691d13..f27b5afa425 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -16,7 +16,6 @@
 # under the License.
 
 # https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features
----
 github:
   description: "Apache CloudStack is an opensource Infrastructure as a Service (IaaS) cloud computing platform"
   homepage: https://cloudstack.apache.org/
@@ -57,8 +56,26 @@ github:
     - Damans227
     - jmsperu
     - GaOrtiga
+    - bhouse-nexthop
 
-  protected_branches: ~
+  protected_branches:
+
+  rulesets:
+    - name: "Default Branch Protection"
+      type: branch
+      branches:
+        includes:
+          - "~DEFAULT_BRANCH"
+        excludes: []
+      bypass_teams:
+        - root
+      restrict_deletion: true
+      restrict_force_push: true
+
+  copilot_code_review:
+    enabled: true
+    review_drafts: true
+    review_on_push: true
 
 notifications:
   commits: commits@cloudstack.apache.org
diff --git a/.github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_noop-reminder.md b/.github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_noop-reminder.md
deleted file mode 100644
index 77cca08c1be..00000000000
--- a/.github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_noop-reminder.md
+++ /dev/null
@@ -1,5 +0,0 @@
-**Important**: If no action is needed after completing your analysis, you **MUST** call the `noop` safe-output tool with a brief explanation. Failing to call any safe-output tool is the most common cause of safe-output workflow failures.
-
-```json
-{"noop": {"message": "No action needed: [brief explanation of what was analyzed and why]"}}
-```
diff --git a/.github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_reporting.md b/.github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_reporting.md
deleted file mode 100644
index 72d61b434ef..00000000000
--- a/.github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_reporting.md
+++ /dev/null
@@ -1,73 +0,0 @@
----
-# Report formatting guidelines
----
-
-## Report Structure Guidelines
-
-### 1. Header Levels
-**Use h3 (###) or lower for all headers in your issue report to maintain proper document hierarchy.**
-
-When creating GitHub issues or discussions:
-- Use `###` (h3) for main sections (e.g., "### Test Summary")
-- Use `####` (h4) for subsections (e.g., "#### Device-Specific Results")
-- Never use `##` (h2) or `#` (h1) in reports - these are reserved for titles
-
-### 2. Progressive Disclosure
-**Wrap detailed test results in `<details><summary>Section Name</summary>` tags to improve readability and reduce scrolling.**
-
-Use collapsible sections for:
-- Verbose details (full test logs, raw data)
-- Secondary information (minor warnings, extra context)
-- Per-item breakdowns when there are many items
-
-Always keep critical information visible (summary, critical issues, key metrics).
-
-### 3. Report Structure Pattern
-
-1. **Overview**: 1-2 paragraphs summarizing key findings
-2. **Critical Information**: Show immediately (summary stats, critical issues)
-3. **Details**: Use `<details><summary>Section Name</summary>` for expanded content
-4. **Context**: Add helpful metadata (workflow run, date, trigger)
-
-### Design Principles (Airbnb-Inspired)
-
-Reports should:
-- **Build trust through clarity**: Most important info immediately visible
-- **Exceed expectations**: Add helpful context like trends, comparisons
-- **Create delight**: Use progressive disclosure to reduce overwhelm
-- **Maintain consistency**: Follow patterns across all reports
-
-### Example Report Structure
-
-```markdown
-### Summary
-- Key metric 1: value
-- Key metric 2: value
-- Status: ✅/⚠️/❌
-
-### Critical Issues
-[Always visible - these are important]
-
-<details>
-<summary>View Detailed Results</summary>
-
-[Comprehensive details, logs, traces]
-
-</details>
-
-<details>
-<summary>View All Warnings</summary>
-
-[Minor issues and potential problems]
-
-</details>
-
-### Recommendations
-[Actionable next steps - keep visible]
-```
-
-## Workflow Run References
-
-- Format run IDs as links: `[§12345](https://github.com/owner/repo/actions/runs/12345)`
-- Include up to 3 most relevant run URLs at end under `**References:**`
-- Do NOT add footer attribution (system adds automatically)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4eb508f5f6f..62b816719c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0815b455847..63484def8f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
     if: github.repository == 'apache/cloudstack'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -251,7 +251,7 @@ jobs:
                   smoke/test_list_storage_pools
                   smoke/test_list_volumes"]
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a2d581dcac2..f6bc65ad4b5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,16 +35,16 @@ jobs:
         language: ["actions"]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+        uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
+        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         with:
           category: "Security"
diff --git a/.github/workflows/issue-triage-agent.lock.yml b/.github/workflows/daily-issue-triage.lock.yml
similarity index 90%
rename from .github/workflows/issue-triage-agent.lock.yml
rename to .github/workflows/daily-issue-triage.lock.yml
index 94abbb0908c..bd07aeefd81 100644
--- a/.github/workflows/issue-triage-agent.lock.yml
+++ b/.github/workflows/daily-issue-triage.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"d4b8988df7c60cd416200769cc6bc7f1aab5bb3128df0b9a83a35e061b4da111","compiler_version":"v0.76.1","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"919fb17c7928e5e96d9c0a2854670a42f9c5f6cfc2059b46009bb3c23640d0ca","compiler_version":"v0.76.1","strict":true,"agent_id":"copilot"}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"46d564922b082d0db93244972e8005ea6904ee5f","version":"v0.76.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.55","digest":"sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.55@sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55","digest":"sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55@sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.55","digest":"sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.55@sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.19","digest":"sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.19@sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f"},{"image":"ghcr.io/github/github-mcp-server:v1.0.4","digest":"sha256:e3816a476a977cfb836e7d221510011436c654d11861db66ecfd826601aba6a4","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.4@sha256:e3816a476a977cfb836e7d221510011436c654d11861db66ecfd826601aba6a4"},{"image":"node:lts-alpine","digest":"sha256:2bdb65ed1dab192432bc31c95f94155ca5ad7fc1392fb7eb7526ab682fa5bf14","pinned_image":"node:lts-alpine@sha256:2bdb65ed1dab192432bc31c95f94155ca5ad7fc1392fb7eb7526ab682fa5bf14"}]}
 #    ___                   _   _
 #   / _ \                 | | (_)
@@ -16,19 +16,17 @@
 #
 # This file was automatically generated by gh-aw (v0.76.1). DO NOT EDIT.
 #
-# To update this file, edit github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115 and run:
+# To update this file, edit githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9 and run:
 #   gh aw compile
 # Not all edits will cause changes to this file.
 #
 # For more information: https://github.github.com/gh-aw/introduction/overview/
 #
+# Scheduled daily triage that processes untriaged CloudStack issues in batches.
+# Detects duplicates, filters spam, and assigns CloudStack-specific labels
+# (type:*, component:*, Severity:*, status:*), then posts a structured triage report.
 #
-# Source: github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115
-#
-# Resolved workflow manifest:
-#   Imports:
-#     - github/gh-aw/.github/workflows/shared/noop-reminder.md@359795d49ada21681ab616bd4cbcb144a7387115
-#     - github/gh-aw/.github/workflows/shared/reporting.md@359795d49ada21681ab616bd4cbcb144a7387115
+# Source: githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9
 #
 # Secrets used:
 #   - COPILOT_GITHUB_TOKEN
@@ -37,13 +35,12 @@
 #   - GITHUB_TOKEN
 #
 # Custom actions used:
-#   - actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+#   - actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 #   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-#   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 (source v9)
 #   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+#   - github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
 #
 # Container images used:
 #   - ghcr.io/github/gh-aw-firewall/agent:0.25.55@sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731
@@ -53,10 +50,10 @@
 #   - ghcr.io/github/github-mcp-server:v1.0.4@sha256:e3816a476a977cfb836e7d221510011436c654d11861db66ecfd826601aba6a4
 #   - node:lts-alpine@sha256:2bdb65ed1dab192432bc31c95f94155ca5ad7fc1392fb7eb7526ab682fa5bf14
 
-name: "Issue Triage Agent"
+name: "Daily Issue Triage"
 on:
   schedule:
-  - cron: "49 14 * * 1-5"
+  - cron: "26 13 * * 1-5"
     # Friendly format: daily around 14:00 on weekdays (scattered)
   workflow_dispatch:
     inputs:
@@ -71,7 +68,7 @@ permissions: {}
 concurrency:
   group: "gh-aw-${{ github.workflow }}"
 
-run-name: "Issue Triage Agent"
+run-name: "Daily Issue Triage"
 
 jobs:
   activation:
@@ -93,13 +90,13 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage-agent.lock.yml@${{ github.ref }}
+          GH_AW_SETUP_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/daily-issue-triage.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.52"
           GH_AW_INFO_AWF_VERSION: "v0.25.55"
           GH_AW_INFO_BODY_MODIFIED: "false"
@@ -113,7 +110,7 @@ jobs:
           GH_AW_INFO_VERSION: "1.0.52"
           GH_AW_INFO_AGENT_VERSION: "1.0.52"
           GH_AW_INFO_CLI_VERSION: "v0.76.1"
-          GH_AW_INFO_WORKFLOW_NAME: "Issue Triage Agent"
+          GH_AW_INFO_WORKFLOW_NAME: "Daily Issue Triage"
           GH_AW_INFO_EXPERIMENTAL: "false"
           GH_AW_INFO_SUPPORTS_TOOLS_ALLOWLIST: "true"
           GH_AW_INFO_STAGED: "false"
@@ -122,9 +119,8 @@ jobs:
           GH_AW_INFO_AWF_VERSION: "v0.25.55"
           GH_AW_INFO_AWMG_VERSION: ""
           GH_AW_INFO_FIREWALL_TYPE: "squid"
-          GH_AW_INFO_FRONTMATTER_SOURCE: "github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115"
+          GH_AW_INFO_FRONTMATTER_SOURCE: "githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9"
           GH_AW_INFO_BODY_MODIFIED: "false"
-          GH_AW_INFO_FRONTMATTER_EMOJI: "🔧"
           GH_AW_COMPILED_STRICT: "true"
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
@@ -139,7 +135,7 @@ jobs:
         env:
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
       - name: Checkout .github and .agents folders
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           sparse-checkout: |
@@ -164,7 +160,7 @@ jobs:
         id: check-lock-file
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          GH_AW_WORKFLOW_FILE: "issue-triage-agent.lock.yml"
+          GH_AW_WORKFLOW_FILE: "daily-issue-triage.lock.yml"
           GH_AW_CONTEXT_WORKFLOW_REF: "${{ github.workflow_ref }}"
         with:
           script: |
@@ -198,20 +194,20 @@ jobs:
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_e560c36b9148ef78_EOF'
+          cat << 'GH_AW_PROMPT_7c51e8f15cc7af75_EOF'
           <system>
-          GH_AW_PROMPT_e560c36b9148ef78_EOF
+          GH_AW_PROMPT_7c51e8f15cc7af75_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_e560c36b9148ef78_EOF'
+          cat << 'GH_AW_PROMPT_7c51e8f15cc7af75_EOF'
           <safe-output-tools>
-          Tools: add_comment, add_labels, missing_tool, missing_data, noop
+          Tools: add_comment(max:10), add_labels(max:10), missing_tool, missing_data, noop
           </safe-output-tools>
-          GH_AW_PROMPT_e560c36b9148ef78_EOF
+          GH_AW_PROMPT_7c51e8f15cc7af75_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_e560c36b9148ef78_EOF'
+          cat << 'GH_AW_PROMPT_7c51e8f15cc7af75_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if github.actor}}
@@ -240,14 +236,12 @@ jobs:
           {{/if}}
           </github-context>
 
-          GH_AW_PROMPT_e560c36b9148ef78_EOF
+          GH_AW_PROMPT_7c51e8f15cc7af75_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_e560c36b9148ef78_EOF'
+          cat << 'GH_AW_PROMPT_7c51e8f15cc7af75_EOF'
           </system>
-          {{#runtime-import .github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_reporting.md}}
-          {{#runtime-import .github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_noop-reminder.md}}
-          {{#runtime-import .github/workflows/issue-triage-agent.md}}
-          GH_AW_PROMPT_e560c36b9148ef78_EOF
+          {{#runtime-import .github/workflows/daily-issue-triage.md}}
+          GH_AW_PROMPT_7c51e8f15cc7af75_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -327,8 +321,7 @@ jobs:
   agent:
     needs: activation
     runs-on: ubuntu-latest
-    permissions:
-      issues: read
+    permissions: read-all
     concurrency:
       group: "gh-aw-copilot-${{ github.workflow }}"
     env:
@@ -337,9 +330,10 @@ jobs:
       GH_AW_ASSETS_BRANCH: ""
       GH_AW_ASSETS_MAX_SIZE_KB: 0
       GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
-      GH_AW_WORKFLOW_ID_SANITIZED: issuetriageagent
+      GH_AW_WORKFLOW_ID_SANITIZED: dailyissuetriage
     outputs:
       agentic_engine_timeout: ${{ steps.detect-agent-errors.outputs.agentic_engine_timeout || 'false' }}
+      checkout_pr_success: ${{ steps.checkout-pr.outputs.checkout_pr_success || 'true' }}
       effective_tokens: ${{ steps.parse-mcp-gateway.outputs.effective_tokens }}
       effective_tokens_rate_limit_error: ${{ steps.parse-mcp-gateway.outputs.effective_tokens_rate_limit_error || 'false' }}
       has_patch: ${{ steps.collect_output.outputs.has_patch }}
@@ -355,15 +349,15 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
           parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage-agent.lock.yml@${{ github.ref }}
+          GH_AW_SETUP_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/daily-issue-triage.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.52"
           GH_AW_INFO_AWF_VERSION: "v0.25.55"
           GH_AW_INFO_BODY_MODIFIED: "false"
@@ -377,7 +371,7 @@ jobs:
             echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json"
           } >> "$GITHUB_OUTPUT"
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Create gh-aw temp directory
@@ -399,27 +393,44 @@ jobs:
           SERVER_URL_STRIPPED="${SERVER_URL#https://}"
           git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@${SERVER_URL_STRIPPED}/${REPO_NAME}.git"
           echo "Git configured with standard GitHub Actions identity"
+      - name: Checkout PR branch
+        id: checkout-pr
+        if: |
+          github.event.pull_request || github.event.issue.pull_request
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        env:
+          GH_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+        with:
+          github-token: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/checkout_pr_branch.cjs');
+            await main();
       - name: Install GitHub Copilot CLI
         run: bash "${RUNNER_TEMP}/gh-aw/actions/install_copilot_cli.sh" 1.0.52
         env:
           GH_HOST: github.com
       - name: Install AWF binary
         run: bash "${RUNNER_TEMP}/gh-aw/actions/install_awf_binary.sh" v0.25.55
-      - name: Determine automatic lockdown mode for GitHub MCP Server
-        id: determine-automatic-lockdown
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 (source v9)
+      - name: Parse integrity filter lists
+        id: parse-guard-vars
         env:
-          GH_AW_GITHUB_TOKEN: ${{ secrets.GH_AW_GITHUB_TOKEN }}
-          GH_AW_GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN }}
-        with:
-          script: |
-            const determineAutomaticLockdown = require('${{ runner.temp }}/gh-aw/actions/determine_automatic_lockdown.cjs');
-            await determineAutomaticLockdown(github, context, core);
+          GH_AW_BLOCKED_USERS_VAR: ${{ vars.GH_AW_GITHUB_BLOCKED_USERS || '' }}
+          GH_AW_TRUSTED_USERS_VAR: ${{ vars.GH_AW_GITHUB_TRUSTED_USERS || '' }}
+          GH_AW_APPROVAL_LABELS_VAR: ${{ vars.GH_AW_GITHUB_APPROVAL_LABELS || '' }}
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/parse_guard_list.sh"
       - name: Download activation artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: activation
           path: /tmp/gh-aw
+      - name: Restore agent config folders from base branch
+        if: steps.checkout-pr.outcome == 'success'
+        env:
+          GH_AW_AGENT_FOLDERS: ".agents .antigravity .claude .codex .crush .gemini .github .opencode .pi"
+          GH_AW_AGENT_FILES: ".crush.json AGENTS.md ANTIGRAVITY.md CLAUDE.md GEMINI.md PI.md opencode.jsonc"
+        run: bash "${RUNNER_TEMP}/gh-aw/actions/restore_base_github_folders.sh"
       - name: Restore inline sub-agents from activation artifact
         env:
           GH_AW_SUB_AGENT_DIR: ".github/agents"
@@ -436,16 +447,16 @@ jobs:
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_c8eaf0ada4607ff7_EOF'
-          {"add_comment":{"max":1},"add_labels":{"allowed":["bug","feature","enhancement","documentation","question","help-wanted","good-first-issue"]},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_c8eaf0ada4607ff7_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_09fd9551c3cd7278_EOF'
+          {"add_comment":{"max":10,"target":"*"},"add_labels":{"max":10,"target":"*"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
+          GH_AW_SAFE_OUTPUTS_CONFIG_09fd9551c3cd7278_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
             {
               "description_suffixes": {
-                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Supports reply_to_id for discussion threading.",
-                "add_labels": " CONSTRAINTS: Only these labels are allowed: [\"bug\" \"feature\" \"enhancement\" \"documentation\" \"question\" \"help-wanted\" \"good-first-issue\"]."
+                "add_comment": " CONSTRAINTS: Maximum 10 comment(s) can be added. Target: *. Supports reply_to_id for discussion threading.",
+                "add_labels": " CONSTRAINTS: Maximum 10 label(s) can be added. Target: *."
               },
               "repo_params": {},
               "dynamic_tools": []
@@ -620,8 +631,6 @@ jobs:
           GH_AW_SAFE_OUTPUTS: ${{ steps.set-runtime-paths.outputs.GH_AW_SAFE_OUTPUTS }}
           GH_AW_SAFE_OUTPUTS_API_KEY: ${{ steps.safe-outputs-start.outputs.api_key }}
           GH_AW_SAFE_OUTPUTS_PORT: ${{ steps.safe-outputs-start.outputs.port }}
-          GITHUB_MCP_GUARD_MIN_INTEGRITY: ${{ steps.determine-automatic-lockdown.outputs.min_integrity }}
-          GITHUB_MCP_GUARD_REPOS: ${{ steps.determine-automatic-lockdown.outputs.repos }}
           GITHUB_MCP_SERVER_TOKEN: ${{ secrets.GH_AW_GITHUB_MCP_SERVER_TOKEN || secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
           set -eo pipefail
@@ -640,8 +649,6 @@ jobs:
           export DEBUG="*"
 
           export GH_AW_ENGINE="copilot"
-          export GH_AW_MCP_CLI_SERVERS='["safeoutputs"]'
-          echo GH_AW_MCP_CLI_SERVERS='["safeoutputs"]' >> "$GITHUB_ENV"
           MCP_GATEWAY_UID=$(id -u 2>/dev/null || echo '0')
           MCP_GATEWAY_GID=$(id -g 2>/dev/null || echo '0')
           case "${DOCKER_HOST:-}" in
@@ -654,7 +661,7 @@ jobs:
 
           mkdir -p /home/runner/.copilot
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_88b8311e90d25032_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_37cac1d5ee0c175c_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
@@ -668,8 +675,11 @@ jobs:
                 },
                 "guard-policies": {
                   "allow-only": {
-                    "min-integrity": "$GITHUB_MCP_GUARD_MIN_INTEGRITY",
-                    "repos": "$GITHUB_MCP_GUARD_REPOS"
+                    "approval-labels": ${{ steps.parse-guard-vars.outputs.approval_labels }},
+                    "blocked-users": ${{ steps.parse-guard-vars.outputs.blocked_users }},
+                    "min-integrity": "none",
+                    "repos": "all",
+                    "trusted-users": ${{ steps.parse-guard-vars.outputs.trusted_users }}
                   }
                 }
               },
@@ -695,7 +705,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_88b8311e90d25032_EOF
+          GH_AW_MCP_CONFIG_37cac1d5ee0c175c_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -720,7 +730,7 @@ jobs:
       - name: Execute GitHub Copilot CLI
         id: agentic_execution
         # Copilot CLI tool arguments (sorted):
-        timeout-minutes: 5
+        timeout-minutes: 60
         run: |
           set -o pipefail
           printf '%s' "$(date +%s%3N)" > /tmp/gh-aw/agent_cli_start_ms.txt
@@ -907,6 +917,8 @@ jobs:
             /tmp/gh-aw/sandbox/agent/logs/
             /tmp/gh-aw/redacted-urls.log
             /tmp/gh-aw/mcp-logs/
+            /tmp/gh-aw/proxy-logs/
+            !/tmp/gh-aw/proxy-logs/proxy-tls/
             /tmp/gh-aw/agent_usage.json
             /tmp/gh-aw/agent-stdio.log
             /tmp/gh-aw/pre-agent-audit.txt
@@ -938,7 +950,7 @@ jobs:
       issues: write
       pull-requests: write
     concurrency:
-      group: "gh-aw-conclusion-issue-triage-agent"
+      group: "gh-aw-conclusion-daily-issue-triage"
       cancel-in-progress: false
       queue: max
     outputs:
@@ -949,15 +961,15 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
           parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage-agent.lock.yml@${{ github.ref }}
+          GH_AW_SETUP_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/daily-issue-triage.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.52"
           GH_AW_INFO_AWF_VERSION: "v0.25.55"
           GH_AW_INFO_BODY_MODIFIED: "false"
@@ -982,9 +994,9 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_NOOP_MAX: "1"
-          GH_AW_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_WORKFLOW_SOURCE: "github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115"
-          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/github/gh-aw/blob/359795d49ada21681ab616bd4cbcb144a7387115/.github/workflows/issue-triage-agent.md"
+          GH_AW_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_WORKFLOW_SOURCE: "githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/githubnext/agentics/blob/d7c1dc4b72b00607a67caaffdcc216cb64379cf9/workflows/daily-issue-triage.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
           GH_AW_NOOP_REPORT_AS_ISSUE: "true"
@@ -1000,9 +1012,9 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
-          GH_AW_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_WORKFLOW_SOURCE: "github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115"
-          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/github/gh-aw/blob/359795d49ada21681ab616bd4cbcb144a7387115/.github/workflows/issue-triage-agent.md"
+          GH_AW_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_WORKFLOW_SOURCE: "githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/githubnext/agentics/blob/d7c1dc4b72b00607a67caaffdcc216cb64379cf9/workflows/daily-issue-triage.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
           GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
@@ -1019,9 +1031,9 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_MISSING_TOOL_CREATE_ISSUE: "true"
-          GH_AW_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_WORKFLOW_SOURCE: "github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115"
-          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/github/gh-aw/blob/359795d49ada21681ab616bd4cbcb144a7387115/.github/workflows/issue-triage-agent.md"
+          GH_AW_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_WORKFLOW_SOURCE: "githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/githubnext/agentics/blob/d7c1dc4b72b00607a67caaffdcc216cb64379cf9/workflows/daily-issue-triage.md"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1035,9 +1047,9 @@ jobs:
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
           GH_AW_REPORT_INCOMPLETE_CREATE_ISSUE: "true"
-          GH_AW_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_WORKFLOW_SOURCE: "github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115"
-          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/github/gh-aw/blob/359795d49ada21681ab616bd4cbcb144a7387115/.github/workflows/issue-triage-agent.md"
+          GH_AW_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_WORKFLOW_SOURCE: "githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/githubnext/agentics/blob/d7c1dc4b72b00607a67caaffdcc216cb64379cf9/workflows/daily-issue-triage.md"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
@@ -1051,15 +1063,16 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           GH_AW_AGENT_OUTPUT: ${{ steps.setup-agent-output-env.outputs.GH_AW_AGENT_OUTPUT }}
-          GH_AW_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_WORKFLOW_SOURCE: "github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115"
-          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/github/gh-aw/blob/359795d49ada21681ab616bd4cbcb144a7387115/.github/workflows/issue-triage-agent.md"
+          GH_AW_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_WORKFLOW_SOURCE: "githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9"
+          GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/githubnext/agentics/blob/d7c1dc4b72b00607a67caaffdcc216cb64379cf9/workflows/daily-issue-triage.md"
           GH_AW_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GH_AW_AGENT_CONCLUSION: ${{ needs.agent.result }}
-          GH_AW_WORKFLOW_ID: "issue-triage-agent"
+          GH_AW_WORKFLOW_ID: "daily-issue-triage"
           GH_AW_ACTION_FAILURE_ISSUE_EXPIRES_HOURS: "168"
           GH_AW_ENGINE_ID: "copilot"
           GH_AW_SECRET_VERIFICATION_RESULT: ${{ needs.activation.outputs.secret_verification_result }}
+          GH_AW_CHECKOUT_PR_SUCCESS: ${{ needs.agent.outputs.checkout_pr_success }}
           GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens || '' }}
           GH_AW_EFFECTIVE_TOKENS_RATE_LIMIT_ERROR: ${{ needs.agent.outputs.effective_tokens_rate_limit_error || 'false' }}
           GH_AW_INFERENCE_ACCESS_ERROR: ${{ needs.agent.outputs.inference_access_error }}
@@ -1073,7 +1086,7 @@ jobs:
           GH_AW_FAILURE_REPORT_AS_ISSUE: "true"
           GH_AW_MISSING_TOOL_REPORT_AS_FAILURE: "true"
           GH_AW_MISSING_DATA_REPORT_AS_FAILURE: "true"
-          GH_AW_TIMEOUT_MINUTES: "5"
+          GH_AW_TIMEOUT_MINUTES: "60"
           GH_AW_MAX_EFFECTIVE_TOKENS: "25000000"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
@@ -1099,15 +1112,15 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
           parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage-agent.lock.yml@${{ github.ref }}
+          GH_AW_SETUP_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/daily-issue-triage.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.52"
           GH_AW_INFO_AWF_VERSION: "v0.25.55"
           GH_AW_INFO_BODY_MODIFIED: "false"
@@ -1128,7 +1141,7 @@ jobs:
           echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
       - name: Checkout repository for patch context
         if: needs.agent.outputs.has_patch == 'true'
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       # --- Threat Detection ---
@@ -1176,8 +1189,8 @@ jobs:
         if: always() && steps.detection_guard.outputs.run_detection == 'true'
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
-          WORKFLOW_NAME: "Issue Triage Agent"
-          WORKFLOW_DESCRIPTION: "No description provided"
+          WORKFLOW_NAME: "Daily Issue Triage"
+          WORKFLOW_DESCRIPTION: "Scheduled daily triage that processes untriaged CloudStack issues in batches.\nDetects duplicates, filters spam, and assigns CloudStack-specific labels\n(type:*, component:*, Severity:*, status:*), then posts a structured triage report."
           HAS_PATCH: ${{ needs.agent.outputs.has_patch }}
         with:
           script: |
@@ -1300,18 +1313,17 @@ jobs:
       pull-requests: write
     timeout-minutes: 15
     env:
-      GH_AW_CALLER_WORKFLOW_ID: "${{ github.repository }}/issue-triage-agent"
+      GH_AW_CALLER_WORKFLOW_ID: "${{ github.repository }}/daily-issue-triage"
       GH_AW_DETECTION_CONCLUSION: ${{ needs.detection.outputs.detection_conclusion }}
       GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
       GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
       GH_AW_ENGINE_ID: "copilot"
       GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
       GH_AW_ENGINE_VERSION: "1.0.52"
-      GH_AW_WORKFLOW_EMOJI: "🔧"
-      GH_AW_WORKFLOW_ID: "issue-triage-agent"
-      GH_AW_WORKFLOW_NAME: "Issue Triage Agent"
-      GH_AW_WORKFLOW_SOURCE: "github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115"
-      GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/github/gh-aw/blob/359795d49ada21681ab616bd4cbcb144a7387115/.github/workflows/issue-triage-agent.md"
+      GH_AW_WORKFLOW_ID: "daily-issue-triage"
+      GH_AW_WORKFLOW_NAME: "Daily Issue Triage"
+      GH_AW_WORKFLOW_SOURCE: "githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9"
+      GH_AW_WORKFLOW_SOURCE_URL: "${{ github.server_url }}/githubnext/agentics/blob/d7c1dc4b72b00607a67caaffdcc216cb64379cf9/workflows/daily-issue-triage.md"
     outputs:
       code_push_failure_count: ${{ steps.process_safe_outputs.outputs.code_push_failure_count }}
       code_push_failure_errors: ${{ steps.process_safe_outputs.outputs.code_push_failure_errors }}
@@ -1324,15 +1336,15 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           trace-id: ${{ needs.activation.outputs.setup-trace-id }}
           parent-span-id: ${{ needs.activation.outputs.setup-parent-span-id || needs.activation.outputs.setup-span-id }}
         env:
-          GH_AW_SETUP_WORKFLOW_NAME: "Issue Triage Agent"
-          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/issue-triage-agent.lock.yml@${{ github.ref }}
+          GH_AW_SETUP_WORKFLOW_NAME: "Daily Issue Triage"
+          GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/daily-issue-triage.lock.yml@${{ github.ref }}
           GH_AW_INFO_VERSION: "1.0.52"
           GH_AW_INFO_AWF_VERSION: "v0.25.55"
           GH_AW_INFO_BODY_MODIFIED: "false"
@@ -1369,7 +1381,7 @@ jobs:
           GH_AW_ALLOWED_DOMAINS: "api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,api.snapcraft.io,archive.ubuntu.com,azure.archive.ubuntu.com,crl.geotrust.com,crl.globalsign.com,crl.identrust.com,crl.sectigo.com,crl.thawte.com,crl.usertrust.com,crl.verisign.com,crl3.digicert.com,crl4.digicert.com,crls.ssl.com,github.com,host.docker.internal,json-schema.org,json.schemastore.org,keyserver.ubuntu.com,ocsp.digicert.com,ocsp.geotrust.com,ocsp.globalsign.com,ocsp.identrust.com,ocsp.sectigo.com,ocsp.ssl.com,ocsp.thawte.com,ocsp.usertrust.com,ocsp.verisign.com,packagecloud.io,packages.cloud.google.com,packages.microsoft.com,ppa.launchpad.net,raw.githubusercontent.com,registry.npmjs.org,s.symcb.com,s.symcd.com,security.ubuntu.com,telemetry.enterprise.githubcopilot.com,ts-crl.ws.symantec.com,ts-ocsp.ws.symantec.com,www.googleapis.com"
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_API_URL: ${{ github.api_url }}
-          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"max\":1},\"add_labels\":{\"allowed\":[\"bug\",\"feature\",\"enhancement\",\"documentation\",\"question\",\"help-wanted\",\"good-first-issue\"]},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
+          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"max\":10,\"target\":\"*\"},\"add_labels\":{\"max\":10,\"target\":\"*\"},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
         with:
           github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/daily-issue-triage.md b/.github/workflows/daily-issue-triage.md
new file mode 100644
index 00000000000..719dca1f3c6
--- /dev/null
+++ b/.github/workflows/daily-issue-triage.md
@@ -0,0 +1,171 @@
+---
+description: |
+  Scheduled daily triage that processes untriaged CloudStack issues in batches.
+  Detects duplicates, filters spam, and assigns CloudStack-specific labels
+  (type:*, component:*, Severity:*, status:*), then posts a structured triage report.
+
+name: Daily Issue Triage
+
+on:
+  schedule: daily around 14:00 on weekdays
+  workflow_dispatch:
+
+permissions: read-all
+
+network: defaults
+
+safe-outputs:
+  add-labels:
+    target: "*"
+    max: 10
+  add-comment:
+    target: "*"
+    max: 10
+
+tools:
+  web-fetch:
+  github:
+    toolsets: [issues, labels]
+    min-integrity: none
+
+source: githubnext/agentics/workflows/daily-issue-triage.md@d7c1dc4b72b00607a67caaffdcc216cb64379cf9
+timeout-minutes: 60
+---
+
+# Daily Issue Triage
+
+<!-- Note - this file can be customized to your needs. Replace this section directly, or add further instructions here. After editing run 'gh aw compile' -->
+
+You are a batch triage assistant for GitHub issues in **${{ github.repository }}** (Apache CloudStack). Your task is to find untriaged issues and triage them one by one. Your triage comments are written for maintainers reviewing the triage, not for the issue author.
+
+Do not make assumptions beyond what the issue content supports. Do not invent missing context.
+
+## Step 1: Find untriaged issues
+
+Use the `search_issues` tool to find open issues that need triage. An issue is considered untriaged if it has **no labels applied**.
+
+Query: `repo:${{ github.repository }} is:issue is:open no:label`
+
+Paginate through all results to find untriaged issues. Do not stop at the first page.
+
+From the results, filter out:
+- Issues that already have a triage comment (look for "🎯 Triage report" in comments). **Never retriage an issue that has already been triaged.**
+- Issues created by bots (unless they look like real user issues).
+- Issues that have any labels already applied (even if they weren't applied by this workflow).
+
+Process the **oldest untriaged issues first**. Note: this workflow is capped at 10 label-sets and 10 comments per run, so the backlog will drain over several daily runs — that is intentional.
+
+## Step 2: Fetch labels (once)
+
+Before triaging any issues, fetch the list of labels available in this repository using the `list_labels` tool. Use this live list for all issues in the batch — only apply labels that actually exist in the repository.
+
+CloudStack uses a prefixed label taxonomy. Choose from these families:
+
+- **Type** (pick the single best one): `type:bug`, `type:new-feature`, `type:enhancement`, `type:improvement`, `type:regression`, `type:security`, `type:question`, `type:config`, `type:cleanup`
+- **Component** (apply when clearly identifiable; more than one is allowed): e.g. `component:kvm`, `component:vmware`, `component:XenServer`, `component:api`, `component:UI`, `component:networking`, `component:virtual-router`, `component:management-server`, `component:primary-storage`, `component:secondary-storage`, `component:kubernetes`, `component:database`, and others — use the full list returned by `list_labels`.
+- **Severity** (bugs only, when assessable): `Severity:BLOCKER`, `Severity:Critical`, `Severity:Major`, `Severity:Minor`, `Severity:Trivial`
+- **Duplicate / invalid**: `status:duplicate`, `status:invalid`
+- **Help wanted / newcomer-friendly**: `status:Help-wanted`
+
+## Step 3: Triage each issue
+
+For each untriaged issue, perform the following steps:
+
+### 3a: Gather context
+
+1. Retrieve the full issue content using the `get_issue` tool.
+2. Fetch any comments on the issue using the `get_issue_comments` tool.
+3. Search for similar issues using the `search_issues` tool.
+
+### 3b: Spam and quality check
+
+**Spam and invalid issues:** If the issue is obviously spam, bot-generated, gibberish, or a test issue:
+- Apply the `status:invalid` label.
+- **Do not close the issue** — closing is a human decision. Note in the report that it looks like spam/invalid so a maintainer can act.
+- Move to the next issue.
+
+**Incomplete issues:** If the issue lacks enough detail for meaningful triage, add a comment that politely asks the author to provide the missing information:
+- For bugs: steps to reproduce, expected vs actual behavior, logs/errors, environment details (CloudStack version, hypervisor, etc.).
+- For other issue types: equivalent details that would make the report actionable.
+- Apply a `type:question` label if appropriate.
+- Be specific about what is missing and why it is needed.
+- Move to the next issue.
+
+### 3c: Select labels
+
+- Be cautious with labels; they can trigger automation.
+- Choose a single `type:*` label that best reflects the issue's nature.
+- Add `component:*` label(s) when the affected area is clear from the content.
+- Add a `Severity:*` label for bugs when severity can be reasonably assessed.
+- Do not apply labels that do not exist in the repository.
+- It is better to under-label than to speculatively add labels.
+
+### 3d: Detect duplicates and related issues
+
+- Review the similar issues found in Step 3a.
+- Classify matches as:
+  - **Duplicate** (high confidence): the issue describes the same problem as an existing open issue. Include up to 3.
+  - **Related**: similar domain or adjacent problem, but not a duplicate. Include up to 3.
+- If a high-confidence duplicate is found, apply the `status:duplicate` label.
+- If no similar issues are found, state that explicitly in your report.
+
+### 3e: Assess coding agent suitability
+
+Assess whether the issue is suitable for automated coding agent assignment:
+- **Suitable**: clear requirements, sufficient context, well-defined success criteria, self-contained scope.
+- **Needs more info**: potentially suitable but missing details needed to start.
+- **Not suitable**: requires investigation, design decisions, extensive coordination, or policy/architectural choices.
+
+### 3f: Additional analysis
+
+- Search the web for relevant documentation, error messages, or known solutions if applicable.
+- Write notes, debugging strategies, and/or reproduction steps relevant to the issue.
+- Suggest resources or links that might help resolve the issue.
+
+### 3g: Apply results and post comment
+
+Apply all triage results for this issue:
+- Use `update_issue` to apply the chosen labels.
+- Add an issue comment with the triage report using the format below.
+
+Then move to the next issue.
+
+## Processing order
+
+1. Fetch available labels (Step 2, once at the start).
+2. Find untriaged issues (Step 1).
+3. For each issue (oldest first), run Step 3 (gather, check, label, detect duplicates, comment).
+
+## Comment format
+
+Use this structure for each triage comment. Use collapsed sections to keep it tidy.
+
+```markdown
+## 🎯 Triage report
+
+{2-3 sentence summary to help a maintainer quickly grasp the issue.}
+
+### 📊 Assessment
+
+| Dimension | Value | Reasoning |
+|---|---|---|
+| **Type** | [type:* label or "none"] | [brief] |
+| **Component** | [component:* label(s) or "none"] | [brief] |
+| **Severity** | [Severity:* label or "n/a"] | [brief] |
+| **Labels** | [all labels applied or "none"] | [brief] |
+| **Coding agent** | [Suitable / Needs more info / Not suitable] | [brief] |
+
+### 🔗 Similar issues
+
+- issue-url (duplicate/related) — [brief explanation]
+
+<details><summary>💡 Notes and suggestions</summary>
+
+{Debugging strategies, reproduction steps, resource links, sub-task checklists, nudges for the team.}
+
+</details>
+```
+
+If no similar issues were found, omit the "Similar issues" section. If there are no notes to add, omit the collapsed section.
+
+**Important**: Never close issues. Only apply labels and post comments.
diff --git a/.github/workflows/daily-repo-status.lock.yml b/.github/workflows/daily-repo-status.lock.yml
index 7c3d20a166e..0992d3b67de 100644
--- a/.github/workflows/daily-repo-status.lock.yml
+++ b/.github/workflows/daily-repo-status.lock.yml
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"ae44897dc32d20c421588b31a279653abf436964ad86c58885e0edbfbb2f0416","compiler_version":"v0.76.1","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"bcecce6f1d9f8df2b3eca9eb7bb1fdbac13c396c240a2dc802a96546f435b969","compiler_version":"v0.76.1","strict":true,"agent_id":"copilot","agent_model":"claude-haiku-4.5"}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"46d564922b082d0db93244972e8005ea6904ee5f","version":"v0.76.1"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.55","digest":"sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.25.55@sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55","digest":"sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55@sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.55","digest":"sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.25.55@sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.19","digest":"sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.19@sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f"},{"image":"ghcr.io/github/github-mcp-server:v1.0.4","digest":"sha256:e3816a476a977cfb836e7d221510011436c654d11861db66ecfd826601aba6a4","pinned_image":"ghcr.io/github/github-mcp-server:v1.0.4@sha256:e3816a476a977cfb836e7d221510011436c654d11861db66ecfd826601aba6a4"},{"image":"node:lts-alpine","digest":"sha256:2bdb65ed1dab192432bc31c95f94155ca5ad7fc1392fb7eb7526ab682fa5bf14","pinned_image":"node:lts-alpine@sha256:2bdb65ed1dab192432bc31c95f94155ca5ad7fc1392fb7eb7526ab682fa5bf14"}]}
 #    ___                   _   _
 #   / _ \                 | | (_)
@@ -36,12 +36,12 @@
 #   - GITHUB_TOKEN
 #
 # Custom actions used:
-#   - actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+#   - actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 #   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
 #   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+#   - github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
 #
 # Container images used:
 #   - ghcr.io/github/gh-aw-firewall/agent:0.25.55@sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731
@@ -91,7 +91,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -107,7 +107,7 @@ jobs:
         env:
           GH_AW_INFO_ENGINE_ID: "copilot"
           GH_AW_INFO_ENGINE_NAME: "GitHub Copilot CLI"
-          GH_AW_INFO_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
+          GH_AW_INFO_MODEL: "claude-haiku-4.5"
           GH_AW_INFO_VERSION: "1.0.52"
           GH_AW_INFO_AGENT_VERSION: "1.0.52"
           GH_AW_INFO_CLI_VERSION: "v0.76.1"
@@ -136,7 +136,7 @@ jobs:
         env:
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
       - name: Checkout .github and .agents folders
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           sparse-checkout: |
@@ -195,20 +195,20 @@ jobs:
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
-          cat << 'GH_AW_PROMPT_603e0a48f86a9470_EOF'
+          cat << 'GH_AW_PROMPT_eeb322738661ed58_EOF'
           <system>
-          GH_AW_PROMPT_603e0a48f86a9470_EOF
+          GH_AW_PROMPT_eeb322738661ed58_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_603e0a48f86a9470_EOF'
+          cat << 'GH_AW_PROMPT_eeb322738661ed58_EOF'
           <safe-output-tools>
           Tools: create_issue, missing_tool, missing_data, noop
           </safe-output-tools>
-          GH_AW_PROMPT_603e0a48f86a9470_EOF
+          GH_AW_PROMPT_eeb322738661ed58_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_603e0a48f86a9470_EOF'
+          cat << 'GH_AW_PROMPT_eeb322738661ed58_EOF'
           <github-context>
           The following GitHub context information is available for this workflow:
           {{#if github.actor}}
@@ -237,12 +237,12 @@ jobs:
           {{/if}}
           </github-context>
 
-          GH_AW_PROMPT_603e0a48f86a9470_EOF
+          GH_AW_PROMPT_eeb322738661ed58_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_603e0a48f86a9470_EOF'
+          cat << 'GH_AW_PROMPT_eeb322738661ed58_EOF'
           </system>
           {{#runtime-import .github/workflows/daily-repo-status.md}}
-          GH_AW_PROMPT_603e0a48f86a9470_EOF
+          GH_AW_PROMPT_eeb322738661ed58_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -352,7 +352,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -374,7 +374,7 @@ jobs:
             echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json"
           } >> "$GITHUB_OUTPUT"
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Create gh-aw temp directory
@@ -450,9 +450,9 @@ jobs:
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_9b6646f0d620a78f_EOF'
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_51571b44da85874d_EOF'
           {"create_issue":{"close_older_issues":true,"labels":["report","daily-status"],"max":1,"title_prefix":"[repo-status] "},"create_report_incomplete_issue":{},"mentions":{"enabled":false},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_9b6646f0d620a78f_EOF
+          GH_AW_SAFE_OUTPUTS_CONFIG_51571b44da85874d_EOF
       - name: Generate Safe Outputs Tools
         env:
           GH_AW_TOOLS_META_JSON: |
@@ -658,7 +658,7 @@ jobs:
 
           mkdir -p /home/runner/.copilot
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_d075a7f45ab51044_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_4b3a7789a6eea081_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
               "github": {
@@ -702,7 +702,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_d075a7f45ab51044_EOF
+          GH_AW_MCP_CONFIG_4b3a7789a6eea081_EOF
       - name: Mount MCP servers as CLIs
         id: mount-mcp-clis
         continue-on-error: true
@@ -750,7 +750,7 @@ jobs:
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
           COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_AGENT_COPILOT || 'claude-sonnet-4.6' }}
+          COPILOT_MODEL: claude-haiku-4.5
           GH_AW_MCP_CONFIG: /home/runner/.copilot/mcp-config.json
           GH_AW_PHASE: agent
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
@@ -957,7 +957,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1108,7 +1108,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
@@ -1137,7 +1137,7 @@ jobs:
           echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
       - name: Checkout repository for patch context
         if: needs.agent.outputs.has_patch == 'true'
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       # --- Threat Detection ---
@@ -1238,7 +1238,7 @@ jobs:
           COPILOT_AGENT_RUNNER_TYPE: STANDALONE
           COPILOT_DUMMY_BYOK: dummy-byok-key-for-offline-mode
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_MODEL: ${{ vars.GH_AW_MODEL_DETECTION_COPILOT || 'claude-sonnet-4.6' }}
+          COPILOT_MODEL: claude-haiku-4.5
           GH_AW_PHASE: detection
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
           GH_AW_VERSION: v0.76.1
@@ -1312,7 +1312,7 @@ jobs:
       GH_AW_DETECTION_REASON: ${{ needs.detection.outputs.detection_reason }}
       GH_AW_EFFECTIVE_TOKENS: ${{ needs.agent.outputs.effective_tokens }}
       GH_AW_ENGINE_ID: "copilot"
-      GH_AW_ENGINE_MODEL: ${{ needs.agent.outputs.model }}
+      GH_AW_ENGINE_MODEL: "claude-haiku-4.5"
       GH_AW_ENGINE_VERSION: "1.0.52"
       GH_AW_WORKFLOW_ID: "daily-repo-status"
       GH_AW_WORKFLOW_NAME: "Repo Status"
@@ -1330,7 +1330,7 @@ jobs:
     steps:
       - name: Setup Scripts
         id: setup
-        uses: github/gh-aw-actions/setup@46d564922b082d0db93244972e8005ea6904ee5f # v0.76.1
+        uses: github/gh-aw-actions/setup@c0338fef4749d08c21f8f975fb0e37efa17dda47 # v0.79.8
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
diff --git a/.github/workflows/daily-repo-status.md b/.github/workflows/daily-repo-status.md
index 8debf570843..49b553940b8 100644
--- a/.github/workflows/daily-repo-status.md
+++ b/.github/workflows/daily-repo-status.md
@@ -16,6 +16,10 @@ permissions:
 
 network: defaults
 
+engine:
+  id: copilot
+  model: claude-haiku-4.5
+
 tools:
   github:
     # If in a public repo, setting `lockdown: false` allows
diff --git a/.github/workflows/docker-cloudstack-simulator.yml b/.github/workflows/docker-cloudstack-simulator.yml
index dc00968563d..ac778a48af5 100644
--- a/.github/workflows/docker-cloudstack-simulator.yml
+++ b/.github/workflows/docker-cloudstack-simulator.yml
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Login to Docker Registry
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: ${{ secrets.DOCKER_REGISTRY }}
           username: ${{ secrets.DOCKERHUB_USER }}
@@ -47,7 +47,7 @@ jobs:
       - name: Set Docker repository name
         run: echo "DOCKER_REPOSITORY=apache" >> $GITHUB_ENV
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/issue-triage-agent.md b/.github/workflows/issue-triage-agent.md
deleted file mode 100644
index 2d382f9117c..00000000000
--- a/.github/workflows/issue-triage-agent.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-on:
-  schedule: daily around 14:00 on weekdays
-  workflow_dispatch: null
-permissions:
-  issues: read
-imports:
-- github/gh-aw/.github/workflows/shared/reporting.md@359795d49ada21681ab616bd4cbcb144a7387115
-- github/gh-aw/.github/workflows/shared/noop-reminder.md@359795d49ada21681ab616bd4cbcb144a7387115
-safe-outputs:
-  add-comment: {}
-  add-labels:
-    allowed:
-    - bug
-    - feature
-    - enhancement
-    - documentation
-    - question
-    - help-wanted
-    - good-first-issue
-emoji: 🔧
-source: github/gh-aw/.github/workflows/issue-triage-agent.md@359795d49ada21681ab616bd4cbcb144a7387115
-strict: true
-timeout-minutes: 5
-tools:
-  cli-proxy: true
-  github:
-    toolsets:
-    - issues
-    - labels
----
-# Issue Triage Agent
-
-List open issues in ${{ github.repository }} that have no labels. For each unlabeled issue, analyze the title and body, then add one of the allowed labels: `bug`, `feature`, `enhancement`, `documentation`, `question`, `help-wanted`, or `good-first-issue`.
-
-Skip issues that:
-- Already have any of these labels
-- Have been assigned to any user (especially non-bot users)
-
-After adding the label to an issue, mention the issue author in a comment using this format (follow shared/reporting.md guidelines):
-
-**Comment Template**:
-```markdown
-### 🏷️ Issue Triaged
-
-Hi @{author}! I've categorized this issue as **{label_name}** based on the following analysis:
-
-**Reasoning**: {brief_explanation_of_why_this_label}
-
-<details>
-<summary>View Triage Details</summary>
-
-#### Analysis
-- **Keywords detected**: {list_of_keywords_that_matched}
-- **Issue type indicators**: {what_made_this_fit_the_category}
-- **Confidence**: {High/Medium/Low}
-
-#### Recommended Next Steps
-- {context_specific_suggestion_1}
-- {context_specific_suggestion_2}
-
-</details>
-
-**References**: [Triage run §{run_id}](https://github.com/github/gh-aw/actions/runs/{run_id})
-```
-
-**Key formatting requirements**:
-- Use h3 (###) for the main heading
-- Keep reasoning visible for quick understanding
-- Wrap detailed analysis in `<details>` tags
-- Include workflow run reference
-- Keep total comment concise (collapsed details prevent noise)
-
-## Batch Comment Optimization
-
-For efficiency, if multiple issues are triaged in a single run:
-1. Add individual labels to each issue
-2. Add a brief comment to each issue (using the template above)
-3. Optionally: Create a discussion summarizing all triage actions for that run
-
-This provides both per-issue context and batch visibility.
-
-## Labels
-
-- `bug`: Indicates a problem or error in the code that needs fixing.
-- `feature`: Represents a new feature request or enhancement to existing functionality.
-- `enhancement`: Suggests improvements to existing features or code.
-- `documentation`: Pertains to issues related to documentation, such as missing or unclear docs.
-- `question`: Used for issues that are asking for clarification or have questions about the project.
-- `help-wanted`: Indicates that the issue is a good candidate for external contributions and help
-- `good-first-issue`: Marks issues that are suitable for newcomers to the project, often with simpler scope.
diff --git a/.github/workflows/main-sonar-check.yml b/.github/workflows/main-sonar-check.yml
index 3d510fa5dc3..f48409fbc0c 100644
--- a/.github/workflows/main-sonar-check.yml
+++ b/.github/workflows/main-sonar-check.yml
@@ -31,7 +31,7 @@ jobs:
     name: Sonar JaCoCo Coverage
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -63,3 +63,5 @@ jobs:
           verbose: true
           name: codecov
           token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Compute Coverage Grade
+        run: bash scripts/coverage-grade.sh client/target/site/jacoco-aggregate/jacoco.xml
diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml
index f23719f7183..badf8c4b4c5 100644
--- a/.github/workflows/merge-conflict-checker.yml
+++ b/.github/workflows/merge-conflict-checker.yml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Conflict Check
-        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           dirtyLabel: "status:has-conflicts"
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 1ea00be9112..4de995479c5 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check Out
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Set up Python
diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
index a36a956856e..f8b0aa14932 100644
--- a/.github/workflows/rat.yml
+++ b/.github/workflows/rat.yml
@@ -28,7 +28,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Setup Environment
diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml
index e614d186482..fbb3cb9f540 100644
--- a/.github/workflows/sonar-check.yml
+++ b/.github/workflows/sonar-check.yml
@@ -29,7 +29,7 @@ jobs:
     name: Sonar JaCoCo Coverage
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -65,3 +65,51 @@ jobs:
           verbose: true
           name: codecov
           token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Compute Coverage Grade
+        id: grade
+        run: bash scripts/coverage-grade.sh client/target/site/jacoco-aggregate/jacoco.xml
+      - name: Post Coverage Grade Comment on PR
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const grade     = '${{ steps.grade.outputs.coverage_grade }}';
+            const label     = '${{ steps.grade.outputs.coverage_grade_label }}';
+            const linePct   = '${{ steps.grade.outputs.line_coverage }}';
+            const branchPct = '${{ steps.grade.outputs.branch_coverage }}';
+            const emojiMap  = { A: '🟢', B: '🟡', C: '🟠', D: '🔴', F: '⛔' };
+            const emoji     = emojiMap[grade] ?? '❓';
+            const runUrl    = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+
+            const branchRow = branchPct !== 'N/A'
+              ? `| Branch coverage | **${branchPct}%** |`
+              : '';
+
+            const body = [
+              `## ${emoji} Test Coverage Grade: \`${grade}\` — ${label}`,
+              '',
+              '| Metric | Value |',
+              '|--------|-------|',
+              `| Line coverage   | **${linePct}%** |`,
+              branchRow,
+              '',
+              '### Grade Scale',
+              '| Grade | Line Coverage | Meaning |',
+              '|-------|--------------|---------|',
+              '| 🟢 A | ≥ 80% | Excellent - this code sleeps well at night 😴 |',
+              '| 🟡 B | 60-79% | Good - almost there, don\'t stop now 😉 |',
+              '| 🟠 C | 40-59% | Acceptable - your code is wearing a seatbelt, but no airbags 😬 |',
+              '| 🔴 D | 20-39% | Marginal - boldly shipping where no test has gone before 🖖 |',
+              '| ⛔ F | < 20%  | Failing - tests? what tests? 🔥 |',
+              '',
+              '> Branch coverage is shown as a secondary signal. Grade is determined by **line coverage**.',
+              `> [View full Actions run](${runUrl})`,
+            ].filter(l => l !== undefined).join('\n');
+
+            await github.rest.issues.createComment({
+              owner:        context.repo.owner,
+              repo:         context.repo.repo,
+              issue_number: context.issue.number,
+              body:         body,
+            });
+            console.log('Posted coverage grade comment');
diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml
index 0a6cd5f3ea5..aeccb5624f7 100644
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
index 42395bf8999..c9d55870ede 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -43,7 +43,7 @@ import org.apache.cloudstack.storage.object.Bucket;
 import org.apache.cloudstack.storage.object.ObjectStore;
 import org.apache.cloudstack.storage.sharedfs.SharedFS;
 import org.apache.cloudstack.usage.Usage;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
+import org.apache.cloudstack.schedule.ResourceSchedule;
 
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterGuestIpv6Prefix;
@@ -125,17 +125,18 @@ public class EventTypes {
     public static final String EVENT_VM_UNMANAGE = "VM.UNMANAGE";
     public static final String EVENT_VM_RECOVER = "VM.RECOVER";
 
-    // VM Schedule
-    public static final String EVENT_VM_SCHEDULE_CREATE = "VM.SCHEDULE.CREATE";
-    public static final String EVENT_VM_SCHEDULE_UPDATE = "VM.SCHEDULE.UPDATE";
-    public static final String EVENT_VM_SCHEDULE_DELETE = "VM.SCHEDULE.DELETE";
-
+    // VM Schedule action-execution events (fired when a scheduled action runs).
     public static final String EVENT_VM_SCHEDULE_START = "VM.SCHEDULE.START";
     public static final String EVENT_VM_SCHEDULE_STOP = "VM.SCHEDULE.STOP";
     public static final String EVENT_VM_SCHEDULE_REBOOT = "VM.SCHEDULE.REBOOT";
     public static final String EVENT_VM_SCHEDULE_FORCE_STOP = "VM.SCHEDULE.FORCE.STOP";
     public static final String EVENT_VM_SCHEDULE_FORCE_REBOOT = "VM.SCHEDULE.FORCE.REBOOT";
 
+    // Generic Resource Schedule CRUD events (apply to all resource types).
+    public static final String EVENT_SCHEDULE_CREATE = "SCHEDULE.CREATE";
+    public static final String EVENT_SCHEDULE_UPDATE = "SCHEDULE.UPDATE";
+    public static final String EVENT_SCHEDULE_DELETE = "SCHEDULE.DELETE";
+
     // Domain Router
     public static final String EVENT_ROUTER_CREATE = "ROUTER.CREATE";
     public static final String EVENT_ROUTER_DESTROY = "ROUTER.DESTROY";
@@ -676,6 +677,7 @@ public class EventTypes {
     public static final String EVENT_AUTOSCALEVMGROUP_DISABLE = "AUTOSCALEVMGROUP.DISABLE";
     public static final String EVENT_AUTOSCALEVMGROUP_SCALEDOWN = "AUTOSCALEVMGROUP.SCALEDOWN";
     public static final String EVENT_AUTOSCALEVMGROUP_SCALEUP = "AUTOSCALEVMGROUP.SCALEUP";
+    public static final String EVENT_AUTOSCALEVMGROUP_SCHEDULE_UPDATE = "AUTOSCALEVMGROUP.SCHEDULE.UPDATE";
 
     public static final String EVENT_BAREMETAL_DHCP_SERVER_ADD = "PHYSICAL.DHCP.ADD";
     public static final String EVENT_BAREMETAL_DHCP_SERVER_DELETE = "PHYSICAL.DHCP.DELETE";
@@ -888,15 +890,18 @@ public class EventTypes {
         entityEventDetails.put(EVENT_VM_IMPORT, VirtualMachine.class);
         entityEventDetails.put(EVENT_VM_UNMANAGE, VirtualMachine.class);
 
-        // VMSchedule
-        entityEventDetails.put(EVENT_VM_SCHEDULE_CREATE, VMSchedule.class);
-        entityEventDetails.put(EVENT_VM_SCHEDULE_DELETE, VMSchedule.class);
-        entityEventDetails.put(EVENT_VM_SCHEDULE_UPDATE, VMSchedule.class);
-        entityEventDetails.put(EVENT_VM_SCHEDULE_START, VMSchedule.class);
-        entityEventDetails.put(EVENT_VM_SCHEDULE_STOP, VMSchedule.class);
-        entityEventDetails.put(EVENT_VM_SCHEDULE_REBOOT, VMSchedule.class);
-        entityEventDetails.put(EVENT_VM_SCHEDULE_FORCE_STOP, VMSchedule.class);
-        entityEventDetails.put(EVENT_VM_SCHEDULE_FORCE_REBOOT, VMSchedule.class);
+        // VMSchedule action-execution events
+        entityEventDetails.put(EVENT_VM_SCHEDULE_START, ResourceSchedule.class);
+        entityEventDetails.put(EVENT_VM_SCHEDULE_STOP, ResourceSchedule.class);
+        entityEventDetails.put(EVENT_VM_SCHEDULE_REBOOT, ResourceSchedule.class);
+        entityEventDetails.put(EVENT_VM_SCHEDULE_FORCE_STOP, ResourceSchedule.class);
+        entityEventDetails.put(EVENT_VM_SCHEDULE_FORCE_REBOOT, ResourceSchedule.class);
+        entityEventDetails.put(EVENT_AUTOSCALEVMGROUP_SCHEDULE_UPDATE, ResourceSchedule.class);
+
+        // Generic Resource Schedule
+        entityEventDetails.put(EVENT_SCHEDULE_CREATE, ResourceSchedule.class);
+        entityEventDetails.put(EVENT_SCHEDULE_UPDATE, ResourceSchedule.class);
+        entityEventDetails.put(EVENT_SCHEDULE_DELETE, ResourceSchedule.class);
 
         entityEventDetails.put(EVENT_ROUTER_CREATE, VirtualRouter.class);
         entityEventDetails.put(EVENT_ROUTER_DESTROY, VirtualRouter.class);
diff --git a/api/src/main/java/com/cloud/host/Host.java b/api/src/main/java/com/cloud/host/Host.java
index b5234820151..c110e4ca94e 100644
--- a/api/src/main/java/com/cloud/host/Host.java
+++ b/api/src/main/java/com/cloud/host/Host.java
@@ -63,6 +63,9 @@ public interface Host extends StateObject<Status>, Identity, Partition, HAResour
     String HOST_OVFTOOL_VERSION = "host.ovftool.version";
     String HOST_VIRTV2V_VERSION = "host.virtv2v.version";
     String HOST_SSH_PORT = "host.ssh.port";
+    String HOST_CDROM_MAX_COUNT = "host.cdrom.max.count";
+    String GUEST_OS_CATEGORY_ID = "guest.os.category.id";
+    String GUEST_OS_RULE = "guest.os.rule";
 
     int DEFAULT_SSH_PORT = 22;
 
diff --git a/api/src/main/java/com/cloud/network/NetworkService.java b/api/src/main/java/com/cloud/network/NetworkService.java
index 53692f932a4..c32bb711c0f 100644
--- a/api/src/main/java/com/cloud/network/NetworkService.java
+++ b/api/src/main/java/com/cloud/network/NetworkService.java
@@ -232,7 +232,7 @@ public interface NetworkService {
     /**
      * Requests an IP address for the guest NIC
      */
-    NicSecondaryIp allocateSecondaryGuestIP(long nicId, IpAddresses requestedIpPair) throws InsufficientAddressCapacityException;
+    NicSecondaryIp allocateSecondaryGuestIP(long nicId, IpAddresses requestedIpPair, String description) throws InsufficientAddressCapacityException;
 
     boolean releaseSecondaryIpFromNic(long ipAddressId);
 
diff --git a/api/src/main/java/com/cloud/storage/Storage.java b/api/src/main/java/com/cloud/storage/Storage.java
index 5b3e97698fd..ddf5978497b 100644
--- a/api/src/main/java/com/cloud/storage/Storage.java
+++ b/api/src/main/java/com/cloud/storage/Storage.java
@@ -170,6 +170,7 @@ public class Storage {
         ISO(false, false, EncryptionSupport.Unsupported), // for iso image
         LVM(false, false, EncryptionSupport.Unsupported), // XenServer local LVM SR
         CLVM(true, false, EncryptionSupport.Unsupported),
+        CLVM_NG(true, false, EncryptionSupport.Hypervisor),
         RBD(true, true, EncryptionSupport.Unsupported), // http://libvirt.org/storage.html#StorageBackendRBD
         SharedMountPoint(true, true, EncryptionSupport.Hypervisor),
         VMFS(true, true, EncryptionSupport.Unsupported), // VMware VMFS storage
diff --git a/api/src/main/java/com/cloud/vm/NicSecondaryIp.java b/api/src/main/java/com/cloud/vm/NicSecondaryIp.java
index 2856e0aea75..d25627c1782 100644
--- a/api/src/main/java/com/cloud/vm/NicSecondaryIp.java
+++ b/api/src/main/java/com/cloud/vm/NicSecondaryIp.java
@@ -38,6 +38,8 @@ public interface NicSecondaryIp extends ControlledEntity, Identity, InternalIden
 
     String getIp6Address();
 
+    String getDescription();
+
     long getNetworkId();
 
     long getVmId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 77b3a8a3d9a..7ef7864d77f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -450,6 +450,7 @@ public class ApiConstants {
     public static final String MAX_VGPU_PER_PHYSICAL_GPU = "maxvgpuperphysicalgpu";
     public static final String GUEST_OS_LIST = "guestoslist";
     public static final String GUEST_OS_COUNT = "guestoscount";
+    public static final String GUEST_OS_RULE = "guestosrule";
     public static final String OS_MAPPING_CHECK_ENABLED = "osmappingcheckenabled";
     public static final String OUTOFBANDMANAGEMENT_POWERSTATE = "outofbandmanagementpowerstate";
     public static final String OUTOFBANDMANAGEMENT_ENABLED = "outofbandmanagementenabled";
@@ -1343,8 +1344,10 @@ public class ApiConstants {
     public static final String VNF_CONFIGURE_MANAGEMENT = "vnfconfiguremanagement";
     public static final String VNF_CIDR_LIST = "vnfcidrlist";
 
+    public static final String AUTHORIZE_URL = "authorizeurl";
     public static final String CLIENT_ID = "clientid";
     public static final String REDIRECT_URI = "redirecturi";
+    public static final String TOKEN_URL = "tokenurl";
 
     public static final String IS_TAG_A_RULE = "istagarule";
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
index c085abd42c7..69bca7c79e2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -49,9 +49,14 @@ public class UpdateHostCmd extends BaseCmd {
     @Parameter(name = ApiConstants.OS_CATEGORY_ID,
                type = CommandType.UUID,
                entityType = GuestOSCategoryResponse.class,
-               description = "The ID of OS category to update the host with")
+               description = "the ID of OS category used to prioritize VMs with matching OS category during the allocation process. " +
+                       "It cannot be used alongside the 'guestosrule' parameter.")
     private Long osCategoryId;
 
+    @Parameter(name = ApiConstants.GUEST_OS_RULE, type = CommandType.STRING, description = "the guest OS rule written in JavaScript to match with the OS of the VM." +
+            "It cannot be used alongside the 'oscategoryid' parameter.")
+    private String guestOsRule;
+
     @Parameter(name = ApiConstants.ALLOCATION_STATE,
                type = CommandType.STRING,
                description = "Change resource state of host, valid values are [Enable, Disable]. Operation may failed if host in states not allowing Enable/Disable")
@@ -96,6 +101,10 @@ public class UpdateHostCmd extends BaseCmd {
         return osCategoryId;
     }
 
+    public String getGuestOsRule() {
+        return guestOsRule;
+    }
+
     public String getAllocationState() {
         return allocationState;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeysCmd.java
index 11d7c1d2ffa..28c79517f4b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeysCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeysCmd.java
@@ -50,7 +50,7 @@ public class RegisterUserKeysCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "API key pair name.")
     private String name;
 
-    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "API key pair description.")
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "API key pair description.", length = 1024)
     private String description;
 
     @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, description = "Start date of the API key pair. " +
@@ -138,6 +138,9 @@ public class RegisterUserKeysCmd extends BaseAsyncCmd {
 
             String description = detail.get(ApiConstants.DESCRIPTION);
             if (StringUtils.isNotEmpty(description)) {
+                if (description.length() > 255) {
+                    throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Rule description cannot be longer than 255 characters.");
+                }
                 ruleDetails.put(ApiConstants.DESCRIPTION, description);
             }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
index cf4aa41f795..2560d837de1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
@@ -27,6 +27,7 @@ import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.user.UserCmd;
 import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
+import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 
 import com.cloud.event.EventTypes;
@@ -51,6 +52,10 @@ public class DetachIsoCmd extends BaseAsyncCmd implements UserCmd {
             description = "If true, ejects the ISO before detaching on VMware. Default: false", since = "4.15.1")
     protected Boolean forced;
 
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class,
+            description = "The ID of the ISO to detach. Required when the Instance has more than one ISO attached.", since = "4.23.0")
+    protected Long id;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -104,7 +109,7 @@ public class DetachIsoCmd extends BaseAsyncCmd implements UserCmd {
 
     @Override
     public void execute() {
-        boolean result = _templateService.detachIso(virtualMachineId, null, isForced());
+        boolean result = _templateService.detachIso(virtualMachineId, id, isForced());
         if (result) {
             UserVm userVm = _entityMgr.findById(UserVm.class, virtualMachineId);
             UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", userVm).get(0);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java
new file mode 100644
index 00000000000..f6268106c31
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java
@@ -0,0 +1,132 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.schedule;
+
+import com.cloud.exception.InvalidParameterValueException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
+import org.apache.commons.lang3.EnumUtils;
+
+import javax.inject.Inject;
+import java.util.Date;
+import java.util.Map;
+
+@APICommand(name = "createResourceSchedule", description = "Create Resource Schedule", responseObject = ResourceScheduleResponse.class,
+        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.23.0",
+        authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class CreateResourceScheduleCmd extends BaseCmd {
+
+    @Inject
+    ResourceScheduleManager resourceScheduleManager;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Type of the resource")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, description = "ID of the resource for which schedule is to be defined")
+    private String resourceId;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = false, description = "Description of the schedule")
+    private String description;
+
+    @Parameter(name = ApiConstants.SCHEDULE, type = CommandType.STRING, required = true, description = "Schedule for action on resource in cron format. e.g. '0 15 10 * *' for 'at 15:00 on 10th day of every month'")
+    private String schedule;
+
+    @Parameter(name = ApiConstants.TIMEZONE, type = CommandType.STRING, required = true, description = "Specifies a timezone for this command. For more information on the timezone parameter, see TimeZone Format.")
+    private String timeZone;
+
+    @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, required = true, description = "Action to take on the resource.")
+    private String action;
+
+    @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, required = false, description = "Start date from which the schedule becomes active. Defaults to current date plus 1 minute. (Format \"yyyy-MM-dd hh:mm:ss\")")
+    private Date startDate;
+
+    @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, required = false, description = "End date after which the schedule becomes inactive. (Format \"yyyy-MM-dd hh:mm:ss\")")
+    private Date endDate;
+
+    @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = false, description = "Enable schedule. Defaults to true")
+    private Boolean enabled;
+
+    @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = false, description = "Map of (key/value pairs) details for the schedule.")
+    private Map details;
+
+    public ApiCommandResourceType getResourceType() {
+        ApiCommandResourceType type = EnumUtils.getEnumIgnoreCase(ApiCommandResourceType.class, resourceType);
+        if (type == null) {
+            throw new InvalidParameterValueException("Unknown resource type: " + resourceType);
+        }
+        return type;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getSchedule() {
+        return schedule;
+    }
+
+    public String getTimeZone() {
+        return timeZone;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public Boolean getEnabled() {
+        if (enabled == null) {
+            enabled = true;
+        }
+        return enabled;
+    }
+
+    public Map<String, String> getDetails() {
+        return convertDetailsToMap(details);
+    }
+
+    @Override
+    public void execute() {
+        ResourceScheduleResponse response = resourceScheduleManager.createSchedule(getResourceType(), getResourceId(),
+                getDescription(), getSchedule(), getTimeZone(), getAction(), getStartDate(), getEndDate(), getEnabled(), getDetails());
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccount().getAccountId();
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/DeleteResourceScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/DeleteResourceScheduleCmd.java
new file mode 100644
index 00000000000..fe9a695df63
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/DeleteResourceScheduleCmd.java
@@ -0,0 +1,86 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.schedule;
+
+import com.cloud.exception.InvalidParameterValueException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
+import org.apache.commons.lang3.EnumUtils;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@APICommand(name = "deleteResourceSchedule", description = "Delete Resource Schedule", responseObject = SuccessResponse.class,
+        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.23.0",
+        authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class DeleteResourceScheduleCmd extends BaseCmd {
+
+    @Inject
+    ResourceScheduleManager resourceScheduleManager;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Type of the resource")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, description = "ID of the resource for which schedules are to be deleted")
+    private String resourceId;
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "ID of the schedule to be deleted")
+    private Long id;
+
+    @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "comma separated list of schedule ids to be deleted")
+    private List<Long> ids;
+
+    public ApiCommandResourceType getResourceType() {
+        ApiCommandResourceType type = EnumUtils.getEnumIgnoreCase(ApiCommandResourceType.class, resourceType);
+        if (type == null) {
+            throw new InvalidParameterValueException("Unknown resource type: " + resourceType);
+        }
+        return type;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    @Override
+    public void execute() {
+        resourceScheduleManager.removeSchedule(getResourceType(), getResourceId(), getId(), getIds());
+        SuccessResponse response = new SuccessResponse(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccount().getAccountId();
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/ListResourceScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/ListResourceScheduleCmd.java
new file mode 100644
index 00000000000..1c8869eff9c
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/ListResourceScheduleCmd.java
@@ -0,0 +1,97 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.schedule;
+
+import com.cloud.exception.InvalidParameterValueException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
+import org.apache.commons.lang3.EnumUtils;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@APICommand(name = "listResourceSchedule", description = "List Resource Schedules", responseObject = ResourceScheduleResponse.class,
+        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.23.0",
+        authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ListResourceScheduleCmd extends BaseListCmd {
+
+    @Inject
+    ResourceScheduleManager resourceScheduleManager;
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "ID of the schedule")
+    private Long id;
+
+    @Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "comma separated list of schedule ids")
+    private List<Long> ids;
+
+    @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Type of the resource.")
+    private String resourceType;
+
+    @Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, description = "ID of the resource for which schedules are to be listed.")
+    private String resourceId;
+
+    @Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, required = false, description = "Action to take on the resource.")
+    private String action;
+
+    @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = false, description = "Filter by enabled status.")
+    private Boolean enabled;
+
+    public Long getId() {
+        return id;
+    }
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    public ApiCommandResourceType getResourceType() {
+        ApiCommandResourceType type = EnumUtils.getEnumIgnoreCase(ApiCommandResourceType.class, resourceType);
+        if (type == null) {
+            throw new InvalidParameterValueException("Unknown resource type: " + resourceType);
+        }
+        return type;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public void execute() {
+        ListResponse<ResourceScheduleResponse> response = resourceScheduleManager.listSchedule(
+                getId(), getIds(), getResourceType(), getResourceId(), getAction(), getEnabled(),
+                getStartIndex(), getPageSizeVal()
+        );
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/UpdateResourceScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/UpdateResourceScheduleCmd.java
new file mode 100644
index 00000000000..5422588853e
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/UpdateResourceScheduleCmd.java
@@ -0,0 +1,108 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.schedule;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
+
+import javax.inject.Inject;
+import java.util.Date;
+import java.util.Map;
+
+@APICommand(name = "updateResourceSchedule", description = "Update Resource Schedule", responseObject = ResourceScheduleResponse.class,
+        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.23.0",
+        authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class UpdateResourceScheduleCmd extends BaseCmd {
+
+    @Inject
+    ResourceScheduleManager resourceScheduleManager;
+
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = true, description = "ID of the schedule to be updated")
+    private Long id;
+
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = false, description = "Description of the schedule")
+    private String description;
+
+    @Parameter(name = ApiConstants.SCHEDULE, type = CommandType.STRING, required = false, description = "Schedule for action on resource in cron format.")
+    private String schedule;
+
+    @Parameter(name = ApiConstants.TIMEZONE, type = CommandType.STRING, required = false, description = "Specifies a timezone for this command.")
+    private String timeZone;
+
+    @Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, required = false, description = "Start date from which the schedule becomes active.")
+    private Date startDate;
+
+    @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, required = false, description = "End date after which the schedule becomes inactive.")
+    private Date endDate;
+
+    @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = false, description = "Enable or disable the schedule.")
+    private Boolean enabled;
+
+    @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = false, description = "Map of (key/value pairs) details for the schedule.")
+    private Map details;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getSchedule() {
+        return schedule;
+    }
+
+    public String getTimeZone() {
+        return timeZone;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    public Map<String, String> getDetails() {
+        return convertDetailsToMap(details);
+    }
+
+    @Override
+    public void execute() {
+        ResourceScheduleResponse response = resourceScheduleManager.updateSchedule(getId(), getDescription(), getSchedule(),
+                getTimeZone(), getStartDate(), getEndDate(), getEnabled(), getDetails());
+        response.setResponseName(getCommandName());
+        setResponseObject(response);
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccount().getAccountId();
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
index 6274e7e1496..9d96f104885 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java
@@ -56,6 +56,9 @@ public class AddIpToVmNicCmd extends BaseAsyncCreateCmd {
     @Parameter(name = ApiConstants.IP_ADDRESS, type = CommandType.STRING, required = false, description = "Secondary IP Address")
     private String ipAddr;
 
+    @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = false, description = "Description of the secondary IP address", length = 2048)
+    private String description;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -160,7 +163,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCreateCmd {
         }
 
         try {
-            result = _networkService.allocateSecondaryGuestIP(getNicId(), requestedIpPair);
+            result = _networkService.allocateSecondaryGuestIP(getNicId(), requestedIpPair, description);
             if (result != null) {
                 setEntityId(result.getId());
                 setEntityUuid(result.getUuid());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmd.java
index 7e9bdd942ed..1fce8caf8e1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmd.java
@@ -22,23 +22,26 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 
 import javax.inject.Inject;
 import java.util.Date;
 
+@Deprecated
 @APICommand(name = "createVMSchedule", description = "Create Instance Schedule", responseObject = VMScheduleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class CreateVMScheduleCmd extends BaseCmd {
 
     @Inject
-    VMScheduleManager vmScheduleManager;
+    ResourceScheduleManager resourceScheduleManager;
 
     @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
             type = CommandType.UUID,
@@ -75,14 +78,14 @@ public class CreateVMScheduleCmd extends BaseCmd {
             type = CommandType.DATE,
             required = false,
             description = "Start date from which the schedule becomes active. Defaults to current date plus 1 minute."
-                    + "Use format \"yyyy-MM-dd hh:mm:ss\")")
+                    + "(Format \"yyyy-MM-dd hh:mm:ss\")")
     private Date startDate;
 
     @Parameter(name = ApiConstants.END_DATE,
             type = CommandType.DATE,
             required = false,
             description = "End date after which the schedule becomes inactive"
-                    + "Use format \"yyyy-MM-dd hh:mm:ss\")")
+                    + "(Format \"yyyy-MM-dd hh:mm:ss\")")
     private Date endDate;
 
     @Parameter(name = ApiConstants.ENABLED,
@@ -91,9 +94,9 @@ public class CreateVMScheduleCmd extends BaseCmd {
             description = "Enable Instance schedule. Defaults to true")
     private Boolean enabled;
 
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
 
     public Long getVmId() {
         return vmId;
@@ -130,13 +133,19 @@ public class CreateVMScheduleCmd extends BaseCmd {
         return enabled;
     }
 
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
 
     @Override
     public void execute() {
-        VMScheduleResponse response = vmScheduleManager.createSchedule(this);
+        String resourceIdStr = getVmId() != null ? String.valueOf(getVmId()) : null;
+
+        ResourceScheduleResponse scheduleResponse = resourceScheduleManager.createSchedule(
+                ApiCommandResourceType.VirtualMachine,
+                resourceIdStr, getDescription(), getSchedule(), getTimeZone(), getAction(),
+                getStartDate(), getEndDate(), getEnabled(), null);
+        VMScheduleResponse response = new VMScheduleResponse(scheduleResponse);
         response.setResponseName(getCommandName());
         setResponseObject(response);
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmd.java
index f34d07b045d..f40db4ee048 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmd.java
@@ -22,6 +22,7 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
@@ -30,19 +31,19 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 
 import javax.inject.Inject;
 import java.util.Collections;
 import java.util.List;
 
+@Deprecated
 @APICommand(name = "deleteVMSchedule", description = "Delete Instance Schedule.", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DeleteVMScheduleCmd extends BaseCmd {
     @Inject
-    VMScheduleManager vmScheduleManager;
+    ResourceScheduleManager resourceScheduleManager;
 
     @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
             type = CommandType.UUID,
@@ -50,12 +51,14 @@ public class DeleteVMScheduleCmd extends BaseCmd {
             required = true,
             description = "ID of Instance")
     private Long vmId;
+
     @Parameter(name = ApiConstants.ID,
             type = CommandType.UUID,
             entityType = VMScheduleResponse.class,
             required = false,
             description = "ID of Instance schedule")
     private Long id;
+
     @Parameter(name = ApiConstants.IDS,
             type = CommandType.LIST,
             collectionType = CommandType.UUID,
@@ -64,9 +67,9 @@ public class DeleteVMScheduleCmd extends BaseCmd {
             description = "IDs of Instance schedule")
     private List<Long> ids;
 
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
 
     public Long getId() {
         return id;
@@ -83,18 +86,21 @@ public class DeleteVMScheduleCmd extends BaseCmd {
         return vmId;
     }
 
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
 
     @Override
     public void execute() {
-        long rowsRemoved = vmScheduleManager.removeSchedule(this);
+        String resourceIdStr = getVmId() != null ? String.valueOf(getVmId()) : null;
+        long rowsRemoved = resourceScheduleManager.removeSchedule(
+                ApiCommandResourceType.VirtualMachine,
+                resourceIdStr, getId(), getIds());
 
         if (rowsRemoved > 0) {
             final SuccessResponse response = new SuccessResponse();
             response.setResponseName(getCommandName());
-            response.setObjectName(VMSchedule.class.getSimpleName().toLowerCase());
+            response.setObjectName("vmschedule");
             setResponseObject(response);
         } else {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete Instance Schedules");
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmd.java
index be94315abe7..c7a9a75f2ea 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmd.java
@@ -20,23 +20,27 @@ package org.apache.cloudstack.api.command.user.vm;
 
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
 
+@Deprecated
 @APICommand(name = "listVMSchedule", description = "List Instance Schedules.", responseObject = VMScheduleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ListVMScheduleCmd extends BaseListCmd {
     @Inject
-    VMScheduleManager vmScheduleManager;
+    ResourceScheduleManager resourceScheduleManager;
 
     @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
             type = CommandType.UUID,
@@ -61,12 +65,12 @@ public class ListVMScheduleCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.ENABLED,
             type = CommandType.BOOLEAN,
             required = false,
-            description = "ID of Instance schedule")
+            description = "Filter by enabled status")
     private Boolean enabled;
 
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
 
     public Long getVmId() {
         return vmId;
@@ -84,14 +88,26 @@ public class ListVMScheduleCmd extends BaseListCmd {
         return enabled;
     }
 
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
     @Override
     public void execute() {
-        ListResponse<VMScheduleResponse> response = vmScheduleManager.listSchedule(this);
+        String resourceIdStr = getVmId() != null ? String.valueOf(getVmId()) : null;
+
+        ListResponse<ResourceScheduleResponse> scheduleResponse = resourceScheduleManager.listSchedule(
+                getId(), null, ApiCommandResourceType.VirtualMachine, resourceIdStr, getAction(), getEnabled(),
+                getStartIndex(), getPageSizeVal()
+        );
+
+        List<VMScheduleResponse> vmScheduleResponses = new ArrayList<>();
+        for (ResourceScheduleResponse resourceScheduleResponse : scheduleResponse.getResponses()) {
+            vmScheduleResponses.add(new VMScheduleResponse(resourceScheduleResponse));
+        }
+        ListResponse<VMScheduleResponse> response = new ListResponse<>();
+        response.setResponses(vmScheduleResponses, scheduleResponse.getCount());
         response.setResponseName(getCommandName());
-        response.setObjectName(VMSchedule.class.getSimpleName().toLowerCase());
+        response.setObjectName("vmschedule");
         setResponseObject(response);
     }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmd.java
index b7222944fe0..9b5b0537310 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmd.java
@@ -22,22 +22,25 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
 import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceSchedule;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 
 import javax.inject.Inject;
 import java.util.Date;
 
+@Deprecated
 @APICommand(name = "updateVMSchedule", description = "Update Instance Schedule.", responseObject = VMScheduleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class UpdateVMScheduleCmd extends BaseCmd {
     @Inject
-    VMScheduleManager vmScheduleManager;
+    ResourceScheduleManager resourceScheduleManager;
 
     @Parameter(name = ApiConstants.ID,
             type = CommandType.UUID,
@@ -68,14 +71,14 @@ public class UpdateVMScheduleCmd extends BaseCmd {
             type = CommandType.DATE,
             required = false,
             description = "Start date from which the schedule becomes active"
-                    + "Use format \"yyyy-MM-dd hh:mm:ss\")")
+                    + "(Format \"yyyy-MM-dd hh:mm:ss\")")
     private Date startDate;
 
     @Parameter(name = ApiConstants.END_DATE,
             type = CommandType.DATE,
             required = false,
             description = "End date after which the schedule becomes inactive"
-                    + "Use format \"yyyy-MM-dd hh:mm:ss\")")
+                    + "(Format \"yyyy-MM-dd hh:mm:ss\")")
     private Date endDate;
 
     @Parameter(name = ApiConstants.ENABLED,
@@ -84,9 +87,9 @@ public class UpdateVMScheduleCmd extends BaseCmd {
             description = "Enable Instance schedule")
     private Boolean enabled;
 
-    /////////////////////////////////////////////////////
-    /////////////////// Accessors ///////////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////////// Accessors ///////////////////////
+    /// //////////////////////////////////////////////////
 
     public Long getId() {
         return id;
@@ -116,24 +119,29 @@ public class UpdateVMScheduleCmd extends BaseCmd {
         return enabled;
     }
 
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
+    /// //////////////////////////////////////////////////
+    /// //////////// API Implementation///////////////////
+    /// //////////////////////////////////////////////////
 
     @Override
     public void execute() {
-        VMScheduleResponse response = vmScheduleManager.updateSchedule(this);
+        ResourceScheduleResponse scheduleResponse = resourceScheduleManager.updateSchedule(
+                getId(), getDescription(), getSchedule(), getTimeZone(), getStartDate(), getEndDate(), getEnabled(), null);
+        VMScheduleResponse response = new VMScheduleResponse(scheduleResponse);
         response.setResponseName(getCommandName());
         setResponseObject(response);
     }
 
     @Override
     public long getEntityOwnerId() {
-        VMSchedule vmSchedule = _entityMgr.findById(VMSchedule.class, getId());
-        if (vmSchedule == null) {
-            throw new InvalidParameterValueException(String.format("Unable to find vmSchedule by id=%d", getId()));
+        ResourceSchedule schedule = _entityMgr.findById(ResourceSchedule.class, getId());
+        if (schedule == null || !ApiCommandResourceType.VirtualMachine.equals(schedule.getResourceType())) {
+            throw new InvalidParameterValueException(String.format("Unable to find VM schedule by id=%d", getId()));
+        }
+        VirtualMachine vm = _entityMgr.findById(VirtualMachine.class, schedule.getResourceId());
+        if (vm == null) {
+            throw new InvalidParameterValueException(String.format("Unable to find VM schedule by id=%d", getId()));
         }
-        VirtualMachine vm = _entityMgr.findById(VirtualMachine.class, vmSchedule.getVmId());
         return vm.getAccountId();
     }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/AttachedIsoResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AttachedIsoResponse.java
new file mode 100644
index 00000000000..b259de56218
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/AttachedIsoResponse.java
@@ -0,0 +1,76 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.BaseResponse;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class AttachedIsoResponse extends BaseResponse {
+
+    @SerializedName("id")
+    @Param(description = "The ID of the attached ISO")
+    private String id;
+
+    @SerializedName("name")
+    @Param(description = "The name of the attached ISO")
+    private String name;
+
+    @SerializedName("displaytext")
+    @Param(description = "The display text of the attached ISO")
+    private String displayText;
+
+    @SerializedName("deviceseq")
+    @Param(description = "The cdrom slot that holds this ISO (3=hdc, 4=hdd, ...)")
+    private Integer deviceSeq;
+
+    @SerializedName("bootable")
+    @Param(description = "Whether this is the bootable ISO for the VM")
+    private Boolean bootable;
+
+    public AttachedIsoResponse() {
+    }
+
+    public AttachedIsoResponse(String id, String name, String displayText, Integer deviceSeq, boolean bootable) {
+        this.id = id;
+        this.name = name;
+        this.displayText = displayText;
+        this.deviceSeq = deviceSeq;
+        this.bootable = bootable;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDisplayText() {
+        return displayText;
+    }
+
+    public Integer getDeviceSeq() {
+        return deviceSeq;
+    }
+
+    public Boolean getBootable() {
+        return bootable;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
index 5d085d1bee0..f8e1af8d5b7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -63,6 +63,10 @@ public class HostResponse extends BaseResponseWithAnnotations {
     @Param(description = "The OS category name of the host")
     private String osCategoryName;
 
+    @SerializedName(ApiConstants.GUEST_OS_RULE)
+    @Param(description = "the guest OS rule")
+    private String guestOsRule;
+
     @SerializedName(ApiConstants.IP_ADDRESS)
     @Param(description = "The IP address of the host")
     private String ipAddress;
@@ -999,4 +1003,12 @@ public class HostResponse extends BaseResponseWithAnnotations {
     public String getExtensionName() {
         return extensionName;
     }
+
+    public String getGuestOsRule() {
+        return guestOsRule;
+    }
+
+    public void setGuestOsRule(String guestOsRule) {
+        this.guestOsRule = guestOsRule;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
index eba00da25cf..8734e65dfa5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NicSecondaryIpResponse.java
@@ -53,6 +53,10 @@ public class NicSecondaryIpResponse extends BaseResponse {
     @Param(description = "The ID of the Instance")
     private String vmId;
 
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "Description of the secondary IP address")
+    private String description;
+
     @Override
     public String getObjectId() {
         return this.getId();
@@ -98,6 +102,14 @@ public class NicSecondaryIpResponse extends BaseResponse {
         this.id = id;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public List<NicSecondaryIpResponse> getSecondaryIpsList() {
         return secondaryIpsList;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ResourceScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ResourceScheduleResponse.java
new file mode 100644
index 00000000000..ff799b467cf
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ResourceScheduleResponse.java
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.api.response;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.schedule.ResourceSchedule;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = ResourceSchedule.class)
+public class ResourceScheduleResponse extends BaseResponse {
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "The ID of resource schedule")
+    private String id;
+
+    @SerializedName(ApiConstants.RESOURCE_TYPE)
+    @Param(description = "Type of the resource")
+    private ApiCommandResourceType resourceType;
+
+    @SerializedName(ApiConstants.RESOURCE_ID)
+    @Param(description = "ID of the resource")
+    private String resourceId;
+
+    @SerializedName(ApiConstants.DESCRIPTION)
+    @Param(description = "Description of resource schedule")
+    private String description;
+
+    @SerializedName(ApiConstants.SCHEDULE)
+    @Param(description = "Cron formatted resource schedule")
+    private String schedule;
+
+    @SerializedName(ApiConstants.TIMEZONE)
+    @Param(description = "Timezone of the schedule")
+    private String timeZone;
+
+    @SerializedName(ApiConstants.ACTION)
+    @Param(description = "Action")
+    private ResourceSchedule.Action action;
+
+    @SerializedName(ApiConstants.ENABLED)
+    @Param(description = "Resource schedule is enabled")
+    private boolean enabled;
+
+    @SerializedName(ApiConstants.START_DATE)
+    @Param(description = "Date from which the schedule is active")
+    private Date startDate;
+
+    @SerializedName(ApiConstants.END_DATE)
+    @Param(description = "Date after which the schedule becomes inactive")
+    private Date endDate;
+
+    @SerializedName(ApiConstants.DETAILS)
+    @Param(description = "Schedule details")
+    private Map<String, String> details;
+
+    @SerializedName(ApiConstants.CREATED)
+    @Param(description = "Date when the schedule was created")
+    private Date created;
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setResourceType(ApiCommandResourceType resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public ApiCommandResourceType getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setSchedule(String schedule) {
+        this.schedule = schedule;
+    }
+
+    public String getSchedule() {
+        return schedule;
+    }
+
+    public void setTimeZone(String timeZone) {
+        this.timeZone = timeZone;
+    }
+
+    public String getTimeZone() {
+        return timeZone;
+    }
+
+    public void setAction(ResourceSchedule.Action action) {
+        this.action = action;
+    }
+
+    public ResourceSchedule.Action getAction() {
+        return action;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean getEnabled() {
+        return enabled;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setDetails(Map<String, String> details) {
+        this.details = details;
+    }
+
+    public Map<String, String> getDetails() {
+        return details;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
index a7f6dff96f8..4d6eae2fad2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -166,6 +166,14 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
     @Param(description = "An alternate display text of the ISO attached to the Instance")
     private String isoDisplayText;
 
+    @SerializedName("isos")
+    @Param(description = "All ISOs attached to the Instance, keyed by cdrom slot. The first entry mirrors isoid/isoname for back-compat.", responseObject = AttachedIsoResponse.class, since = "4.23.0")
+    private List<AttachedIsoResponse> isos;
+
+    @SerializedName("isomaxcount")
+    @Param(description = "Maximum number of ISOs that may be attached to this Instance, after applying the cluster-scoped vm.iso.max.count and the hypervisor's own cap.", since = "4.23.0")
+    private Integer isoMaxCount;
+
     @SerializedName(ApiConstants.SERVICE_OFFERING_ID)
     @Param(description = "The ID of the service offering of the Instance")
     private String serviceOfferingId;
@@ -871,6 +879,22 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co
         this.isoId = isoId;
     }
 
+    public void setIsos(List<AttachedIsoResponse> isos) {
+        this.isos = isos;
+    }
+
+    public List<AttachedIsoResponse> getIsos() {
+        return isos;
+    }
+
+    public void setIsoMaxCount(Integer isoMaxCount) {
+        this.isoMaxCount = isoMaxCount;
+    }
+
+    public Integer getIsoMaxCount() {
+        return isoMaxCount;
+    }
+
     public void setIsoName(String isoName) {
         this.isoName = isoName;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VMScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VMScheduleResponse.java
index 6800c25b023..34455b3a0bf 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/VMScheduleResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/VMScheduleResponse.java
@@ -23,11 +23,11 @@ import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
+import org.apache.cloudstack.schedule.ResourceSchedule;
 
 import java.util.Date;
 
-@EntityReference(value = VMSchedule.class)
+@EntityReference(value = ResourceSchedule.class)
 public class VMScheduleResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID)
     @Param(description = "The ID of Instance schedule")
@@ -51,7 +51,7 @@ public class VMScheduleResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.ACTION)
     @Param(description = "Action")
-    private VMSchedule.Action action;
+    private ResourceSchedule.Action action;
 
     @SerializedName(ApiConstants.ENABLED)
     @Param(description = "VM schedule is enabled")
@@ -69,6 +69,20 @@ public class VMScheduleResponse extends BaseResponse {
     @Param(description = "Date when the schedule was created")
     private Date created;
 
+    public VMScheduleResponse(ResourceScheduleResponse scheduleResponse) {
+        super("vmschedule");
+        this.id = scheduleResponse.getId();
+        this.vmId = scheduleResponse.getResourceId();
+        this.description = scheduleResponse.getDescription();
+        this.schedule = scheduleResponse.getSchedule();
+        this.timeZone = scheduleResponse.getTimeZone();
+        this.action = scheduleResponse.getAction();
+        this.enabled = scheduleResponse.getEnabled();
+        this.startDate = scheduleResponse.getStartDate();
+        this.endDate = scheduleResponse.getEndDate();
+        this.created = scheduleResponse.getCreated();
+    }
+
     public void setId(String id) {
         this.id = id;
     }
@@ -89,7 +103,7 @@ public class VMScheduleResponse extends BaseResponse {
         this.timeZone = timeZone;
     }
 
-    public void setAction(VMSchedule.Action action) {
+    public void setAction(ResourceSchedule.Action action) {
         this.action = action;
     }
 
@@ -105,5 +119,7 @@ public class VMScheduleResponse extends BaseResponse {
         this.endDate = endDate;
     }
 
-    public void setCreated(Date created) {this.created = created;}
+    public void setCreated(Date created) {
+        this.created = created;
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedule.java b/api/src/main/java/org/apache/cloudstack/schedule/ResourceSchedule.java
similarity index 66%
rename from api/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedule.java
rename to api/src/main/java/org/apache/cloudstack/schedule/ResourceSchedule.java
index b1e7df3c39c..4bd39211a27 100644
--- a/api/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedule.java
+++ b/api/src/main/java/org/apache/cloudstack/schedule/ResourceSchedule.java
@@ -16,20 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.vm.schedule;
+package org.apache.cloudstack.schedule;
 
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 import java.time.ZoneId;
 import java.util.Date;
 
-public interface VMSchedule extends Identity, InternalIdentity {
-    enum Action {
-        START, STOP, REBOOT, FORCE_STOP, FORCE_REBOOT
+public interface ResourceSchedule extends Identity, InternalIdentity {
+
+    /**
+     * Common contract for scheduler actions.  Each provider defines its own enum
+     * implementing this interface so the generic machinery can call {@link #name()}
+     * and {@link #getEventType()} without knowing the concrete type.
+     */
+    interface Action {
+        String name();
+
+        String getEventType();
     }
 
-    long getVmId();
+    ApiCommandResourceType getResourceType();
+
+    long getResourceId();
 
     String getDescription();
 
@@ -37,7 +48,7 @@ public interface VMSchedule extends Identity, InternalIdentity {
 
     String getTimeZone();
 
-    Action getAction();
+    String getActionName();
 
     boolean getEnabled();
 
diff --git a/api/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleManager.java b/api/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleManager.java
new file mode 100644
index 00000000000..fb650a6cf68
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleManager.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule;
+
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface ResourceScheduleManager {
+
+    ResourceScheduleResponse createSchedule(ApiCommandResourceType resourceType, String resourceUuid,
+                                            String description, String schedule, String timeZone, String action,
+                                            Date startDate, Date endDate, boolean enabled, Map<String, String> details);
+
+    ResourceScheduleResponse updateSchedule(Long id, String description, String schedule, String timeZone,
+                                            Date startDate, Date endDate, Boolean enabled, Map<String, String> details);
+
+    ListResponse<ResourceScheduleResponse> listSchedule(Long id, List<Long> ids, ApiCommandResourceType resourceType,
+                                                        String resourceUuid, String action, Boolean enabled,
+                                                        Long startIndex, Long pageSize);
+
+    Long removeSchedule(ApiCommandResourceType resourceType, String resourceUuid, Long id, List<Long> ids);
+
+    void removeSchedulesForResource(ApiCommandResourceType resourceType, long resourceId);
+}
diff --git a/api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJob.java b/api/src/main/java/org/apache/cloudstack/schedule/ResourceScheduledJob.java
similarity index 77%
rename from api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJob.java
rename to api/src/main/java/org/apache/cloudstack/schedule/ResourceScheduledJob.java
index d7a18b76827..a7bf4d9aa05 100644
--- a/api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJob.java
+++ b/api/src/main/java/org/apache/cloudstack/schedule/ResourceScheduledJob.java
@@ -16,23 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.vm.schedule;
+package org.apache.cloudstack.schedule;
 
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
 import java.util.Date;
 
-public interface VMScheduledJob extends Identity, InternalIdentity {
-    long getVmId();
+public interface ResourceScheduledJob extends Identity, InternalIdentity {
+    ApiCommandResourceType getResourceType();
 
-    long getVmScheduleId();
+    long getResourceId();
+
+    long getScheduleId();
 
     Long getAsyncJobId();
 
     void setAsyncJobId(long asyncJobId);
 
-    VMSchedule.Action getAction();
+    String getActionName();
 
     Date getScheduledTime();
 }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDao.java b/api/src/main/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleAction.java
similarity index 59%
rename from engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDao.java
rename to api/src/main/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleAction.java
index 835ac696f26..c05dafe8879 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDao.java
+++ b/api/src/main/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleAction.java
@@ -16,21 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.vm.schedule.dao;
+package org.apache.cloudstack.schedule.autoscale;
 
-import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.vm.schedule.VMScheduledJobVO;
+import com.cloud.event.EventTypes;
+import org.apache.cloudstack.schedule.ResourceSchedule;
 
-import java.util.Date;
-import java.util.List;
-
-public interface VMScheduledJobDao extends GenericDao<VMScheduledJobVO, Long> {
-
-    List<VMScheduledJobVO> listJobsToStart(Date currentTimestamp);
-
-    int expungeJobsForSchedules(List<Long> scheduleId, Date dateAfter);
-
-    int expungeJobsBefore(Date currentTimestamp);
-
-    VMScheduledJobVO findByScheduleAndTimestamp(long scheduleId, Date scheduledTimestamp);
+public enum AutoScaleScheduleAction implements ResourceSchedule.Action {
+    UPDATE {
+        @Override
+        public String getEventType() {
+            return EventTypes.EVENT_AUTOSCALEVMGROUP_SCHEDULE_UPDATE;
+        }
+    }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/schedule/vm/VMScheduleAction.java b/api/src/main/java/org/apache/cloudstack/schedule/vm/VMScheduleAction.java
new file mode 100644
index 00000000000..1648305803f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/schedule/vm/VMScheduleAction.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule.vm;
+
+import com.cloud.event.EventTypes;
+import org.apache.cloudstack.schedule.ResourceSchedule;
+
+public enum VMScheduleAction implements ResourceSchedule.Action {
+    START {
+        @Override
+        public String getEventType() { return EventTypes.EVENT_VM_SCHEDULE_START; }
+    },
+    STOP {
+        @Override
+        public String getEventType() { return EventTypes.EVENT_VM_SCHEDULE_STOP; }
+    },
+    REBOOT {
+        @Override
+        public String getEventType() { return EventTypes.EVENT_VM_SCHEDULE_REBOOT; }
+    },
+    FORCE_STOP {
+        @Override
+        public String getEventType() { return EventTypes.EVENT_VM_SCHEDULE_FORCE_STOP; }
+    },
+    FORCE_REBOOT {
+        @Override
+        public String getEventType() { return EventTypes.EVENT_VM_SCHEDULE_FORCE_REBOOT; }
+    };
+}
diff --git a/api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManager.java b/api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManager.java
deleted file mode 100644
index 6aca05b58d5..00000000000
--- a/api/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.vm.schedule;
-
-import org.apache.cloudstack.api.command.user.vm.CreateVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.DeleteVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.ListVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.UpdateVMScheduleCmd;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.api.response.VMScheduleResponse;
-
-public interface VMScheduleManager {
-    VMScheduleResponse createSchedule(CreateVMScheduleCmd createVMScheduleCmd);
-
-    VMScheduleResponse createResponse(VMSchedule vmSchedule);
-
-    ListResponse<VMScheduleResponse> listSchedule(ListVMScheduleCmd listVMScheduleCmd);
-
-    VMScheduleResponse updateSchedule(UpdateVMScheduleCmd updateVMScheduleCmd);
-
-    long removeScheduleByVmId(long vmId, boolean expunge);
-
-    Long removeSchedule(DeleteVMScheduleCmd deleteVMScheduleCmd);
-}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
index 9ea3a6446e8..71c6d54c7a8 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
@@ -59,7 +59,7 @@ public class AddIpToVmNicTest extends TestCase {
         NicSecondaryIp secIp = Mockito.mock(NicSecondaryIp.class);
 
         Mockito.when(
-            networkService.allocateSecondaryGuestIP(ArgumentMatchers.anyLong(), ArgumentMatchers.any()))
+            networkService.allocateSecondaryGuestIP(ArgumentMatchers.anyLong(), ArgumentMatchers.any(), ArgumentMatchers.anyString()))
             .thenReturn(secIp);
 
         ipTonicCmd._networkService = networkService;
@@ -79,7 +79,7 @@ public class AddIpToVmNicTest extends TestCase {
         AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class);
 
         Mockito.when(
-            networkService.allocateSecondaryGuestIP(ArgumentMatchers.anyLong(), ArgumentMatchers.any()))
+            networkService.allocateSecondaryGuestIP(ArgumentMatchers.anyLong(), ArgumentMatchers.any(), ArgumentMatchers.anyString()))
             .thenReturn(null);
 
         ipTonicCmd._networkService = networkService;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmdTest.java
index 99bc9d2b3fb..ae848b2712b 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmdTest.java
@@ -21,8 +21,9 @@ package org.apache.cloudstack.api.command.user.vm;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
 import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -34,9 +35,11 @@ import org.mockito.MockitoAnnotations;
 
 public class CreateVMScheduleCmdTest {
     @Mock
-    public VMScheduleManager vmScheduleManager;
+    public ResourceScheduleManager resourceScheduleManager;
+
     @Mock
     public EntityManager entityManager;
+
     @InjectMocks
     private CreateVMScheduleCmd createVMScheduleCmd = new CreateVMScheduleCmd();
 
@@ -59,10 +62,19 @@ public class CreateVMScheduleCmdTest {
      */
     @Test
     public void testSuccessfulExecution() {
-        VMScheduleResponse vmScheduleResponse = Mockito.mock(VMScheduleResponse.class);
-        Mockito.when(vmScheduleManager.createSchedule(createVMScheduleCmd)).thenReturn(vmScheduleResponse);
+        ResourceScheduleResponse scheduleResponse = new ResourceScheduleResponse();
+        scheduleResponse.setId("schedule-uuid");
+        scheduleResponse.setResourceId("vm-uuid");
+        Mockito.when(resourceScheduleManager.createSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.anyBoolean(), Mockito.any()
+        )).thenReturn(scheduleResponse);
         createVMScheduleCmd.execute();
-        Assert.assertEquals(vmScheduleResponse, createVMScheduleCmd.getResponseObject());
+        VMScheduleResponse response = (VMScheduleResponse) createVMScheduleCmd.getResponseObject();
+        Assert.assertNotNull(response);
+        Assert.assertEquals("schedule-uuid", org.springframework.test.util.ReflectionTestUtils.getField(response, "id"));
+        Assert.assertEquals("vm-uuid", org.springframework.test.util.ReflectionTestUtils.getField(response, "vmId"));
     }
 
     /**
@@ -72,7 +84,11 @@ public class CreateVMScheduleCmdTest {
      */
     @Test(expected = InvalidParameterValueException.class)
     public void testInvalidParameterValueException() {
-        Mockito.when(vmScheduleManager.createSchedule(createVMScheduleCmd)).thenThrow(InvalidParameterValueException.class);
+        Mockito.when(resourceScheduleManager.createSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.anyBoolean(), Mockito.any()
+        )).thenThrow(new InvalidParameterValueException("Invalid schedule"));
         createVMScheduleCmd.execute();
     }
 
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmdTest.java
index 1f764a84365..cec7503bd52 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmdTest.java
@@ -23,8 +23,7 @@ import com.cloud.utils.db.EntityManager;
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -36,7 +35,8 @@ import org.mockito.MockitoAnnotations;
 
 public class DeleteVMScheduleCmdTest {
     @Mock
-    public VMScheduleManager vmScheduleManager;
+    public ResourceScheduleManager resourceScheduleManager;
+
     @Mock
     public EntityManager entityManager;
 
@@ -64,9 +64,11 @@ public class DeleteVMScheduleCmdTest {
     public void testSuccessfulExecution() {
         final SuccessResponse response = new SuccessResponse();
         response.setResponseName(deleteVMScheduleCmd.getCommandName());
-        response.setObjectName(VMSchedule.class.getSimpleName().toLowerCase());
+        response.setObjectName("vmschedule");
 
-        Mockito.when(vmScheduleManager.removeSchedule(deleteVMScheduleCmd)).thenReturn(1L);
+        Mockito.when(resourceScheduleManager.removeSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenReturn(1L);
         deleteVMScheduleCmd.execute();
         SuccessResponse actualResponse = (SuccessResponse) deleteVMScheduleCmd.getResponseObject();
         Assert.assertEquals(response.getResponseName(), actualResponse.getResponseName());
@@ -80,7 +82,9 @@ public class DeleteVMScheduleCmdTest {
      */
     @Test(expected = ServerApiException.class)
     public void testServerApiException() {
-        Mockito.when(vmScheduleManager.removeSchedule(deleteVMScheduleCmd)).thenReturn(0L);
+        Mockito.when(resourceScheduleManager.removeSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenReturn(0L);
         deleteVMScheduleCmd.execute();
     }
 
@@ -91,7 +95,9 @@ public class DeleteVMScheduleCmdTest {
      */
     @Test(expected = InvalidParameterValueException.class)
     public void testInvalidParameterValueException() {
-        Mockito.when(vmScheduleManager.removeSchedule(deleteVMScheduleCmd)).thenThrow(InvalidParameterValueException.class);
+        Mockito.when(resourceScheduleManager.removeSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenThrow(new InvalidParameterValueException("Invalid schedule"));
         deleteVMScheduleCmd.execute();
     }
 
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmdTest.java
index f5434de3581..5449be17a57 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmdTest.java
@@ -20,8 +20,9 @@ package org.apache.cloudstack.api.command.user.vm;
 
 import com.cloud.exception.InvalidParameterValueException;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
 import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -36,7 +37,8 @@ import java.util.Collections;
 
 public class ListVMScheduleCmdTest {
     @Mock
-    public VMScheduleManager vmScheduleManager;
+    public ResourceScheduleManager resourceScheduleManager;
+
     @InjectMocks
     private ListVMScheduleCmd listVMScheduleCmd = new ListVMScheduleCmd();
     private AutoCloseable closeable;
@@ -58,12 +60,14 @@ public class ListVMScheduleCmdTest {
      */
     @Test
     public void testEmptyResponse() {
-        ListResponse<VMScheduleResponse> response = new ListResponse<VMScheduleResponse>();
-        response.setResponses(new ArrayList<VMScheduleResponse>());
-        Mockito.when(vmScheduleManager.listSchedule(listVMScheduleCmd)).thenReturn(response);
+        ListResponse<ResourceScheduleResponse> response = new ListResponse<ResourceScheduleResponse>();
+        response.setResponses(new ArrayList<ResourceScheduleResponse>());
+        Mockito.when(resourceScheduleManager.listSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenReturn(response);
         listVMScheduleCmd.execute();
         ListResponse<VMScheduleResponse> actualResponseObject = (ListResponse<VMScheduleResponse>) listVMScheduleCmd.getResponseObject();
-        Assert.assertEquals(response, actualResponseObject);
         Assert.assertEquals(0L, actualResponseObject.getResponses().size());
     }
 
@@ -74,15 +78,22 @@ public class ListVMScheduleCmdTest {
      */
     @Test
     public void testNonEmptyResponse() {
-        ListResponse<VMScheduleResponse> listResponse = new ListResponse<VMScheduleResponse>();
-        VMScheduleResponse response = Mockito.mock(VMScheduleResponse.class);
+        ListResponse<ResourceScheduleResponse> listResponse = new ListResponse<ResourceScheduleResponse>();
+        ResourceScheduleResponse response = new ResourceScheduleResponse();
+        response.setId("schedule-uuid");
+        response.setResourceId("vm-uuid");
         listResponse.setResponses(Collections.singletonList(response));
-        Mockito.when(vmScheduleManager.listSchedule(listVMScheduleCmd)).thenReturn(listResponse);
+        Mockito.when(resourceScheduleManager.listSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenReturn(listResponse);
         listVMScheduleCmd.execute();
         ListResponse<VMScheduleResponse> actualResponseObject = (ListResponse<VMScheduleResponse>) listVMScheduleCmd.getResponseObject();
-        Assert.assertEquals(listResponse, actualResponseObject);
         Assert.assertEquals(1L, actualResponseObject.getResponses().size());
-        Assert.assertEquals(response, actualResponseObject.getResponses().get(0));
+        Assert.assertEquals("schedule-uuid",
+                org.springframework.test.util.ReflectionTestUtils.getField(actualResponseObject.getResponses().get(0), "id"));
+        Assert.assertEquals("vm-uuid",
+                org.springframework.test.util.ReflectionTestUtils.getField(actualResponseObject.getResponses().get(0), "vmId"));
     }
 
     /**
@@ -92,7 +103,10 @@ public class ListVMScheduleCmdTest {
      */
     @Test(expected = InvalidParameterValueException.class)
     public void testInvalidParameterValueException() {
-        Mockito.when(vmScheduleManager.listSchedule(listVMScheduleCmd)).thenThrow(InvalidParameterValueException.class);
+        Mockito.when(resourceScheduleManager.listSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenThrow(InvalidParameterValueException.class);
         listVMScheduleCmd.execute();
         ListResponse<VMScheduleResponse> actualResponseObject = (ListResponse<VMScheduleResponse>) listVMScheduleCmd.getResponseObject();
     }
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmdTest.java
index 2c6c485f25b..a24252f4a1d 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmdTest.java
@@ -21,9 +21,11 @@ package org.apache.cloudstack.api.command.user.vm;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
 import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
-import org.apache.cloudstack.vm.schedule.VMScheduleManager;
+import org.apache.cloudstack.schedule.ResourceSchedule;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -35,9 +37,11 @@ import org.mockito.MockitoAnnotations;
 
 public class UpdateVMScheduleCmdTest {
     @Mock
-    public VMScheduleManager vmScheduleManager;
+    public ResourceScheduleManager resourceScheduleManager;
+
     @Mock
     public EntityManager entityManager;
+
     @InjectMocks
     private UpdateVMScheduleCmd updateVMScheduleCmd = new UpdateVMScheduleCmd();
 
@@ -60,10 +64,18 @@ public class UpdateVMScheduleCmdTest {
      */
     @Test
     public void testSuccessfulExecution() {
-        VMScheduleResponse vmScheduleResponse = Mockito.mock(VMScheduleResponse.class);
-        Mockito.when(vmScheduleManager.updateSchedule(updateVMScheduleCmd)).thenReturn(vmScheduleResponse);
+        ResourceScheduleResponse scheduleResponse = new ResourceScheduleResponse();
+        scheduleResponse.setId("schedule-uuid");
+        scheduleResponse.setResourceId("vm-uuid");
+        Mockito.when(resourceScheduleManager.updateSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenReturn(scheduleResponse);
         updateVMScheduleCmd.execute();
-        Assert.assertEquals(vmScheduleResponse, updateVMScheduleCmd.getResponseObject());
+        VMScheduleResponse response = (VMScheduleResponse) updateVMScheduleCmd.getResponseObject();
+        Assert.assertNotNull(response);
+        Assert.assertEquals("schedule-uuid", org.springframework.test.util.ReflectionTestUtils.getField(response, "id"));
+        Assert.assertEquals("vm-uuid", org.springframework.test.util.ReflectionTestUtils.getField(response, "vmId"));
     }
 
     /**
@@ -73,7 +85,10 @@ public class UpdateVMScheduleCmdTest {
      */
     @Test(expected = InvalidParameterValueException.class)
     public void testInvalidParameterValueException() {
-        Mockito.when(vmScheduleManager.updateSchedule(updateVMScheduleCmd)).thenThrow(InvalidParameterValueException.class);
+        Mockito.when(resourceScheduleManager.updateSchedule(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()
+        )).thenThrow(new InvalidParameterValueException("Invalid schedule"));
         updateVMScheduleCmd.execute();
     }
 
@@ -84,11 +99,12 @@ public class UpdateVMScheduleCmdTest {
      */
     @Test
     public void testSuccessfulGetEntityOwnerId() {
-        VMSchedule vmSchedule = Mockito.mock(VMSchedule.class);
+        ResourceSchedule schedule = Mockito.mock(ResourceSchedule.class);
         VirtualMachine vm = Mockito.mock(VirtualMachine.class);
 
-        Mockito.when(entityManager.findById(VMSchedule.class, updateVMScheduleCmd.getId())).thenReturn(vmSchedule);
-        Mockito.when(entityManager.findById(VirtualMachine.class, vmSchedule.getVmId())).thenReturn(vm);
+        Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        Mockito.when(entityManager.findById(ResourceSchedule.class, updateVMScheduleCmd.getId())).thenReturn(schedule);
+        Mockito.when(entityManager.findById(VirtualMachine.class, schedule.getResourceId())).thenReturn(vm);
 
         long ownerId = updateVMScheduleCmd.getEntityOwnerId();
         Assert.assertEquals(vm.getAccountId(), ownerId);
@@ -101,8 +117,7 @@ public class UpdateVMScheduleCmdTest {
      */
     @Test(expected = InvalidParameterValueException.class)
     public void testFailureGetEntityOwnerId() {
-        VMSchedule vmSchedule = Mockito.mock(VMSchedule.class);
-        Mockito.when(entityManager.findById(VMSchedule.class, updateVMScheduleCmd.getId())).thenReturn(null);
-        long ownerId = updateVMScheduleCmd.getEntityOwnerId();
+        Mockito.when(entityManager.findById(ResourceSchedule.class, updateVMScheduleCmd.getId())).thenReturn(null);
+        updateVMScheduleCmd.getEntityOwnerId();
     }
 }
diff --git a/api/src/test/java/org/apache/cloudstack/api/response/AttachedIsoResponseTest.java b/api/src/test/java/org/apache/cloudstack/api/response/AttachedIsoResponseTest.java
new file mode 100644
index 00000000000..09d4eb598ab
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/response/AttachedIsoResponseTest.java
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public final class AttachedIsoResponseTest {
+
+    @Test
+    public void testFullConstructorPopulatesAllFields() {
+        AttachedIsoResponse response = new AttachedIsoResponse("uuid-1", "alpine-iso", "Alpine boot", 3, true);
+        Assert.assertEquals("uuid-1", response.getId());
+        Assert.assertEquals("alpine-iso", response.getName());
+        Assert.assertEquals("Alpine boot", response.getDisplayText());
+        Assert.assertEquals(Integer.valueOf(3), response.getDeviceSeq());
+        Assert.assertTrue(response.getBootable());
+    }
+
+    @Test
+    public void testNoArgConstructorLeavesFieldsNull() {
+        AttachedIsoResponse response = new AttachedIsoResponse();
+        Assert.assertNull(response.getId());
+        Assert.assertNull(response.getName());
+        Assert.assertNull(response.getDisplayText());
+        Assert.assertNull(response.getDeviceSeq());
+        Assert.assertNull(response.getBootable());
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/MigrateCommand.java b/core/src/main/java/com/cloud/agent/api/MigrateCommand.java
index 5ac4e9ae445..7196247ffc2 100644
--- a/core/src/main/java/com/cloud/agent/api/MigrateCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/MigrateCommand.java
@@ -26,6 +26,7 @@ import java.util.Map;
 
 import com.cloud.agent.api.to.DpdkTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.storage.Storage;
 
 public class MigrateCommand extends Command {
     private String vmName;
@@ -42,6 +43,7 @@ public class MigrateCommand extends Command {
     private Map<String, DpdkTO> dpdkInterfaceMapping = new HashMap<>();
 
     private int newVmCpuShares;
+    private boolean clvmCrossPoolMigration;
 
     Map<String, Boolean> vlanToPersistenceMap = new HashMap<>();
 
@@ -149,6 +151,14 @@ public class MigrateCommand extends Command {
         this.newVmCpuShares = newVmCpuShares;
     }
 
+    public boolean isClvmCrossPoolMigration() {
+        return clvmCrossPoolMigration;
+    }
+
+    public void setClvmCrossPoolMigration(boolean clvmCrossPoolMigration) {
+        this.clvmCrossPoolMigration = clvmCrossPoolMigration;
+    }
+
     public static class MigrateDiskInfo {
         public enum DiskType {
             FILE, BLOCK;
@@ -184,6 +194,8 @@ public class MigrateCommand extends Command {
         private final String sourceText;
         private final String backingStoreText;
         private boolean isSourceDiskOnStorageFileSystem;
+        private Storage.StoragePoolType sourcePoolType;
+        private Storage.StoragePoolType destPoolType;
 
         public MigrateDiskInfo(final String serialNumber, final DiskType diskType, final DriverType driverType, final Source source, final String sourceText) {
             this.serialNumber = serialNumber;
@@ -232,6 +244,22 @@ public class MigrateCommand extends Command {
         public void setSourceDiskOnStorageFileSystem(boolean isDiskOnFileSystemStorage) {
             this.isSourceDiskOnStorageFileSystem = isDiskOnFileSystemStorage;
         }
+
+        public Storage.StoragePoolType getSourcePoolType() {
+            return sourcePoolType;
+        }
+
+        public void setSourcePoolType(Storage.StoragePoolType sourcePoolType) {
+            this.sourcePoolType = sourcePoolType;
+        }
+
+        public Storage.StoragePoolType getDestPoolType() {
+            return destPoolType;
+        }
+
+        public void setDestPoolType(Storage.StoragePoolType destPoolType) {
+            this.destPoolType = destPoolType;
+        }
     }
 
     @Override
diff --git a/core/src/main/java/com/cloud/agent/api/PostMigrationAnswer.java b/core/src/main/java/com/cloud/agent/api/PostMigrationAnswer.java
new file mode 100644
index 00000000000..24fdf840202
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/PostMigrationAnswer.java
@@ -0,0 +1,42 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+/**
+ * Answer for PostMigrationCommand.
+ * Indicates success or failure of post-migration operations on the destination host.
+ */
+public class PostMigrationAnswer extends Answer {
+
+    protected PostMigrationAnswer() {
+    }
+
+    public PostMigrationAnswer(PostMigrationCommand cmd, String detail) {
+        super(cmd, false, detail);
+    }
+
+    public PostMigrationAnswer(PostMigrationCommand cmd, Exception ex) {
+        super(cmd, ex);
+    }
+
+    public PostMigrationAnswer(PostMigrationCommand cmd) {
+        super(cmd, true, null);
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/PostMigrationCommand.java b/core/src/main/java/com/cloud/agent/api/PostMigrationCommand.java
new file mode 100644
index 00000000000..938000c3593
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/PostMigrationCommand.java
@@ -0,0 +1,59 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+import com.cloud.agent.api.to.VirtualMachineTO;
+
+/**
+ * PostMigrationCommand is sent to the destination host after a successful VM migration.
+ * It performs post-migration tasks such as:
+ * - Claiming exclusive locks on CLVM volumes (converting from shared to exclusive mode)
+ * - Other post-migration cleanup operations
+ */
+public class PostMigrationCommand extends Command {
+    private VirtualMachineTO vm;
+    private String vmName;
+
+    protected PostMigrationCommand() {
+    }
+
+    public PostMigrationCommand(VirtualMachineTO vm, String vmName) {
+        this.vm = vm;
+        this.vmName = vmName;
+    }
+
+    public VirtualMachineTO getVirtualMachine() {
+        return vm;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+
+    @Override
+    public boolean isBypassHostMaintenance() {
+        return true;
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/PreMigrationCommand.java b/core/src/main/java/com/cloud/agent/api/PreMigrationCommand.java
new file mode 100644
index 00000000000..3ff30391eae
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/PreMigrationCommand.java
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+import com.cloud.agent.api.to.VirtualMachineTO;
+
+/**
+ * PreMigrationCommand is sent to the source host before VM migration starts.
+ * It performs pre-migration tasks such as:
+ * - Converting CLVM volume exclusive locks to shared mode so destination host can access them
+ * - Other pre-migration preparation operations on the source host
+ *
+ * This command runs on the SOURCE host before PrepareForMigrationCommand runs on the DESTINATION host.
+ */
+public class PreMigrationCommand extends Command {
+    private VirtualMachineTO vm;
+    private String vmName;
+
+    protected PreMigrationCommand() {
+    }
+
+    public PreMigrationCommand(VirtualMachineTO vm, String vmName) {
+        this.vm = vm;
+        this.vmName = vmName;
+    }
+
+    public VirtualMachineTO getVirtualMachine() {
+        return vm;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+
+    @Override
+    public boolean isBypassHostMaintenance() {
+        return true;
+    }
+}
diff --git a/core/src/main/java/org/apache/cloudstack/storage/clvm/command/ClvmLockTransferAnswer.java b/core/src/main/java/org/apache/cloudstack/storage/clvm/command/ClvmLockTransferAnswer.java
new file mode 100644
index 00000000000..f3c43c400b2
--- /dev/null
+++ b/core/src/main/java/org/apache/cloudstack/storage/clvm/command/ClvmLockTransferAnswer.java
@@ -0,0 +1,90 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.storage.clvm.command;
+
+import com.cloud.agent.api.Answer;
+
+/**
+ * Answer for ClvmLockTransferCommand, containing lock state information.
+ * This answer includes the current lock holder information when querying lock state.
+ */
+public class ClvmLockTransferAnswer extends Answer {
+
+    private String currentLockHostname;
+    private boolean isActive;
+    private boolean isOpen;
+    private String lvAttributes;
+
+    public ClvmLockTransferAnswer(ClvmLockTransferCommand cmd, boolean result, String details) {
+        super(cmd, result, details);
+    }
+
+    public ClvmLockTransferAnswer(ClvmLockTransferCommand cmd, boolean result, String details,
+                                  String currentLockHostname, boolean isActive, boolean isOpen,
+                                  String lvAttributes) {
+        super(cmd, result, details);
+        this.currentLockHostname = currentLockHostname;
+        this.isActive = isActive;
+        this.isOpen = isOpen;
+        this.lvAttributes = lvAttributes;
+    }
+
+    /**
+     * Get the hostname from lv_host. Retained for diagnostics only —
+     * do NOT use this to determine lock holder identity.
+     */
+    public String getCurrentLockHostname() {
+        return currentLockHostname;
+    }
+
+    public void setCurrentLockHostname(String currentLockHostname) {
+        this.currentLockHostname = currentLockHostname;
+    }
+
+    /**
+     * Whether the LV is locally active on the queried host (lv_attr[4]=='a').
+     * This is the authoritative signal for lock holder discovery via fan-out.
+     */
+    public boolean isActive() {
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        isActive = active;
+    }
+
+    /**
+     * Whether a process has the device file open on the queried host (lv_attr[5]=='o').
+     * true means a VM is actively doing I/O on this host right now — do NOT deactivate.
+     */
+    public boolean isOpen() {
+        return isOpen;
+    }
+
+    public void setOpen(boolean open) {
+        isOpen = open;
+    }
+
+    public String getLvAttributes() {
+        return lvAttributes;
+    }
+
+    public void setLvAttributes(String lvAttributes) {
+        this.lvAttributes = lvAttributes;
+    }
+}
diff --git a/core/src/main/java/org/apache/cloudstack/storage/clvm/command/ClvmLockTransferCommand.java b/core/src/main/java/org/apache/cloudstack/storage/clvm/command/ClvmLockTransferCommand.java
new file mode 100644
index 00000000000..218fb798869
--- /dev/null
+++ b/core/src/main/java/org/apache/cloudstack/storage/clvm/command/ClvmLockTransferCommand.java
@@ -0,0 +1,99 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.storage.clvm.command;
+
+import com.cloud.agent.api.Command;
+
+/**
+ * Command to transfer CLVM (Clustered LVM) exclusive lock between hosts.
+ * This enables lightweight volume migration for CLVM storage pools where volumes
+ * reside in the same Volume Group (VG) but need to be accessed from different hosts.
+ *
+ * <p>Instead of copying volume data (traditional migration), this command simply
+ * deactivates the LV on the source host and activates it exclusively on the destination host.
+ *
+ * <p>This is significantly faster (10-100x) than traditional migration and uses no network bandwidth.
+ */
+public class ClvmLockTransferCommand extends Command {
+
+    /**
+     * Operation to perform on the CLVM volume.
+     * Maps to lvchange flags for LVM operations.
+     */
+    public enum Operation {
+        /** Deactivate the volume on this host (-an) */
+        DEACTIVATE("-an", "deactivate"),
+
+        /** Activate the volume exclusively on this host (-aey) */
+        ACTIVATE_EXCLUSIVE("-aey", "activate exclusively"),
+
+        /** Activate the volume in shared mode on this host (-asy) */
+        ACTIVATE_SHARED("-asy", "activate in shared mode"),
+
+        /** Query the current lock state (lvs -o lv_attr,lv_host) */
+        QUERY_LOCK_STATE("query", "query lock state");
+
+        private final String lvchangeFlag;
+        private final String description;
+
+        Operation(String lvchangeFlag, String description) {
+            this.lvchangeFlag = lvchangeFlag;
+            this.description = description;
+        }
+
+        public String getLvchangeFlag() {
+            return lvchangeFlag;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    private String lvPath;
+    private Operation operation;
+    private String volumeUuid;
+
+    public ClvmLockTransferCommand() {
+        // For serialization
+    }
+
+    public ClvmLockTransferCommand(Operation operation, String lvPath, String volumeUuid) {
+        this.operation = operation;
+        this.lvPath = lvPath;
+        this.volumeUuid = volumeUuid;
+        setWait(65);
+    }
+
+    public String getLvPath() {
+        return lvPath;
+    }
+
+    public Operation getOperation() {
+        return operation;
+    }
+
+    public String getVolumeUuid() {
+        return volumeUuid;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+}
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java
index 8b017187076..4937edd33d1 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java
@@ -103,4 +103,21 @@ public interface VolumeInfo extends DownloadableDataInfo, Volume {
     List<String> getCheckpointPaths();
 
     Set<String> getCheckpointImageStoreUrls();
+
+    /**
+     * Gets the destination host ID hint for CLVM volume creation.
+     * This is used to route volume creation commands to the specific host where the VM will be deployed.
+     * Only applicable for CLVM storage pools to avoid shared mode activation.
+     *
+     * @return The host ID where the volume should be created, or null if not set
+     */
+    Long getDestinationHostId();
+
+    /**
+     * Sets the destination host ID hint for CLVM volume creation.
+     * This should be set before volume creation when the destination host is known.
+     *
+     * @param hostId The host ID where the volume should be created
+     */
+    void setDestinationHostId(Long hostId);
 }
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java
index 682473ec94f..a7d82d0b962 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java
@@ -30,6 +30,7 @@ import com.cloud.exception.StorageAccessException;
 import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.offering.DiskOffering;
+import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.Volume;
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
@@ -123,4 +124,71 @@ public interface VolumeService {
     void checkAndRepairVolumeBasedOnConfig(DataObject dataObject, Host host);
 
     void validateChangeDiskOfferingEncryptionType(long existingDiskOfferingId, long newDiskOfferingId);
+
+    /**
+     * Transfers exclusive lock for a volume on cluster-based storage (e.g., CLVM/CLVM_NG) from one host to another.
+     * This is used for storage that requires host-level lock management for volumes on shared storage pools.
+     * For non-CLVM pool types, this method returns false without taking action.
+     *
+     * @param volume The volume to transfer lock for
+     * @param sourceHostId Host currently holding the exclusive lock
+     * @param destHostId Host to receive the exclusive lock
+     * @return true if lock transfer succeeded or was not needed, false if it failed
+     */
+    boolean transferVolumeLock(VolumeInfo volume, Long sourceHostId, Long destHostId);
+
+    /**
+     * Finds which host currently has the exclusive lock on a CLVM volume.
+     * Checks in order: explicit lock tracking, attached VM's host, or first available cluster host.
+     *
+     * @param volume The CLVM volume
+     * @return Host ID that has the exclusive lock, or null if cannot be determined
+     */
+    Long findVolumeLockHost(VolumeInfo volume);
+
+    /**
+     * Performs lightweight CLVM lock migration for a volume to a target host.
+     * This transfers the LVM exclusive lock without copying data (CLVM volumes are on shared cluster storage).
+     * If the volume already has the lock on the destination host, no action is taken.
+     *
+     * @param volume The volume to migrate lock for
+     * @param destHostId Destination host ID
+     * @return Updated VolumeInfo after lock migration
+     */
+    VolumeInfo performLockMigration(VolumeInfo volume, Long destHostId);
+
+    /**
+     * Checks if both storage pools are CLVM type (CLVM or CLVM_NG).
+     *
+     * @param volumePoolType Storage pool type for the volume
+     * @param vmPoolType Storage pool type for the VM
+     * @return true if both pools are CLVM type (CLVM or CLVM_NG)
+     */
+    boolean areBothPoolsClvmType(StoragePoolType volumePoolType, StoragePoolType vmPoolType);
+
+    /**
+     * Determines if CLVM lock transfer is required when a volume is already on the correct storage pool.
+     *
+     * @param volumeToAttach The volume being attached
+     * @param volumePoolType Storage pool type for the volume
+     * @param vmPoolType Storage pool type for the VM's existing volume
+     * @param volumePoolId Storage pool ID for the volume
+     * @param vmPoolId Storage pool ID for the VM's existing volume
+     * @param vmHostId VM's current host ID (or last host ID if stopped)
+     * @return true if CLVM lock transfer is needed
+     */
+    boolean isLockTransferRequired(VolumeInfo volumeToAttach, StoragePoolType volumePoolType, StoragePoolType vmPoolType,
+                                   Long volumePoolId, Long vmPoolId, Long vmHostId);
+
+    /**
+     * Determines if lightweight CLVM migration is needed instead of full data copy.
+     *
+     * @param volumePoolType Storage pool type for the volume
+     * @param vmPoolType Storage pool type for the VM
+     * @param volumePoolPath Storage pool path for the volume
+     * @param vmPoolPath Storage pool path for the VM
+     * @return true if lightweight migration should be used
+     */
+    boolean isLightweightMigrationNeeded(StoragePoolType volumePoolType, StoragePoolType vmPoolType,
+                                         String volumePoolPath, String vmPoolPath);
 }
diff --git a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java
index f1891c774ed..24d7bf621f6 100644
--- a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java
+++ b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java
@@ -64,6 +64,21 @@ public interface TemplateManager {
             true,
             ConfigKey.Scope.Global);
 
+    ConfigKey<Integer> VmIsoMaxCount = new ConfigKey<Integer>("Advanced",
+            Integer.class,
+            "vm.iso.max.count", "1",
+            "Maximum number of ISOs that may be attached to a VM.",
+            true,
+            ConfigKey.Scope.Cluster);
+
+    // KVM/libvirt maps deviceSeq=3 to hdc (hda/hdb are taken by the root volume on i440fx/IDE).
+    // user_vm.iso_id has always pointed at this slot; additional cdroms live in vm_iso_map.
+    int CDROM_PRIMARY_DEVICE_SEQ = 3;
+
+    // Fallback per-VM cdrom cap when the placement host hasn't advertised host.cdrom.max.count
+    // (older agent, never-deployed VM, etc.).
+    int DEFAULT_CDROM_MAX_PER_VM = 1;
+
     static final String VMWARE_TOOLS_ISO = "vmware-tools.iso";
     static final String XS_TOOLS_ISO = "xs-tools.iso";
 
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index db50a5134d8..c27240823b1 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -50,6 +50,8 @@ import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 import javax.persistence.EntityExistsException;
 
+import com.cloud.agent.api.PostMigrationCommand;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.hypervisor.KVMGuru;
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
 import org.apache.cloudstack.annotation.AnnotationService;
@@ -136,6 +138,7 @@ import com.cloud.agent.api.PrepareExternalProvisioningAnswer;
 import com.cloud.agent.api.PrepareExternalProvisioningCommand;
 import com.cloud.agent.api.PrepareForMigrationAnswer;
 import com.cloud.agent.api.PrepareForMigrationCommand;
+import com.cloud.agent.api.PreMigrationCommand;
 import com.cloud.agent.api.RebootAnswer;
 import com.cloud.agent.api.RebootCommand;
 import com.cloud.agent.api.RecreateCheckpointsCommand;
@@ -267,6 +270,7 @@ import com.cloud.storage.dao.StoragePoolHostDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.storage.dao.VolumeDetailsDao;
 import com.cloud.storage.snapshot.SnapshotManager;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.Account;
@@ -361,6 +365,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Inject
     private VolumeDao _volsDao;
     @Inject
+    private VolumeDetailsDao _volsDetailsDao;
+    @Inject
     private HighAvailabilityManager _haMgr;
     @Inject
     private HostPodDao _podDao;
@@ -463,6 +469,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     ExtensionsManager extensionsManager;
     @Inject
     ExtensionDetailsDao extensionDetailsDao;
+    @Inject
+    ClvmPoolManager clvmPoolManager;
 
 
     VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this);
@@ -3150,6 +3158,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         updateOverCommitRatioForVmProfile(profile, dest.getHost().getClusterId());
 
         final VirtualMachineTO to = toVmTO(profile);
+
+        executePreMigrationCommand(vm, to, srcHostId);
+
         final PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);
         setVmNetworkDetails(vm, to);
 
@@ -3281,6 +3292,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
                 logger.warn("Error while checking the vm {} on host {}", vm, dest.getHost(), e);
             }
             migrated = true;
+            executePostMigrationCommand(vm, to, dstHostId);
         } finally {
             if (!migrated) {
                 logger.info("Migration was unsuccessful. Cleaning up: {}", vm);
@@ -3320,6 +3332,30 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         }
     }
 
+    private void executePostMigrationCommand(VMInstanceVO vm, VirtualMachineTO to, long dstHostId) {
+        if (!(vm.getHypervisorType() == HypervisorType.KVM && hasClvmVolumes(vm.getId()))) {
+            return;
+        }
+        final String dstHostUuid = _hostDao.findById(dstHostId).getUuid();
+        try {
+            logger.info("Executing post-migration tasks for VM {} with CLVM volumes on destination host {}", vm.getInstanceName(), dstHostUuid);
+            final PostMigrationCommand postMigrationCommand = new PostMigrationCommand(to, vm.getInstanceName());
+            final Answer postMigrationAnswer = _agentMgr.send(dstHostId, postMigrationCommand);
+
+            if (postMigrationAnswer == null || !postMigrationAnswer.getResult()) {
+                final String details = postMigrationAnswer != null ? postMigrationAnswer.getDetails() : "null answer returned";
+                logger.warn("Post-migration tasks failed for VM {} on destination host {}: {}. Migration completed but some cleanup may be needed.",
+                        vm.getInstanceName(), dstHostUuid, details);
+            } else {
+                logger.info("Successfully completed post-migration tasks for VM {} on destination host {}", vm.getInstanceName(), dstHostUuid);
+            }
+        } catch (Exception e) {
+            logger.warn("Exception during post-migration tasks for VM {} on destination host {}: {}. Migration completed but some cleanup may be needed.",
+                    vm.getInstanceName(), dstHostUuid, e.getMessage(), e);
+        }
+        updateClvmLockHostForVmVolumes(vm.getId(), dstHostId);
+    }
+
     /**
      * Create and set parameters for the {@link MigrateCommand} used in the migration and scaling of VMs.
      */
@@ -3366,6 +3402,27 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         _vmDao.persist(newVm);
     }
 
+    /**
+     * Updates CLVM_LOCK_HOST_ID for all CLVM volumes attached to a VM after VM migration.
+     * This ensures that subsequent operations on CLVM volumes are routed to the correct host.
+     *
+     * @param vmId The ID of the VM that was migrated
+     * @param destHostId The destination host ID where the VM now resides
+     */
+    private void updateClvmLockHostForVmVolumes(long vmId, long destHostId) {
+        List<VolumeVO> volumes = _volsDao.findByInstance(vmId);
+        if (CollectionUtils.isEmpty(volumes)) {
+            return;
+        }
+
+        for (VolumeVO volume : volumes) {
+            StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
+            if (pool != null && ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+                clvmPoolManager.setClvmLockHostId(volume.getId(), destHostId);
+            }
+        }
+    }
+
     /**
      * We create the mapping of volumes and storage pool to migrate the VMs according to the information sent by the user.
      * If the user did not enter a complete mapping, the volumes that were left behind will be auto mapped using {@link #createStoragePoolMappingsForVolumes(VirtualMachineProfile, DataCenterDeployment, Map, List)}
@@ -4922,6 +4979,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         volumeMgr.prepareForMigration(profile, dest);
 
         final VirtualMachineTO to = toVmTO(profile);
+
+        // Step 1: Send PreMigrationCommand to source host to convert CLVM volumes to shared mode
+        // This must happen BEFORE PrepareForMigrationCommand on destination to avoid lock conflicts
+        executePreMigrationCommand(vm, to, srcHostId);
+
+        // Step 2: Send PrepareForMigrationCommand to destination host
         final PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);
 
         ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Migrating, vm.getType(), vm.getId());
@@ -5006,6 +5069,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
             }
 
             migrated = true;
+            executePostMigrationCommand(vm, to, dstHostId);
         } finally {
             if (!migrated) {
                 logger.info("Migration was unsuccessful.  Cleaning up: {}", vm);
@@ -6441,6 +6505,37 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         return findClusterAndHostIdForVm(vm, false);
     }
 
+    private boolean hasClvmVolumes(long vmId) {
+        List<VolumeVO> volumes = _volsDao.findByInstance(vmId);
+        return volumes.stream()
+            .map(v -> _storagePoolDao.findById(v.getPoolId()))
+            .anyMatch(pool -> pool != null && ClvmPoolManager.isClvmPoolType(pool.getPoolType()));
+    }
+
+    private void executePreMigrationCommand(VMInstanceVO vm, VirtualMachineTO to, long srcHostId) {
+        if (!(vm.getHypervisorType() == HypervisorType.KVM && hasClvmVolumes(vm.getId()))) {
+            return;
+        }
+        final String vmInstanceName = vm.getInstanceName();
+        final String srcHostUuid = _hostDao.findById(srcHostId).getUuid();
+        logger.info("Sending PreMigrationCommand to source host {} for VM {} with CLVM volumes", srcHostUuid, vmInstanceName);
+        final PreMigrationCommand preMigCmd = new PreMigrationCommand(to, vmInstanceName);
+        Answer preMigAnswer = null;
+        try {
+            preMigAnswer = _agentMgr.send(srcHostId, preMigCmd);
+            if (preMigAnswer == null || !preMigAnswer.getResult()) {
+                final String details = preMigAnswer != null ? preMigAnswer.getDetails() : "null answer returned";
+                final String msg = "Failed to prepare source host for migration: " + details;
+                logger.error("Failed to prepare source host {} for migration of VM {}: {}", srcHostUuid, vmInstanceName, details);
+                throw new CloudRuntimeException(msg);
+            }
+            logger.info("Successfully prepared source host {} for migration of VM {}", srcHostUuid, vmInstanceName);
+        } catch (final AgentUnavailableException | OperationTimedoutException e) {
+            logger.error("Failed to send PreMigrationCommand to source host {}: {}", srcHostUuid, e.getMessage(), e);
+            throw new CloudRuntimeException("Failed to prepare source host for migration: " + e.getMessage(), e);
+        }
+    }
+
     @Override
     public Pair<Long, Long> findClusterAndHostIdForVm(long vmId) {
         VMInstanceVO vm = _vmDao.findById(vmId);
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index bf3985d3ce7..c4a6a9dd684 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -38,8 +38,10 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.AgentManager;
 import com.cloud.deploy.DeploymentClusterPlanner;
 import com.cloud.exception.ResourceAllocationException;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.resourcelimit.ReservationHelper;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.VMTemplateVO;
@@ -275,6 +277,10 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
     ConfigurationDao configurationDao;
     @Inject
     VMInstanceDao vmInstanceDao;
+    @Inject
+    ClvmPoolManager clvmPoolManager;
+    @Inject
+    AgentManager _agentMgr;
 
     @Inject
     protected SnapshotHelper snapshotHelper;
@@ -747,6 +753,17 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
         logger.debug("Trying to create volume [{}] on storage pool [{}].",
                 volumeToString, poolToString);
         DataStore store = dataStoreMgr.getDataStore(pool.getId(), DataStoreRole.Primary);
+
+        // For CLVM pools, set the lock host hint so volume is created on the correct host
+        // This avoids the need for shared mode activation and improves performance
+        if (ClvmPoolManager.isClvmPoolType(pool.getPoolType()) && hostId != null) {
+            logger.info("CLVM pool detected. Setting lock host {} for volume {} to route creation to correct host",
+                    hostId, volumeInfo.getUuid());
+            volumeInfo.setDestinationHostId(hostId);
+
+            clvmPoolManager.setClvmLockHostId(volumeInfo.getId(), hostId);
+        }
+
         for (int i = 0; i < 2; i++) {
             // retry one more time in case of template reload is required for Vmware case
             AsyncCallFuture<VolumeApiResult> future = null;
@@ -788,6 +805,122 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
         return String.format("uuid: %s, name: %s", volume.getUuid(), volume.getName());
     }
 
+    /**
+     * Updates the CLVM_LOCK_HOST_ID for a migrated volume if applicable.
+     * For CLVM volumes that are attached to a VM, this updates the lock host tracking
+     * to point to the VM's current host after volume migration.
+     *
+     * @param migratedVolume The volume that was migrated
+     * @param destPool The destination storage pool
+     * @param operationType Description of the operation (e.g., "migrated", "live-migrated") for logging
+     */
+    private void updateClvmLockHostAfterMigration(Volume migratedVolume, StoragePool destPool, String operationType) {
+        if (migratedVolume == null || destPool == null) {
+            return;
+        }
+
+        StoragePoolVO pool = _storagePoolDao.findById(destPool.getId());
+        if (pool == null || !ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            return;
+        }
+
+        if (migratedVolume.getInstanceId() == null) {
+            return;
+        }
+
+        VMInstanceVO vm = vmInstanceDao.findById(migratedVolume.getInstanceId());
+        if (vm == null || vm.getHostId() == null) {
+            return;
+        }
+
+        clvmPoolManager.setClvmLockHostId(migratedVolume.getId(), vm.getHostId());
+        logger.debug("Updated CLVM_LOCK_HOST_ID for {} volume {} to host {} where VM {} is running",
+                operationType, migratedVolume.getUuid(), vm.getHostId(), vm.getInstanceName());
+    }
+
+    /**
+     * Retrieves the CLVM lock host ID from any existing volume of the specified VM.
+     * This is useful when attaching a new volume to a stopped VM - we want to maintain
+     * consistency by using the same host that manages the VM's other CLVM volumes.
+     *
+     * @param vmId The ID of the VM
+     * @return The host ID if found, null otherwise
+     */
+    private Long getClvmLockHostFromVmVolumes(Long vmId) {
+        if (vmId == null) {
+            return null;
+        }
+
+        List<VolumeVO> vmVolumes = _volsDao.findByInstance(vmId);
+        if (vmVolumes == null || vmVolumes.isEmpty()) {
+            return null;
+        }
+
+        for (VolumeVO volume : vmVolumes) {
+            if (volume.getPoolId() == null) {
+                continue;
+            }
+
+            StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
+            if (pool == null || !ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+                continue;
+            }
+            Long lockHostId = clvmPoolManager.getClvmLockHostId(
+                    volume.getId(),
+                    volume.getUuid(),
+                    volume.getPath(),
+                    pool,
+                    true
+            );
+            if (lockHostId != null) {
+                logger.debug("Found actual CLVM lock host {} from volume {} of VM {} via LVM query",
+                        lockHostId, volume.getUuid(), vmId);
+                return lockHostId;
+            }
+        }
+
+        return null;
+    }
+
+    private void transferClvmLocksForVmStart(List<VolumeVO> volumes, Long destHostId, VMInstanceVO vm) {
+        if (volumes == null || volumes.isEmpty() || destHostId == null) {
+            return;
+        }
+
+        for (VolumeVO volume : volumes) {
+            if (volume.getPoolId() == null) {
+                continue;
+            }
+
+            StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
+            if (pool == null || !ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+                continue;
+            }
+
+            Long currentLockHost = clvmPoolManager.getClvmLockHostId(
+                    volume.getId(),
+                    volume.getUuid(),
+                    volume.getPath(),
+                    pool,
+                    true
+            );
+
+            if (currentLockHost == null) {
+                clvmPoolManager.setClvmLockHostId(volume.getId(), destHostId);
+            } else if (!currentLockHost.equals(destHostId)) {
+                logger.info("CLVM volume {} is locked on host {} but VM {} starting on host {}. Transferring lock.",
+                        volume.getUuid(), currentLockHost, vm.getInstanceName(), destHostId);
+
+                if (!clvmPoolManager.transferClvmVolumeLock(volume.getUuid(), volume.getId(),
+                        volume.getPath(), pool, currentLockHost, destHostId)) {
+                    throw new CloudRuntimeException(
+                            String.format("Failed to transfer CLVM lock for volume %s from host %s to host %s",
+                                    volume.getUuid(), currentLockHost, destHostId));
+                }
+            }
+        }
+    }
+
     public String getRandomVolumeName() {
         return UUID.randomUUID().toString();
     }
@@ -1206,10 +1339,22 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
         Long clusterId = storagePool.getClusterId();
         logger.trace("storage-pool {}/{} is associated with cluster {}",storagePool.getName(), storagePool.getUuid(), clusterId);
         Long hostId = vm.getHostId();
-        if (hostId == null && storagePool.isLocal()) {
-            List<StoragePoolHostVO> poolHosts = storagePoolHostDao.listByPoolId(storagePool.getId());
-            if (poolHosts.size() > 0) {
-                hostId = poolHosts.get(0).getHostId();
+        if (hostId == null && (storagePool.isLocal() || ClvmPoolManager.isClvmPoolType(storagePool.getPoolType()))) {
+            if (ClvmPoolManager.isClvmPoolType(storagePool.getPoolType())) {
+                hostId = getClvmLockHostFromVmVolumes(vm.getId());
+                if (hostId != null) {
+                    logger.debug("Using CLVM lock host {} from VM {}'s existing volumes for new volume creation",
+                            hostId, vm.getUuid());
+                }
+            }
+
+            if (hostId == null) {
+                List<StoragePoolHostVO> poolHosts = storagePoolHostDao.listByPoolId(storagePool.getId());
+                if (!poolHosts.isEmpty()) {
+                    hostId = poolHosts.get(0).getHostId();
+                    logger.debug("Selected host {} from storage pool {} for stopped VM {} volume creation",
+                            hostId, storagePool.getUuid(), vm.getUuid());
+                }
             }
         }
 
@@ -1454,6 +1599,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
                     _snapshotDao.updateVolumeIds(vol.getId(), result.getVolume().getId());
                     _snapshotDataStoreDao.updateVolumeIds(vol.getId(), result.getVolume().getId());
                 }
+
+                // For CLVM volumes attached to a VM, update the CLVM_LOCK_HOST_ID after migration
+                updateClvmLockHostAfterMigration(result.getVolume(), destPool, "migrated");
             }
             return result.getVolume();
         } catch (InterruptedException | ExecutionException e) {
@@ -1479,6 +1627,10 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
                 logger.error("Volume [{}] migration failed due to [{}].", volToString, result.getResult());
                 return null;
             }
+
+            // For CLVM volumes attached to a VM, update the CLVM_LOCK_HOST_ID after live migration
+            updateClvmLockHostAfterMigration(result.getVolume(), destPool, "live-migrated");
+
             return result.getVolume();
         } catch (InterruptedException | ExecutionException e) {
             logger.error("Volume [{}] migration failed due to [{}].", volToString, e.getMessage());
@@ -1521,6 +1673,22 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
                 logger.error(msg);
                 throw new CloudRuntimeException(msg);
             }
+            for (Map.Entry<Volume, StoragePool> entry : volumeToPool.entrySet()) {
+                Volume volume = entry.getKey();
+                StoragePool destPool = entry.getValue();
+                StoragePoolVO srcPool = _storagePoolDao.findById(volume.getPoolId());
+                if (srcPool != null && srcPool.getId() == destPool.getId() &&
+                        ClvmPoolManager.isClvmPoolType(srcPool.getPoolType())) {
+                    if (!clvmPoolManager.transferClvmVolumeLock(volume.getUuid(), volume.getId(),
+                            volume.getPath(), srcPool, srcHost.getId(), destHost.getId())) {
+                        throw new CloudRuntimeException(String.format(
+                                "Failed to transfer CLVM lock for volume [%s] to destination host [%s].",
+                                volume.getUuid(), destHost.getId()));
+                    }
+                } else {
+                    updateClvmLockHostAfterMigration(volume, destPool, "vm-migrated");
+                }
+            }
         } catch (InterruptedException |  ExecutionException e) {
             logger.error("Failed to migrate VM [{}] along with its volumes due to [{}].", vm, e.getMessage());
             logger.debug("Exception: ", e);
@@ -1853,6 +2021,19 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
 
                     future = volService.createManagedStorageVolumeFromTemplateAsync(volume, destPool.getId(), templ, hostId);
                 } else {
+                    // For CLVM pools, set the destination host hint so volume is created on the correct host
+                    // This avoids the need for shared mode activation and improves performance
+                    StoragePoolVO poolVO = _storagePoolDao.findById(destPool.getId());
+                    if (poolVO != null && ClvmPoolManager.isClvmPoolType(poolVO.getPoolType())) {
+                        Long hostId = vm.getVirtualMachine().getHostId();
+                        if (hostId != null) {
+                            volume.setDestinationHostId(hostId);
+                            clvmPoolManager.setClvmLockHostId(volume.getId(), hostId);
+                            logger.info("CLVM pool detected during volume creation from template. Setting lock host {} for volume {} (persisted to DB) to route creation to correct host",
+                                    hostId, volume.getUuid());
+                        }
+                    }
+
                     future = volService.createVolumeFromTemplateAsync(volume, destPool.getId(), templ);
                 }
             }
@@ -1976,13 +2157,18 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
             throw new CloudRuntimeException(msg);
         }
 
-        // don't allow to start vm that doesn't have a root volume
         if (_volsDao.findByInstanceAndType(vm.getId(), Volume.Type.ROOT).isEmpty()) {
             throw new CloudRuntimeException(String.format("ROOT volume is missing, unable to prepare volumes for the VM [%s].", vm.getVirtualMachine()));
         }
 
         List<VolumeVO> vols = _volsDao.findUsableVolumesForInstance(vm.getId());
 
+        VirtualMachine vmInstance = vm.getVirtualMachine();
+        VMInstanceVO vmInstanceVO = vmInstanceDao.findById(vmInstance.getId());
+        if (vmInstance.getState() == State.Starting && dest.getHost() != null) {
+            transferClvmLocksForVmStart(vols, dest.getHost().getId(), vmInstanceVO);
+        }
+
         List<VolumeTask> tasks = getTasks(vols, dest.getStorageForDisks(), vm);
         Volume vol = null;
         PrimaryDataStore store;
diff --git a/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml b/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml
index 49c668f50e8..8f93ae5b35a 100644
--- a/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml
+++ b/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml
@@ -44,6 +44,8 @@
             value="#{storagePoolAllocatorsRegistry.registered}" />
     </bean>
 
+    <bean id="clvmPoolManager" class="com.cloud.storage.clvm.ClvmPoolManager" />
+
     <bean id="storageOrchestrator"
           class="org.apache.cloudstack.engine.orchestration.StorageOrchestrator"/>
     <bean id="dataMigrationHelper"
diff --git a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
index a07870d09af..c656e1a282a 100644
--- a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -60,6 +61,7 @@ import com.cloud.ha.HighAvailabilityManager;
 import com.cloud.network.Network;
 import com.cloud.network.NetworkModel;
 import com.cloud.resource.ResourceManager;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator;
@@ -336,6 +338,19 @@ public class VirtualMachineManagerImplTest {
         }
     }
 
+    private ClvmPoolManager injectMockedClvmPoolManager() {
+        ClvmPoolManager clvmPoolManagerMock = mock(ClvmPoolManager.class);
+        ReflectionTestUtils.setField(virtualMachineManagerImpl, "clvmPoolManager", clvmPoolManagerMock);
+        return clvmPoolManagerMock;
+    }
+
+    private Method getUpdateClvmLockHostForVmVolumesMethod() throws NoSuchMethodException {
+        Method method = VirtualMachineManagerImpl.class.getDeclaredMethod(
+            "updateClvmLockHostForVmVolumes", long.class, long.class);
+        method.setAccessible(true);
+        return method;
+    }
+
     @Test
     public void testaddHostIpToCertDetailsIfConfigAllows() {
         Host vmHost = mock(Host.class);
@@ -1954,4 +1969,181 @@ public class VirtualMachineManagerImplTest {
         }
     }
 
+    @Test
+    public void testUpdateClvmLockHostForVmVolumes_WithClvmVolumes() throws Exception {
+        long vmId = 100L;
+        long destHostId = 2L;
+        long poolId = 10L;
+
+        VolumeVO clvmVolume1 = mock(VolumeVO.class);
+        VolumeVO clvmVolume2 = mock(VolumeVO.class);
+
+        when(clvmVolume1.getId()).thenReturn(1L);
+        when(clvmVolume1.getPoolId()).thenReturn(poolId);
+        when(clvmVolume2.getId()).thenReturn(2L);
+        when(clvmVolume2.getPoolId()).thenReturn(poolId);
+
+        StoragePoolVO clvmPool = mock(StoragePoolVO.class);
+        when(clvmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        when(volumeDaoMock.findByInstance(vmId)).thenReturn(Arrays.asList(clvmVolume1, clvmVolume2));
+        when(storagePoolDaoMock.findById(poolId)).thenReturn(clvmPool);
+
+        ClvmPoolManager clvmPoolManagerMock = injectMockedClvmPoolManager();
+
+        Method method = getUpdateClvmLockHostForVmVolumesMethod();
+        method.invoke(virtualMachineManagerImpl, vmId, destHostId);
+
+        verify(clvmPoolManagerMock, times(1)).setClvmLockHostId(1L, destHostId);
+        verify(clvmPoolManagerMock, times(1)).setClvmLockHostId(2L, destHostId);
+    }
+
+    @Test
+    public void testUpdateClvmLockHostForVmVolumes_WithNonClvmVolumes() throws Exception {
+        long vmId = 100L;
+        long destHostId = 2L;
+        long poolId = 10L;
+
+        VolumeVO nfsVolume = mock(VolumeVO.class);
+        when(nfsVolume.getPoolId()).thenReturn(poolId);
+
+        StoragePoolVO nfsPool = mock(StoragePoolVO.class);
+        when(nfsPool.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+
+        when(volumeDaoMock.findByInstance(vmId)).thenReturn(Arrays.asList(nfsVolume));
+        when(storagePoolDaoMock.findById(poolId)).thenReturn(nfsPool);
+
+        ClvmPoolManager clvmPoolManagerMock = injectMockedClvmPoolManager();
+
+        Method method = getUpdateClvmLockHostForVmVolumesMethod();
+        method.invoke(virtualMachineManagerImpl, vmId, destHostId);
+
+        verify(clvmPoolManagerMock, never()).setClvmLockHostId(anyLong(), anyLong());
+    }
+
+    @Test
+    public void testUpdateClvmLockHostForVmVolumes_WithMixedVolumes() throws Exception {
+        long vmId = 100L;
+        long destHostId = 2L;
+        long clvmPoolId = 10L;
+        long nfsPoolId = 20L;
+
+        VolumeVO clvmVolume = mock(VolumeVO.class);
+        VolumeVO nfsVolume = mock(VolumeVO.class);
+
+        when(clvmVolume.getId()).thenReturn(1L);
+        when(clvmVolume.getPoolId()).thenReturn(clvmPoolId);
+        when(nfsVolume.getPoolId()).thenReturn(nfsPoolId);
+
+        StoragePoolVO clvmPool = mock(StoragePoolVO.class);
+        when(clvmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        StoragePoolVO nfsPool = mock(StoragePoolVO.class);
+        when(nfsPool.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+
+        when(volumeDaoMock.findByInstance(vmId)).thenReturn(Arrays.asList(clvmVolume, nfsVolume));
+        when(storagePoolDaoMock.findById(clvmPoolId)).thenReturn(clvmPool);
+        when(storagePoolDaoMock.findById(nfsPoolId)).thenReturn(nfsPool);
+
+        ClvmPoolManager clvmPoolManagerMock = injectMockedClvmPoolManager();
+
+        Method method = getUpdateClvmLockHostForVmVolumesMethod();
+        method.invoke(virtualMachineManagerImpl, vmId, destHostId);
+
+        verify(clvmPoolManagerMock, times(1)).setClvmLockHostId(1L, destHostId);
+        verify(clvmPoolManagerMock, never()).setClvmLockHostId(2L, destHostId);
+    }
+
+    @Test
+    public void testUpdateClvmLockHostForVmVolumes_WithNoVolumes() throws Exception {
+        long vmId = 100L;
+        long destHostId = 2L;
+
+        when(volumeDaoMock.findByInstance(vmId)).thenReturn(Collections.emptyList());
+
+        ClvmPoolManager clvmPoolManagerMock = injectMockedClvmPoolManager();
+
+        Method method = getUpdateClvmLockHostForVmVolumesMethod();
+        method.invoke(virtualMachineManagerImpl, vmId, destHostId);
+
+        verify(clvmPoolManagerMock, never()).setClvmLockHostId(anyLong(), anyLong());
+    }
+
+    @Test
+    public void testUpdateClvmLockHostForVmVolumes_WithNullPoolId() throws Exception {
+        long vmId = 100L;
+        long destHostId = 2L;
+
+        VolumeVO volumeWithoutPool = mock(VolumeVO.class);
+        when(volumeWithoutPool.getPoolId()).thenReturn(null);
+
+        when(volumeDaoMock.findByInstance(vmId)).thenReturn(Arrays.asList(volumeWithoutPool));
+
+        ClvmPoolManager clvmPoolManagerMock = injectMockedClvmPoolManager();
+
+        Method method = getUpdateClvmLockHostForVmVolumesMethod();
+        method.invoke(virtualMachineManagerImpl, vmId, destHostId);
+
+        verify(storagePoolDaoMock, never()).findById(anyLong());
+        verify(clvmPoolManagerMock, never()).setClvmLockHostId(anyLong(), anyLong());
+    }
+
+    @Test
+    public void testUpdateClvmLockHostForVmVolumes_WithNullPool() throws Exception {
+        long vmId = 100L;
+        long destHostId = 2L;
+        long poolId = 10L;
+
+        VolumeVO volume = mock(VolumeVO.class);
+        when(volume.getPoolId()).thenReturn(poolId);
+
+        when(volumeDaoMock.findByInstance(vmId)).thenReturn(Arrays.asList(volume));
+        when(storagePoolDaoMock.findById(poolId)).thenReturn(null);
+
+        ClvmPoolManager clvmPoolManagerMock = injectMockedClvmPoolManager();
+
+        Method method = getUpdateClvmLockHostForVmVolumesMethod();
+        method.invoke(virtualMachineManagerImpl, vmId, destHostId);
+
+        verify(clvmPoolManagerMock, never()).setClvmLockHostId(anyLong(), anyLong());
+    }
+
+    @Test
+    public void testUpdateClvmLockHostForVmVolumes_MultipleClvmPools() throws Exception {
+        long vmId = 100L;
+        long destHostId = 2L;
+        long pool1Id = 10L;
+        long pool2Id = 20L;
+
+        VolumeVO volume1 = mock(VolumeVO.class);
+        VolumeVO volume2 = mock(VolumeVO.class);
+        VolumeVO volume3 = mock(VolumeVO.class);
+
+        when(volume1.getId()).thenReturn(1L);
+        when(volume1.getPoolId()).thenReturn(pool1Id);
+        when(volume2.getId()).thenReturn(2L);
+        when(volume2.getPoolId()).thenReturn(pool2Id);
+        when(volume3.getId()).thenReturn(3L);
+        when(volume3.getPoolId()).thenReturn(pool1Id);
+
+        StoragePoolVO clvmPool1 = mock(StoragePoolVO.class);
+        when(clvmPool1.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        StoragePoolVO clvmPool2 = mock(StoragePoolVO.class);
+        when(clvmPool2.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        when(volumeDaoMock.findByInstance(vmId)).thenReturn(Arrays.asList(volume1, volume2, volume3));
+        when(storagePoolDaoMock.findById(pool1Id)).thenReturn(clvmPool1);
+        when(storagePoolDaoMock.findById(pool2Id)).thenReturn(clvmPool2);
+
+        ClvmPoolManager clvmPoolManagerMock = injectMockedClvmPoolManager();
+
+        Method method = getUpdateClvmLockHostForVmVolumesMethod();
+        method.invoke(virtualMachineManagerImpl, vmId, destHostId);
+
+        verify(clvmPoolManagerMock, times(1)).setClvmLockHostId(1L, destHostId);
+        verify(clvmPoolManagerMock, times(1)).setClvmLockHostId(2L, destHostId);
+        verify(clvmPoolManagerMock, times(1)).setClvmLockHostId(3L, destHostId);
+    }
+
 }
diff --git a/engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestratorTest.java b/engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestratorTest.java
index b4a26c17e2e..a184b4540a9 100644
--- a/engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestratorTest.java
+++ b/engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestratorTest.java
@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.engine.orchestration;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -30,6 +32,7 @@ import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.offering.DiskOffering;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.Storage;
@@ -42,6 +45,7 @@ import com.cloud.user.ResourceLimitService;
 import com.cloud.uservm.UserVm;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.utils.Pair;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
@@ -67,6 +71,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction;
@@ -640,4 +645,305 @@ public class VolumeOrchestratorTest {
         Assert.assertEquals(1, result.second().size());
     }
 
+    @Test
+    public void testTransferClvmLocksForVmStart_WithClvmVolumes() throws Exception {
+        Long destHostId = 2L;
+        Long currentHostId = 1L;
+        Long poolId = 10L;
+
+        VolumeVO clvmVolume1 = Mockito.mock(VolumeVO.class);
+        VolumeVO clvmVolume2 = Mockito.mock(VolumeVO.class);
+
+        Mockito.when(clvmVolume1.getId()).thenReturn(101L);
+        Mockito.when(clvmVolume1.getPoolId()).thenReturn(poolId);
+        Mockito.when(clvmVolume1.getUuid()).thenReturn("vol-uuid-1");
+        Mockito.when(clvmVolume1.getPath()).thenReturn("vol-path-1");
+
+        Mockito.when(clvmVolume2.getId()).thenReturn(102L);
+        Mockito.when(clvmVolume2.getPoolId()).thenReturn(poolId);
+        Mockito.when(clvmVolume2.getUuid()).thenReturn("vol-uuid-2");
+        Mockito.when(clvmVolume2.getPath()).thenReturn("vol-path-2");
+
+        StoragePoolVO clvmPool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(clvmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+        Mockito.when(vmInstance.getInstanceName()).thenReturn(MOCK_VM_NAME);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(101L), Mockito.anyString(),
+                Mockito.anyString(), Mockito.any(), Mockito.eq(true))).thenReturn(currentHostId);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(102L), Mockito.anyString(),
+                Mockito.anyString(), Mockito.any(), Mockito.eq(true))).thenReturn(currentHostId);
+        Mockito.when(clvmPoolManager.transferClvmVolumeLock(Mockito.anyString(), Mockito.anyLong(),
+            Mockito.anyString(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong())).thenReturn(true);
+
+        Mockito.when(storagePoolDao.findById(poolId)).thenReturn(clvmPool);
+
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+        setField(volumeOrchestrator, "_storagePoolDao", storagePoolDao);
+
+        Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        method.invoke(volumeOrchestrator, List.of(clvmVolume1, clvmVolume2), destHostId, vmInstance);
+
+        Mockito.verify(clvmPoolManager, Mockito.times(1)).transferClvmVolumeLock(
+            Mockito.eq("vol-uuid-1"), Mockito.eq(101L), Mockito.eq("vol-path-1"),
+            Mockito.eq(clvmPool), Mockito.eq(currentHostId), Mockito.eq(destHostId));
+        Mockito.verify(clvmPoolManager, Mockito.times(1)).transferClvmVolumeLock(
+            Mockito.eq("vol-uuid-2"), Mockito.eq(102L), Mockito.eq("vol-path-2"),
+            Mockito.eq(clvmPool), Mockito.eq(currentHostId), Mockito.eq(destHostId));
+    }
+
+    @Test
+    public void testTransferClvmLocksForVmStart_WithNonClvmVolumes() throws Exception {
+        Long destHostId = 2L;
+        Long poolId = 10L;
+
+        VolumeVO nfsVolume = Mockito.mock(VolumeVO.class);
+        Mockito.when(nfsVolume.getPoolId()).thenReturn(poolId);
+
+        StoragePoolVO nfsPool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(nfsPool.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+
+        Mockito.when(storagePoolDao.findById(poolId)).thenReturn(nfsPool);
+
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+        setField(volumeOrchestrator, "_storagePoolDao", storagePoolDao);
+
+        Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        method.invoke(volumeOrchestrator, List.of(nfsVolume), destHostId, vmInstance);
+
+        Mockito.verify(clvmPoolManager, Mockito.never()).transferClvmVolumeLock(
+            Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(),
+            Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
+    }
+
+    @Test
+    public void testTransferClvmLocksForVmStart_NoLockTransferNeeded() throws Exception {
+        Long destHostId = 2L;
+        Long poolId = 10L;
+
+        VolumeVO clvmVolume = Mockito.mock(VolumeVO.class);
+        Mockito.when(clvmVolume.getId()).thenReturn(101L);
+        Mockito.when(clvmVolume.getPoolId()).thenReturn(poolId);
+
+        StoragePoolVO clvmPool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(clvmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(101L), ArgumentMatchers.nullable(String.class),
+                ArgumentMatchers.nullable(String.class), Mockito.any(), Mockito.eq(true))).thenReturn(destHostId);
+
+        Mockito.when(storagePoolDao.findById(poolId)).thenReturn(clvmPool);
+
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+        setField(volumeOrchestrator, "_storagePoolDao", storagePoolDao);
+
+        java.lang.reflect.Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        method.invoke(volumeOrchestrator, List.of(clvmVolume), destHostId, vmInstance);
+
+        Mockito.verify(clvmPoolManager, Mockito.never()).transferClvmVolumeLock(
+            Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(),
+            Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
+    }
+
+    @Test
+    public void testTransferClvmLocksForVmStart_EmptyVolumeList() throws Exception {
+        Long destHostId = 2L;
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+
+        Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        method.invoke(volumeOrchestrator, new ArrayList<VolumeVO>(), destHostId, vmInstance);
+
+        Mockito.verify(clvmPoolManager, Mockito.never()).getClvmLockHostId(Mockito.anyLong(), Mockito.anyString(),
+                Mockito.anyString(), Mockito.any(), Mockito.anyBoolean());
+    }
+
+    @Test
+    public void testTransferClvmLocksForVmStart_NullPoolId() throws Exception {
+        Long destHostId = 2L;
+
+        VolumeVO volumeWithoutPool = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeWithoutPool.getPoolId()).thenReturn(null);
+
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+        setField(volumeOrchestrator, "_storagePoolDao", storagePoolDao);
+
+        Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        method.invoke(volumeOrchestrator, List.of(volumeWithoutPool), destHostId, vmInstance);
+
+        Mockito.verify(storagePoolDao, Mockito.never()).findById(Mockito.anyLong());
+    }
+
+    @Test
+    public void testTransferClvmLocksForVmStart_SetInitialLockHost() throws Exception {
+        Long destHostId = 2L;
+        Long poolId = 10L;
+
+        VolumeVO clvmVolume = Mockito.mock(VolumeVO.class);
+        Mockito.when(clvmVolume.getId()).thenReturn(101L);
+        Mockito.when(clvmVolume.getPoolId()).thenReturn(poolId);
+
+        StoragePoolVO clvmPool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(clvmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(101L), ArgumentMatchers.nullable(String.class),
+                ArgumentMatchers.nullable(String.class), Mockito.any(), Mockito.eq(true))).thenReturn(null);
+
+        Mockito.when(storagePoolDao.findById(poolId)).thenReturn(clvmPool);
+
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+        setField(volumeOrchestrator, "_storagePoolDao", storagePoolDao);
+
+        Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        method.invoke(volumeOrchestrator, List.of(clvmVolume), destHostId, vmInstance);
+
+        Mockito.verify(clvmPoolManager, Mockito.times(1)).setClvmLockHostId(101L, destHostId);
+        Mockito.verify(clvmPoolManager, Mockito.never()).transferClvmVolumeLock(
+            Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(),
+            Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
+    }
+
+    @Test
+    public void testTransferClvmLocksForVmStart_MixedVolumes() throws Exception {
+        Long destHostId = 2L;
+        Long currentHostId = 1L;
+        Long clvmPoolId = 10L;
+        Long nfsPoolId = 20L;
+
+        VolumeVO clvmVolume = Mockito.mock(VolumeVO.class);
+        Mockito.when(clvmVolume.getId()).thenReturn(101L);
+        Mockito.when(clvmVolume.getPoolId()).thenReturn(clvmPoolId);
+        Mockito.when(clvmVolume.getUuid()).thenReturn("clvm-vol-uuid");
+        Mockito.when(clvmVolume.getPath()).thenReturn("clvm-vol-path");
+
+        VolumeVO nfsVolume = Mockito.mock(VolumeVO.class);
+        Mockito.when(nfsVolume.getPoolId()).thenReturn(nfsPoolId);
+
+        StoragePoolVO clvmPool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(clvmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        StoragePoolVO nfsPool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(nfsPool.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+        Mockito.when(vmInstance.getInstanceName()).thenReturn(MOCK_VM_NAME);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(101L), Mockito.anyString(),
+                Mockito.anyString(), Mockito.any(), Mockito.eq(true))).thenReturn(currentHostId);
+        Mockito.when(clvmPoolManager.transferClvmVolumeLock(Mockito.anyString(), Mockito.anyLong(),
+            Mockito.anyString(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong())).thenReturn(true);
+
+        Mockito.when(storagePoolDao.findById(clvmPoolId)).thenReturn(clvmPool);
+        Mockito.when(storagePoolDao.findById(nfsPoolId)).thenReturn(nfsPool);
+
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+        setField(volumeOrchestrator, "_storagePoolDao", storagePoolDao);
+
+        Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        method.invoke(volumeOrchestrator, List.of(clvmVolume, nfsVolume), destHostId, vmInstance);
+
+        Mockito.verify(clvmPoolManager, Mockito.times(1)).transferClvmVolumeLock(
+            Mockito.eq("clvm-vol-uuid"), Mockito.eq(101L), Mockito.eq("clvm-vol-path"),
+            Mockito.eq(clvmPool), Mockito.eq(currentHostId), Mockito.eq(destHostId));
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testTransferClvmLocksForVmStart_TransferFails() throws Throwable {
+        Long destHostId = 2L;
+        Long currentHostId = 1L;
+        Long poolId = 10L;
+
+        VolumeVO clvmVolume = Mockito.mock(VolumeVO.class);
+        Mockito.when(clvmVolume.getId()).thenReturn(101L);
+        Mockito.when(clvmVolume.getPoolId()).thenReturn(poolId);
+        Mockito.when(clvmVolume.getUuid()).thenReturn("vol-uuid");
+        Mockito.when(clvmVolume.getPath()).thenReturn("vol-path");
+
+        StoragePoolVO clvmPool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(clvmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        VMInstanceVO vmInstance = Mockito.mock(VMInstanceVO.class);
+        Mockito.when(vmInstance.getInstanceName()).thenReturn(MOCK_VM_NAME);
+
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(101L), Mockito.anyString(),
+                Mockito.anyString(), Mockito.any(), Mockito.eq(true))).thenReturn(currentHostId);
+        Mockito.when(clvmPoolManager.transferClvmVolumeLock(Mockito.anyString(), Mockito.anyLong(),
+            Mockito.anyString(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong())).thenReturn(false);
+
+        Mockito.when(storagePoolDao.findById(poolId)).thenReturn(clvmPool);
+
+        setField(volumeOrchestrator, "clvmPoolManager", clvmPoolManager);
+        setField(volumeOrchestrator, "_storagePoolDao", storagePoolDao);
+
+        Method method = VolumeOrchestrator.class.getDeclaredMethod(
+            "transferClvmLocksForVmStart", List.class, Long.class, VMInstanceVO.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(volumeOrchestrator, List.of(clvmVolume), destHostId, vmInstance);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    private void setField(Object target, String fieldName, Object value) throws Exception {
+        Field field = findField(target.getClass(), fieldName);
+        if (field == null) {
+            throw new NoSuchFieldException("Field " + fieldName + " not found in " + target.getClass());
+        }
+        field.setAccessible(true);
+        field.set(target, value);
+    }
+
+    private Field findField(Class<?> clazz, String fieldName) {
+        Class<?> current = clazz;
+        while (current != null && current != Object.class) {
+            try {
+                return current.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException e) {
+                current = current.getSuperclass();
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/engine/schema/src/main/java/com/cloud/alert/dao/AlertDaoImpl.java b/engine/schema/src/main/java/com/cloud/alert/dao/AlertDaoImpl.java
index 94d01f472ba..97b7c54f084 100644
--- a/engine/schema/src/main/java/com/cloud/alert/dao/AlertDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/alert/dao/AlertDaoImpl.java
@@ -20,6 +20,7 @@ import java.util.Date;
 import java.util.List;
 
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import com.cloud.alert.AlertVO;
@@ -28,7 +29,7 @@ import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Op;
-import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.db.UpdateBuilder;
 
 @Component
 public class AlertDaoImpl extends GenericDaoBase<AlertVO, Long> implements AlertDao {
@@ -107,25 +108,20 @@ public class AlertDaoImpl extends GenericDaoBase<AlertVO, Long> implements Alert
         }
         sc.setParameters("archived", false);
 
-        boolean result = true;
-        ;
         List<AlertVO> alerts = listBy(sc);
         if (ids != null && alerts.size() < ids.size()) {
-            result = false;
-            return result;
+            return false;
         }
-        if (alerts != null && !alerts.isEmpty()) {
-            TransactionLegacy txn = TransactionLegacy.currentTxn();
-            txn.start();
-            for (AlertVO alert : alerts) {
-                alert = lockRow(alert.getId(), true);
-                alert.setArchived(true);
-                update(alert.getId(), alert);
-                txn.commit();
-            }
-            txn.close();
+
+        if (CollectionUtils.isEmpty(alerts)) {
+            return true;
         }
-        return result;
+
+        AlertVO alertForUpdate = createForUpdate();
+        alertForUpdate.setArchived(true);
+        UpdateBuilder ub = getUpdateBuilder(alertForUpdate);
+        update(ub, sc, null);
+        return true;
     }
 
     @Override
diff --git a/engine/schema/src/main/java/com/cloud/event/dao/EventDaoImpl.java b/engine/schema/src/main/java/com/cloud/event/dao/EventDaoImpl.java
index e748e98900e..9417ddd1259 100644
--- a/engine/schema/src/main/java/com/cloud/event/dao/EventDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/event/dao/EventDaoImpl.java
@@ -18,8 +18,10 @@ package com.cloud.event.dao;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import com.cloud.event.Event.State;
@@ -29,12 +31,13 @@ import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Op;
-import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.db.UpdateBuilder;
 
 @Component
 public class EventDaoImpl extends GenericDaoBase<EventVO, Long> implements EventDao {
     protected final SearchBuilder<EventVO> CompletedEventSearch;
     protected final SearchBuilder<EventVO> ToArchiveOrDeleteEventSearch;
+    protected final SearchBuilder<EventVO> ArchiveByIdsSearch;
 
     public EventDaoImpl() {
         CompletedEventSearch = createSearchBuilder();
@@ -51,6 +54,10 @@ public class EventDaoImpl extends GenericDaoBase<EventVO, Long> implements Event
         ToArchiveOrDeleteEventSearch.and("createdDateL", ToArchiveOrDeleteEventSearch.entity().getCreateDate(), Op.LTEQ);
         ToArchiveOrDeleteEventSearch.and("archived", ToArchiveOrDeleteEventSearch.entity().getArchived(), Op.EQ);
         ToArchiveOrDeleteEventSearch.done();
+
+        ArchiveByIdsSearch = createSearchBuilder();
+        ArchiveByIdsSearch.and("id", ArchiveByIdsSearch.entity().getId(), Op.IN);
+        ArchiveByIdsSearch.done();
     }
 
     @Override
@@ -100,16 +107,16 @@ public class EventDaoImpl extends GenericDaoBase<EventVO, Long> implements Event
 
     @Override
     public void archiveEvents(List<EventVO> events) {
-        if (events != null && !events.isEmpty()) {
-            TransactionLegacy txn = TransactionLegacy.currentTxn();
-            txn.start();
-            for (EventVO event : events) {
-                event = lockRow(event.getId(), true);
-                event.setArchived(true);
-                update(event.getId(), event);
-                txn.commit();
-            }
-            txn.close();
+        if (CollectionUtils.isEmpty(events)) {
+            return;
         }
+
+        List<Long> ids = events.stream().map(EventVO::getId).collect(Collectors.toList());
+        SearchCriteria<EventVO> sc = ArchiveByIdsSearch.create();
+        sc.setParameters("id", ids.toArray(new Object[ids.size()]));
+        EventVO eventForUpdate = createForUpdate();
+        eventForUpdate.setArchived(true);
+        UpdateBuilder ub = getUpdateBuilder(eventForUpdate);
+        update(ub, sc, null);
     }
 }
diff --git a/engine/schema/src/main/java/com/cloud/host/HostVO.java b/engine/schema/src/main/java/com/cloud/host/HostVO.java
index d51b4eca057..468caf1e227 100644
--- a/engine/schema/src/main/java/com/cloud/host/HostVO.java
+++ b/engine/schema/src/main/java/com/cloud/host/HostVO.java
@@ -45,7 +45,7 @@ import javax.persistence.Transient;
 import com.cloud.cpu.CPU;
 import org.apache.cloudstack.util.CPUArchConverter;
 import org.apache.cloudstack.util.HypervisorTypeConverter;
-import org.apache.cloudstack.utils.jsinterpreter.TagAsRuleHelper;
+import org.apache.cloudstack.utils.jsinterpreter.GenericRuleHelper;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.BooleanUtils;
@@ -856,7 +856,8 @@ public class HostVO implements Host {
         }
 
         if (BooleanUtils.isTrue(this.getIsTagARule())) {
-            return TagAsRuleHelper.interpretTagAsRule(this.getHostTags().get(0), serviceOffering.getHostTag(), HostTagsDao.hostTagRuleExecutionTimeout.value());
+            return GenericRuleHelper.interpretTagAsRule(this.getHostTags().get(0), serviceOffering.getHostTag(), HostTagsDao.hostTagRuleExecutionTimeout.value(),
+                    HostTagsDao.hostTagRuleExecutionTimeout.key());
         }
 
         if (StringUtils.isEmpty(serviceOffering.getHostTag())) {
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
index 5f5b2affee0..5c0d04fb2be 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
@@ -32,12 +32,17 @@ import com.cloud.utils.Pair;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.fsm.StateDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.framework.config.ConfigKey;
 
 /**
  * Data Access Object for server
  *
  */
 public interface HostDao extends GenericDao<HostVO, Long>, StateDao<Status, Status.Event, Host> {
+
+    ConfigKey<Long> guestOsRuleExecutionTimeout = new ConfigKey<>("Advanced", Long.class, "guest.os.rule.execution.timeout", "3000", "The maximum runtime, in milliseconds, " +
+            "to execute a guest OS rule; if it is reached, a timeout will happen.", true);
+
     long countBy(long clusterId, ResourceState... states);
 
     Integer countAllByType(final Host.Type type);
@@ -220,6 +225,8 @@ public interface HostDao extends GenericDao<HostVO, Long>, StateDao<Status, Stat
 
     List<HostVO> findHostsWithTagRuleThatMatchComputeOfferingTags(String computeOfferingTags);
 
+    List<HostVO> findHostsWithGuestOsRulesThatDidNotMatchOsOfGuestVm(String templateGuestOSName);
+
     List<Long> findClustersThatMatchHostTagRule(String computeOfferingTags);
 
     List<Long> listSsvmHostsWithPendingMigrateJobsOrderedByJobCount();
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
index 99c9a979c3b..5b8a38b8e5b 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
@@ -37,7 +37,9 @@ import javax.persistence.TableGenerator;
 
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
-import org.apache.cloudstack.utils.jsinterpreter.TagAsRuleHelper;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.utils.jsinterpreter.GenericRuleHelper;
 import org.apache.commons.collections.CollectionUtils;
 
 import com.cloud.agent.api.VgpuTypesInfo;
@@ -84,7 +86,7 @@ import org.apache.commons.lang3.ObjectUtils;
 
 @DB
 @TableGenerator(name = "host_req_sq", table = "op_host", pkColumnName = "id", valueColumnName = "sequence", allocationSize = 1)
-public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao { //FIXME: , ExternalIdDao {
+public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao, Configurable {
 
     private static final String LIST_HOST_IDS_BY_HOST_TAGS = "SELECT filtered.host_id, COUNT(filtered.tag) AS tag_count "
                                                              + "FROM (SELECT host_id, tag, is_tag_a_rule FROM host_tags GROUP BY host_id,tag,is_tag_a_rule) AS filtered "
@@ -644,16 +646,22 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
         sc.setParameters("lastPinged", lastPingSecondsAfter);
         sc.setParameters("status", Status.Disconnected, Status.Down, Status.Alert);
 
-        StringBuilder sb = new StringBuilder();
-        List<HostVO> hosts = lockRows(sc, null, true); // exclusive lock
-        for (HostVO host : hosts) {
-            host.setManagementServerId(null);
-            update(host.getId(), host);
-            sb.append(host.getId());
-            sb.append(" ");
+        // SELECT before bulk UPDATE to preserve per-host-ID trace logging — the bulk UPDATE
+        // cannot return which rows it matched since the WHERE column is being set to NULL
+        if (logger.isTraceEnabled()) {
+            List<HostVO> hosts = listBy(sc);
+            StringBuilder sb = new StringBuilder();
+            for (HostVO host : hosts) {
+                sb.append(host.getId());
+                sb.append(" ");
+            }
+            logger.trace("Following hosts will be reset: {}", sb);
         }
 
-        logger.trace("Following hosts got reset: {}", sb);
+        HostVO host = createForUpdate();
+        host.setManagementServerId(null);
+        UpdateBuilder ub = getUpdateBuilder(host);
+        update(ub, sc, null);
     }
 
     /*
@@ -1520,11 +1528,13 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
         }
     }
 
+    @Override
     public List<HostVO> findHostsWithTagRuleThatMatchComputeOfferingTags(String computeOfferingTags) {
         List<HostTagVO> hostTagVOList = _hostTagsDao.findHostRuleTags();
         List<HostVO> result = new ArrayList<>();
         for (HostTagVO rule: hostTagVOList) {
-            if (TagAsRuleHelper.interpretTagAsRule(rule.getTag(), computeOfferingTags, HostTagsDao.hostTagRuleExecutionTimeout.value())) {
+            if (GenericRuleHelper.interpretTagAsRule(rule.getTag(), computeOfferingTags, HostTagsDao.hostTagRuleExecutionTimeout.value(),
+                    HostTagsDao.hostTagRuleExecutionTimeout.key())) {
                 result.add(findById(rule.getHostId()));
             }
         }
@@ -1532,6 +1542,23 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
         return result;
     }
 
+    @Override
+    public List<HostVO> findHostsWithGuestOsRulesThatDidNotMatchOsOfGuestVm(String templateGuestOSName) {
+        List<DetailVO> hostIdsWithGuestOsRule = _detailsDao.findByName(Host.GUEST_OS_RULE);
+        List<HostVO> hostsWithIncompatibleRules = new ArrayList<>();
+        for (DetailVO guestOsRule : hostIdsWithGuestOsRule) {
+            if (!GenericRuleHelper.interpretGuestOsRule(guestOsRule.getValue(), templateGuestOSName, HostDao.guestOsRuleExecutionTimeout.value(),
+                    HostDao.guestOsRuleExecutionTimeout.key())) {
+                logger.trace("The guest OS rule [{}] of the host with ID [{}] is incompatible with the OS of the VM.",
+                        guestOsRule.getHostId(), guestOsRule.getValue());
+                hostsWithIncompatibleRules.add(findById(guestOsRule.getHostId()));
+            }
+        }
+        logger.trace("The hosts with the following IDs [{}] are incompatible with the VM considering their guest OS rule.",
+                hostsWithIncompatibleRules);
+        return hostsWithIncompatibleRules;
+    }
+
     public List<Long> findClustersThatMatchHostTagRule(String computeOfferingTags) {
         Set<Long> result = new HashSet<>();
         List<HostVO> hosts = findHostsWithTagRuleThatMatchComputeOfferingTags(computeOfferingTags);
@@ -1984,4 +2011,14 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
 
         return customSearch(sc, null);
     }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey<?>[] {guestOsRuleExecutionTimeout};
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return HostDaoImpl.class.getSimpleName();
+    }
 }
diff --git a/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
index 327d12c759a..3180ef30a3c 100644
--- a/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
@@ -116,7 +116,7 @@ public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO
                 //ensure that there is no job in Processing state for the same VM
                 processing = true;
                 if (logger.isTraceEnabled()) {
-                    logger.trace("Security Group work take: found a job in Scheduled and Processing  vmid=" + work.getInstanceId());
+                    logger.trace("Security Group work take: found a job in Scheduled and Processing vmid={}", work.getInstanceId());
                 }
             }
             work.setServerId(serverId);
@@ -141,26 +141,16 @@ public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO
     }
 
     @Override
-    @DB
     public void updateStep(Long vmId, Long logSequenceNumber, Step step) {
-        final TransactionLegacy txn = TransactionLegacy.currentTxn();
-        txn.start();
         SearchCriteria<SecurityGroupWorkVO> sc = VmIdSeqNumSearch.create();
         sc.setParameters("vmId", vmId);
         sc.setParameters("seqno", logSequenceNumber);
 
-        final Filter filter = new Filter(SecurityGroupWorkVO.class, null, true, 0l, 1l);
-
-        final List<SecurityGroupWorkVO> vos = lockRows(sc, filter, true);
-        if (vos.size() == 0) {
-            txn.commit();
-            return;
-        }
-        SecurityGroupWorkVO work = vos.get(0);
-        work.setStep(step);
-        update(work.getId(), work);
-
-        txn.commit();
+        SecurityGroupWorkVO workForUpdate = createForUpdate();
+        workForUpdate.setStep(step);
+        // LIMIT 1 preserves the original single-row semantics: op_nwgrp_work has no
+        // uniqueness on (instance_id, seq_no), so without it duplicate rows would all be updated.
+        update(workForUpdate, sc, 1);
     }
 
     @Override
@@ -172,21 +162,10 @@ public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO
     }
 
     @Override
-    @DB
     public void updateStep(Long workId, Step step) {
-        final TransactionLegacy txn = TransactionLegacy.currentTxn();
-        txn.start();
-
-        SecurityGroupWorkVO work = lockRow(workId, true);
-        if (work == null) {
-            txn.commit();
-            return;
-        }
-        work.setStep(step);
-        update(work.getId(), work);
-
-        txn.commit();
-
+        SecurityGroupWorkVO workForUpdate = createForUpdate();
+        workForUpdate.setStep(step);
+        update(workId, workForUpdate);
     }
 
     @Override
diff --git a/engine/schema/src/main/java/com/cloud/vm/VmIsoMapVO.java b/engine/schema/src/main/java/com/cloud/vm/VmIsoMapVO.java
new file mode 100644
index 00000000000..f4a3f116818
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/vm/VmIsoMapVO.java
@@ -0,0 +1,83 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.vm;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.apache.cloudstack.api.InternalIdentity;
+
+@Entity
+@Table(name = "vm_iso_map")
+public class VmIsoMapVO implements InternalIdentity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "vm_id")
+    private long vmId;
+
+    @Column(name = "iso_id")
+    private long isoId;
+
+    @Column(name = "device_seq")
+    private int deviceSeq;
+
+    @Column(name = "created")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date created;
+
+    public VmIsoMapVO() {
+    }
+
+    public VmIsoMapVO(long vmId, long isoId, int deviceSeq) {
+        this.vmId = vmId;
+        this.isoId = isoId;
+        this.deviceSeq = deviceSeq;
+        this.created = new Date();
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    public long getVmId() {
+        return vmId;
+    }
+
+    public long getIsoId() {
+        return isoId;
+    }
+
+    public int getDeviceSeq() {
+        return deviceSeq;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+}
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpVO.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpVO.java
index 4c8208b4be8..baa331d81f6 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpVO.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/NicSecondaryIpVO.java
@@ -43,7 +43,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp {
         this.networkId = networkId;
     }
 
-    public NicSecondaryIpVO(long nicId, String ip4Address, String ip6Address, long vmId, long accountId, long domainId, long networkId) {
+    public NicSecondaryIpVO(long nicId, String ip4Address, String ip6Address, long vmId, long accountId, long domainId, long networkId, String description) {
         this.nicId = nicId;
         this.vmId = vmId;
         this.ip4Address = ip4Address;
@@ -51,6 +51,7 @@ public class NicSecondaryIpVO implements NicSecondaryIp {
         this.accountId = accountId;
         this.domainId = domainId;
         this.networkId = networkId;
+        this.description = description;
     }
 
     protected NicSecondaryIpVO() {
@@ -88,6 +89,18 @@ public class NicSecondaryIpVO implements NicSecondaryIp {
     @Column(name = "vmId")
     long vmId;
 
+    @Column(name = "description")
+    String description;
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     @Override
     public String toString() {
         return String.format("NicSecondaryIp %s",
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDao.java
new file mode 100644
index 00000000000..a472a3b4dec
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDao.java
@@ -0,0 +1,34 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.vm.dao;
+
+import java.util.List;
+
+import com.cloud.utils.db.GenericDao;
+import com.cloud.vm.VmIsoMapVO;
+
+public interface VmIsoMapDao extends GenericDao<VmIsoMapVO, Long> {
+    List<VmIsoMapVO> listByVmId(long vmId);
+
+    List<VmIsoMapVO> listByIsoId(long isoId);
+
+    VmIsoMapVO findByVmIdDeviceSeq(long vmId, int deviceSeq);
+
+    VmIsoMapVO findByVmIdIsoId(long vmId, long isoId);
+
+    int removeByVmId(long vmId);
+}
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDaoImpl.java
new file mode 100644
index 00000000000..44749eea75f
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VmIsoMapDaoImpl.java
@@ -0,0 +1,92 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.vm.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.vm.VmIsoMapVO;
+
+@Component
+public class VmIsoMapDaoImpl extends GenericDaoBase<VmIsoMapVO, Long> implements VmIsoMapDao {
+
+    private SearchBuilder<VmIsoMapVO> ListByVmId;
+    private SearchBuilder<VmIsoMapVO> ListByIsoId;
+    private SearchBuilder<VmIsoMapVO> ByVmIdDeviceSeq;
+    private SearchBuilder<VmIsoMapVO> ByVmIdIsoId;
+
+    protected VmIsoMapDaoImpl() {
+        ListByVmId = createSearchBuilder();
+        ListByVmId.and("vmId", ListByVmId.entity().getVmId(), SearchCriteria.Op.EQ);
+        ListByVmId.done();
+
+        ListByIsoId = createSearchBuilder();
+        ListByIsoId.and("isoId", ListByIsoId.entity().getIsoId(), SearchCriteria.Op.EQ);
+        ListByIsoId.done();
+
+        ByVmIdDeviceSeq = createSearchBuilder();
+        ByVmIdDeviceSeq.and("vmId", ByVmIdDeviceSeq.entity().getVmId(), SearchCriteria.Op.EQ);
+        ByVmIdDeviceSeq.and("deviceSeq", ByVmIdDeviceSeq.entity().getDeviceSeq(), SearchCriteria.Op.EQ);
+        ByVmIdDeviceSeq.done();
+
+        ByVmIdIsoId = createSearchBuilder();
+        ByVmIdIsoId.and("vmId", ByVmIdIsoId.entity().getVmId(), SearchCriteria.Op.EQ);
+        ByVmIdIsoId.and("isoId", ByVmIdIsoId.entity().getIsoId(), SearchCriteria.Op.EQ);
+        ByVmIdIsoId.done();
+    }
+
+    @Override
+    public List<VmIsoMapVO> listByVmId(long vmId) {
+        SearchCriteria<VmIsoMapVO> sc = ListByVmId.create();
+        sc.setParameters("vmId", vmId);
+        return listBy(sc);
+    }
+
+    @Override
+    public List<VmIsoMapVO> listByIsoId(long isoId) {
+        SearchCriteria<VmIsoMapVO> sc = ListByIsoId.create();
+        sc.setParameters("isoId", isoId);
+        return listBy(sc);
+    }
+
+    @Override
+    public VmIsoMapVO findByVmIdDeviceSeq(long vmId, int deviceSeq) {
+        SearchCriteria<VmIsoMapVO> sc = ByVmIdDeviceSeq.create();
+        sc.setParameters("vmId", vmId);
+        sc.setParameters("deviceSeq", deviceSeq);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public VmIsoMapVO findByVmIdIsoId(long vmId, long isoId) {
+        SearchCriteria<VmIsoMapVO> sc = ByVmIdIsoId.create();
+        sc.setParameters("vmId", vmId);
+        sc.setParameters("isoId", isoId);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public int removeByVmId(long vmId) {
+        SearchCriteria<VmIsoMapVO> sc = ListByVmId.create();
+        sc.setParameters("vmId", vmId);
+        return remove(sc);
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/acl/ApiKeyPairVO.java b/engine/schema/src/main/java/org/apache/cloudstack/acl/ApiKeyPairVO.java
index eb38b08f615..7a6bd7a3b14 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/acl/ApiKeyPairVO.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/acl/ApiKeyPairVO.java
@@ -70,7 +70,7 @@ public class ApiKeyPairVO implements ApiKeyPair {
     @Temporal(value = TemporalType.TIMESTAMP)
     private Date created = Date.from(Instant.now());
 
-    @Column(name = "description")
+    @Column(name = "description", length = 1024)
     private String description = "";
 
     @Column(name = "api_key", nullable = false)
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleDetailVO.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleDetailVO.java
new file mode 100644
index 00000000000..16985e6bac3
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleDetailVO.java
@@ -0,0 +1,82 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.schedule;
+
+import org.apache.cloudstack.api.ResourceDetail;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "resource_schedule_details")
+public class ResourceScheduleDetailVO implements ResourceDetail {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "schedule_id")
+    private long resourceId;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "value", length = 1024)
+    private String value;
+
+    @Column(name = "display")
+    private boolean display = true;
+
+    public ResourceScheduleDetailVO() {
+    }
+
+    public ResourceScheduleDetailVO(long scheduleId, String name, String value, boolean display) {
+        this.resourceId = scheduleId;
+        this.name = name;
+        this.value = value;
+        this.display = display;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public long getResourceId() {
+        return resourceId;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean isDisplay() {
+        return display;
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleVO.java
similarity index 71%
rename from engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleVO.java
rename to engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleVO.java
index e0065db1e77..33a09d79239 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleVO.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleVO.java
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.vm.schedule;
+package org.apache.cloudstack.schedule;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import javax.persistence.Column;
@@ -37,8 +38,8 @@ import java.util.TimeZone;
 import java.util.UUID;
 
 @Entity
-@Table(name = "vm_schedule")
-public class VMScheduleVO implements VMSchedule {
+@Table(name = "resource_schedule")
+public class ResourceScheduleVO implements ResourceSchedule {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
@@ -50,8 +51,12 @@ public class VMScheduleVO implements VMSchedule {
     @Column(name = "description")
     String description;
 
-    @Column(name = "vm_id", nullable = false)
-    long vmId;
+    @Enumerated(value = EnumType.STRING)
+    @Column(name = "resource_type", nullable = false)
+    ApiCommandResourceType resourceType;
+
+    @Column(name = "resource_id", nullable = false)
+    long resourceId;
 
     @Column(name = "schedule", nullable = false)
     String schedule;
@@ -60,8 +65,7 @@ public class VMScheduleVO implements VMSchedule {
     String timeZone;
 
     @Column(name = "action", nullable = false)
-    @Enumerated(value = EnumType.STRING)
-    Action action;
+    String actionName;
 
     @Column(name = "enabled", nullable = false)
     boolean enabled;
@@ -80,17 +84,19 @@ public class VMScheduleVO implements VMSchedule {
     @Column(name = GenericDao.REMOVED_COLUMN)
     Date removed;
 
-    public VMScheduleVO() {
+    public ResourceScheduleVO() {
         uuid = UUID.randomUUID().toString();
     }
 
-    public VMScheduleVO(long vmId, String description, String schedule, String timeZone, Action action, Date startDate, Date endDate, boolean enabled) {
+    public ResourceScheduleVO(ApiCommandResourceType resourceType, long resourceId, String description, String schedule,
+                              String timeZone, String action, Date startDate, Date endDate, boolean enabled) {
         uuid = UUID.randomUUID().toString();
-        this.vmId = vmId;
+        this.resourceType = resourceType;
+        this.resourceId = resourceId;
         this.description = description;
         this.schedule = schedule;
         this.timeZone = timeZone;
-        this.action = action;
+        this.actionName = action;
         this.startDate = startDate;
         this.endDate = endDate;
         this.enabled = enabled;
@@ -98,7 +104,8 @@ public class VMScheduleVO implements VMSchedule {
 
     @Override
     public String toString() {
-        return String.format("VMSchedule %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "uuid", "action", "description"));
+        return String.format("ResourceSchedule %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                this, "id", "uuid", "resourceType", "actionName", "description", "enabled"));
     }
 
     @Override
@@ -111,14 +118,25 @@ public class VMScheduleVO implements VMSchedule {
         return id;
     }
 
-    public long getVmId() {
-        return vmId;
+    @Override
+    public ApiCommandResourceType getResourceType() {
+        return resourceType;
     }
 
-    public void setVmId(long vmId) {
-        this.vmId = vmId;
+    public void setResourceType(ApiCommandResourceType resourceType) {
+        this.resourceType = resourceType;
     }
 
+    @Override
+    public long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    @Override
     public String getDescription() {
         return description;
     }
@@ -127,6 +145,7 @@ public class VMScheduleVO implements VMSchedule {
         this.description = description;
     }
 
+    @Override
     public String getSchedule() {
         return schedule.substring(2);
     }
@@ -144,14 +163,16 @@ public class VMScheduleVO implements VMSchedule {
         this.timeZone = timeZone;
     }
 
-    public Action getAction() {
-        return action;
+    @Override
+    public String getActionName() {
+        return actionName;
     }
 
-    public void setAction(Action action) {
-        this.action = action;
+    public void setActionName(String action) {
+        this.actionName = action;
     }
 
+    @Override
     public boolean getEnabled() {
         return enabled;
     }
@@ -183,6 +204,7 @@ public class VMScheduleVO implements VMSchedule {
         return TimeZone.getTimeZone(getTimeZone()).toZoneId();
     }
 
+    @Override
     public Date getCreated() {
         return created;
     }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJobVO.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduledJobVO.java
similarity index 64%
rename from engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJobVO.java
rename to engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduledJobVO.java
index 775e9cfe40c..ca03056b67a 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJobVO.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/ResourceScheduledJobVO.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.vm.schedule;
+package org.apache.cloudstack.schedule;
 
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import javax.persistence.Column;
@@ -34,8 +35,8 @@ import java.util.Date;
 import java.util.UUID;
 
 @Entity
-@Table(name = "vm_scheduled_job")
-public class VMScheduledJobVO implements VMScheduledJob {
+@Table(name = "resource_scheduled_job")
+public class ResourceScheduledJobVO implements ResourceScheduledJob {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
@@ -44,41 +45,44 @@ public class VMScheduledJobVO implements VMScheduledJob {
     @Column(name = "uuid", nullable = false)
     String uuid;
 
-    @Column(name = "vm_id", nullable = false)
-    long vmId;
+    @Enumerated(value = EnumType.STRING)
+    @Column(name = "resource_type", nullable = false)
+    ApiCommandResourceType resourceType;
 
-    @Column(name = "vm_schedule_id", nullable = false)
-    long vmScheduleId;
+    @Column(name = "resource_id", nullable = false)
+    long resourceId;
+
+    @Column(name = "schedule_id", nullable = false)
+    long scheduleId;
 
     @Column(name = "async_job_id")
     Long asyncJobId;
 
     @Column(name = "action", nullable = false)
-    @Enumerated(value = EnumType.STRING)
-    VMSchedule.Action action;
+    String actionName;
 
     @Column(name = "scheduled_timestamp")
     @Temporal(value = TemporalType.TIMESTAMP)
     Date scheduledTime;
 
-    public VMScheduledJobVO() {
+    public ResourceScheduledJobVO() {
         uuid = UUID.randomUUID().toString();
     }
 
-    public VMScheduledJobVO(long vmId, long vmScheduleId, VMSchedule.Action action, Date scheduledTime) {
+    public ResourceScheduledJobVO(ApiCommandResourceType resourceType, long resourceId, long scheduleId, String action, Date scheduledTime) {
         uuid = UUID.randomUUID().toString();
-        this.vmId = vmId;
-        this.vmScheduleId = vmScheduleId;
-        this.action = action;
+        this.resourceType = resourceType;
+        this.resourceId = resourceId;
+        this.scheduleId = scheduleId;
+        this.actionName = action;
         this.scheduledTime = scheduledTime;
     }
 
-
     @Override
     public String toString() {
-        return String.format("VMScheduledJob %s",
+        return String.format("ResourceScheduledJob %s",
                 ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
-                        this, "id", "uuid", "action", "vmScheduleId", "vmId", "asyncJobId"));
+                        this, "id", "uuid", "resourceType", "actionName", "scheduleId", "resourceId", "asyncJobId"));
     }
 
     @Override
@@ -92,13 +96,18 @@ public class VMScheduledJobVO implements VMScheduledJob {
     }
 
     @Override
-    public long getVmId() {
-        return vmId;
+    public ApiCommandResourceType getResourceType() {
+        return resourceType;
     }
 
     @Override
-    public long getVmScheduleId() {
-        return vmScheduleId;
+    public long getResourceId() {
+        return resourceId;
+    }
+
+    @Override
+    public long getScheduleId() {
+        return scheduleId;
     }
 
     @Override
@@ -112,8 +121,12 @@ public class VMScheduledJobVO implements VMScheduledJob {
     }
 
     @Override
-    public VMSchedule.Action getAction() {
-        return action;
+    public String getActionName() {
+        return actionName;
+    }
+
+    public void setActionName(String action) {
+        this.actionName = action;
     }
 
     @Override
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDao.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDao.java
new file mode 100644
index 00000000000..ee56991fb9a
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDao.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule.dao;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.GenericDao;
+import com.cloud.utils.db.SearchCriteria;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.schedule.ResourceScheduleVO;
+
+import java.util.List;
+
+public interface ResourceScheduleDao extends GenericDao<ResourceScheduleVO, Long> {
+    List<ResourceScheduleVO> listAllActiveSchedules(ApiCommandResourceType resourceType);
+
+    long removeSchedulesForResourceAndIds(ApiCommandResourceType resourceType, long resourceId, List<Long> ids);
+
+    long removeAllSchedulesForResource(ApiCommandResourceType resourceType, long resourceId);
+
+    Pair<List<ResourceScheduleVO>, Integer> searchAndCount(List<Long> ids, ApiCommandResourceType resourceType, Long resourceId,
+                                                           String action, Boolean enabled, Long offset, Long limit);
+
+    SearchCriteria<ResourceScheduleVO> getSearchCriteriaForResource(ApiCommandResourceType resourceType, long resourceId);
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDaoImpl.java
new file mode 100644
index 00000000000..7217d1359a8
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDaoImpl.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule.dao;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.schedule.ResourceScheduleVO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class ResourceScheduleDaoImpl extends GenericDaoBase<ResourceScheduleVO, Long> implements ResourceScheduleDao {
+
+    private final SearchBuilder<ResourceScheduleVO> activeScheduleSearch;
+    private final SearchBuilder<ResourceScheduleVO> allSearch;
+
+    static final String RESOURCE_TYPE = "resourceType";
+    static final String RESOURCE_ID = "resourceId";
+
+    public ResourceScheduleDaoImpl() {
+        super();
+
+        activeScheduleSearch = createSearchBuilder();
+        activeScheduleSearch.and(RESOURCE_TYPE, activeScheduleSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
+        activeScheduleSearch.and(ApiConstants.ENABLED, activeScheduleSearch.entity().getEnabled(), SearchCriteria.Op.EQ);
+        activeScheduleSearch.done();
+
+        allSearch = createSearchBuilder();
+        allSearch.and(ApiConstants.ID, allSearch.entity().getId(), SearchCriteria.Op.IN);
+        allSearch.and(RESOURCE_TYPE, allSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
+        allSearch.and(RESOURCE_ID, allSearch.entity().getResourceId(), SearchCriteria.Op.EQ);
+        allSearch.and(ApiConstants.ACTION, allSearch.entity().getActionName(), SearchCriteria.Op.EQ);
+        allSearch.and(ApiConstants.ENABLED, allSearch.entity().getEnabled(), SearchCriteria.Op.EQ);
+        allSearch.done();
+    }
+
+    @Override
+    public List<ResourceScheduleVO> listAllActiveSchedules(ApiCommandResourceType resourceType) {
+        SearchCriteria<ResourceScheduleVO> sc = activeScheduleSearch.create();
+        sc.setParameters(RESOURCE_TYPE, resourceType);
+        sc.setParameters(ApiConstants.ENABLED, true);
+        return search(sc, null);
+    }
+
+    @Override
+    public long removeSchedulesForResourceAndIds(ApiCommandResourceType resourceType, long resourceId, List<Long> ids) {
+        SearchCriteria<ResourceScheduleVO> sc = allSearch.create();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            sc.setParameters(ApiConstants.ID, ids.toArray());
+        }
+        sc.setParameters(RESOURCE_TYPE, resourceType);
+        sc.setParameters(RESOURCE_ID, resourceId);
+        return remove(sc);
+    }
+
+    @Override
+    public long removeAllSchedulesForResource(ApiCommandResourceType resourceType, long resourceId) {
+        SearchCriteria<ResourceScheduleVO> sc = allSearch.create();
+        sc.setParameters(RESOURCE_TYPE, resourceType);
+        sc.setParameters(RESOURCE_ID, resourceId);
+        return remove(sc);
+    }
+
+    @Override
+    public Pair<List<ResourceScheduleVO>, Integer> searchAndCount(List<Long> ids, ApiCommandResourceType resourceType, Long resourceId,
+                                                                  String action, Boolean enabled, Long offset, Long limit) {
+        SearchCriteria<ResourceScheduleVO> sc = allSearch.create();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            sc.setParameters(ApiConstants.ID, ids.toArray());
+        }
+        sc.setParametersIfNotNull(ApiConstants.ENABLED, enabled);
+        sc.setParametersIfNotNull(ApiConstants.ACTION, action);
+        sc.setParametersIfNotNull(RESOURCE_TYPE, resourceType);
+        sc.setParametersIfNotNull(RESOURCE_ID, resourceId);
+        Filter filter = new Filter(ResourceScheduleVO.class, ApiConstants.ID, false, offset, limit);
+        return searchAndCount(sc, filter);
+    }
+
+    @Override
+    public SearchCriteria<ResourceScheduleVO> getSearchCriteriaForResource(ApiCommandResourceType resourceType, long resourceId) {
+        SearchCriteria<ResourceScheduleVO> sc = allSearch.create();
+        sc.setParameters(RESOURCE_TYPE, resourceType);
+        sc.setParameters(RESOURCE_ID, resourceId);
+        return sc;
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDetailsDao.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDetailsDao.java
new file mode 100644
index 00000000000..f36ce8d0879
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDetailsDao.java
@@ -0,0 +1,24 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.schedule.dao;
+
+import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
+import org.apache.cloudstack.schedule.ResourceScheduleDetailVO;
+
+public interface ResourceScheduleDetailsDao extends GenericDao<ResourceScheduleDetailVO, Long>, ResourceDetailsDao<ResourceScheduleDetailVO> {
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDetailsDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDetailsDaoImpl.java
new file mode 100644
index 00000000000..3757e41d0cf
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduleDetailsDaoImpl.java
@@ -0,0 +1,28 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.schedule.dao;
+
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+import org.apache.cloudstack.schedule.ResourceScheduleDetailVO;
+
+public class ResourceScheduleDetailsDaoImpl extends ResourceDetailsDaoBase<ResourceScheduleDetailVO> implements ResourceScheduleDetailsDao {
+
+    @Override
+    public void addDetail(long resourceId, String key, String value, boolean display) {
+        super.addDetail(new ResourceScheduleDetailVO(resourceId, key, value, display));
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDao.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduledJobDao.java
similarity index 57%
rename from engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDao.java
rename to engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduledJobDao.java
index b8c808b5bfc..16210802235 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDao.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduledJobDao.java
@@ -16,22 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.vm.schedule.dao;
+package org.apache.cloudstack.schedule.dao;
 
-import com.cloud.utils.Pair;
 import com.cloud.utils.db.GenericDao;
-import com.cloud.utils.db.SearchCriteria;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
-import org.apache.cloudstack.vm.schedule.VMScheduleVO;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.schedule.ResourceScheduledJobVO;
 
+import java.util.Date;
 import java.util.List;
 
-public interface VMScheduleDao extends GenericDao<VMScheduleVO, Long> {
-    List<VMScheduleVO> listAllActiveSchedules();
+public interface ResourceScheduledJobDao extends GenericDao<ResourceScheduledJobVO, Long> {
+    List<ResourceScheduledJobVO> listJobsToStart(ApiCommandResourceType resourceType, Date currentTimestamp);
 
-    long removeSchedulesForVmIdAndIds(Long vmId, List<Long> ids);
+    int expungeJobsForSchedules(List<Long> scheduleIds, Date dateAfter);
 
-    Pair<List<VMScheduleVO>, Integer> searchAndCount(Long id, Long vmId, VMSchedule.Action action, Boolean enabled, Long offset, Long limit);
+    int expungeJobsBefore(ApiCommandResourceType resourceType, Date currentTimestamp);
 
-    SearchCriteria<VMScheduleVO> getSearchCriteriaForVMId(Long vmId);
+    ResourceScheduledJobVO findByScheduleAndTimestamp(long scheduleId, Date scheduledTimestamp);
 }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduledJobDaoImpl.java
similarity index 55%
rename from engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDaoImpl.java
rename to engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduledJobDaoImpl.java
index 2f08a41b92e..02c1acb6c71 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduledJobDaoImpl.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/schedule/dao/ResourceScheduledJobDaoImpl.java
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.vm.schedule.dao;
+package org.apache.cloudstack.schedule.dao;
 
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
-import org.apache.cloudstack.vm.schedule.VMScheduledJobVO;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.schedule.ResourceScheduledJobVO;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.stereotype.Component;
 
@@ -31,62 +32,59 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class VMScheduledJobDaoImpl extends GenericDaoBase<VMScheduledJobVO, Long> implements VMScheduledJobDao {
+public class ResourceScheduledJobDaoImpl extends GenericDaoBase<ResourceScheduledJobVO, Long> implements ResourceScheduledJobDao {
 
-    private final SearchBuilder<VMScheduledJobVO> jobsToStartSearch;
+    private final SearchBuilder<ResourceScheduledJobVO> jobsToStartSearch;
+    private final SearchBuilder<ResourceScheduledJobVO> expungeJobsBeforeSearch;
+    private final SearchBuilder<ResourceScheduledJobVO> expungeJobForScheduleSearch;
+    private final SearchBuilder<ResourceScheduledJobVO> scheduleAndTimestampSearch;
 
-    private final SearchBuilder<VMScheduledJobVO> expungeJobsBeforeSearch;
+    static final String SCHEDULED_TIMESTAMP = "scheduledTimestamp";
+    static final String SCHEDULE_ID = "scheduleId";
+    static final String RESOURCE_TYPE = "resourceType";
 
-    private final SearchBuilder<VMScheduledJobVO> expungeJobForScheduleSearch;
-
-    private final SearchBuilder<VMScheduledJobVO> scheduleAndTimestampSearch;
-
-    static final String SCHEDULED_TIMESTAMP = "scheduled_timestamp";
-
-    static final String VM_SCHEDULE_ID = "vm_schedule_id";
-
-    public VMScheduledJobDaoImpl() {
+    public ResourceScheduledJobDaoImpl() {
         super();
+
         jobsToStartSearch = createSearchBuilder();
+        jobsToStartSearch.and(RESOURCE_TYPE, jobsToStartSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
         jobsToStartSearch.and(SCHEDULED_TIMESTAMP, jobsToStartSearch.entity().getScheduledTime(), SearchCriteria.Op.EQ);
         jobsToStartSearch.and("async_job_id", jobsToStartSearch.entity().getAsyncJobId(), SearchCriteria.Op.NULL);
         jobsToStartSearch.done();
 
         expungeJobsBeforeSearch = createSearchBuilder();
+        expungeJobsBeforeSearch.and(RESOURCE_TYPE, expungeJobsBeforeSearch.entity().getResourceType(), SearchCriteria.Op.EQ);
         expungeJobsBeforeSearch.and(SCHEDULED_TIMESTAMP, expungeJobsBeforeSearch.entity().getScheduledTime(), SearchCriteria.Op.LT);
         expungeJobsBeforeSearch.done();
 
         expungeJobForScheduleSearch = createSearchBuilder();
-        expungeJobForScheduleSearch.and(VM_SCHEDULE_ID, expungeJobForScheduleSearch.entity().getVmScheduleId(), SearchCriteria.Op.IN);
+        expungeJobForScheduleSearch.and(SCHEDULE_ID, expungeJobForScheduleSearch.entity().getScheduleId(), SearchCriteria.Op.IN);
         expungeJobForScheduleSearch.and(SCHEDULED_TIMESTAMP, expungeJobForScheduleSearch.entity().getScheduledTime(), SearchCriteria.Op.GTEQ);
         expungeJobForScheduleSearch.done();
 
         scheduleAndTimestampSearch = createSearchBuilder();
-        scheduleAndTimestampSearch.and(VM_SCHEDULE_ID, scheduleAndTimestampSearch.entity().getVmScheduleId(), SearchCriteria.Op.EQ);
+        scheduleAndTimestampSearch.and(SCHEDULE_ID, scheduleAndTimestampSearch.entity().getScheduleId(), SearchCriteria.Op.EQ);
         scheduleAndTimestampSearch.and(SCHEDULED_TIMESTAMP, scheduleAndTimestampSearch.entity().getScheduledTime(), SearchCriteria.Op.EQ);
         scheduleAndTimestampSearch.done();
     }
 
-    /**
-     * Execution of job wouldn't be at exact seconds. So, we round off and then execute.
-     */
     @Override
-    public List<VMScheduledJobVO> listJobsToStart(Date currentTimestamp) {
+    public List<ResourceScheduledJobVO> listJobsToStart(ApiCommandResourceType resourceType, Date currentTimestamp) {
         if (currentTimestamp == null) {
             currentTimestamp = new Date();
         }
         Date truncatedTs = DateUtils.round(currentTimestamp, Calendar.MINUTE);
-
-        SearchCriteria<VMScheduledJobVO> sc = jobsToStartSearch.create();
+        SearchCriteria<ResourceScheduledJobVO> sc = jobsToStartSearch.create();
+        sc.setParameters(RESOURCE_TYPE, resourceType);
         sc.setParameters(SCHEDULED_TIMESTAMP, truncatedTs);
-        Filter filter = new Filter(VMScheduledJobVO.class, "vmScheduleId", true, null, null);
+        Filter filter = new Filter(ResourceScheduledJobVO.class, "scheduleId", true, null, null);
         return search(sc, filter);
     }
 
     @Override
-    public int expungeJobsForSchedules(List<Long> vmScheduleIds, Date dateAfter) {
-        SearchCriteria<VMScheduledJobVO> sc = expungeJobForScheduleSearch.create();
-        sc.setParameters(VM_SCHEDULE_ID, vmScheduleIds.toArray());
+    public int expungeJobsForSchedules(List<Long> scheduleIds, Date dateAfter) {
+        SearchCriteria<ResourceScheduledJobVO> sc = expungeJobForScheduleSearch.create();
+        sc.setParameters(SCHEDULE_ID, scheduleIds.toArray());
         if (dateAfter != null) {
             sc.setParameters(SCHEDULED_TIMESTAMP, dateAfter);
         }
@@ -94,16 +92,17 @@ public class VMScheduledJobDaoImpl extends GenericDaoBase<VMScheduledJobVO, Long
     }
 
     @Override
-    public int expungeJobsBefore(Date date) {
-        SearchCriteria<VMScheduledJobVO> sc = expungeJobsBeforeSearch.create();
+    public int expungeJobsBefore(ApiCommandResourceType resourceType, Date date) {
+        SearchCriteria<ResourceScheduledJobVO> sc = expungeJobsBeforeSearch.create();
+        sc.setParameters(RESOURCE_TYPE, resourceType);
         sc.setParameters(SCHEDULED_TIMESTAMP, date);
         return expunge(sc);
     }
 
     @Override
-    public VMScheduledJobVO findByScheduleAndTimestamp(long scheduleId, Date scheduledTimestamp) {
-        SearchCriteria<VMScheduledJobVO> sc = scheduleAndTimestampSearch.create();
-        sc.setParameters(VM_SCHEDULE_ID, scheduleId);
+    public ResourceScheduledJobVO findByScheduleAndTimestamp(long scheduleId, Date scheduledTimestamp) {
+        SearchCriteria<ResourceScheduledJobVO> sc = scheduleAndTimestampSearch.create();
+        sc.setParameters(SCHEDULE_ID, scheduleId);
         sc.setParameters(SCHEDULED_TIMESTAMP, scheduledTimestamp);
         return findOneBy(sc);
     }
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDaoImpl.java
deleted file mode 100644
index db8c0c3068f..00000000000
--- a/engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/dao/VMScheduleDaoImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.vm.schedule.dao;
-
-import com.cloud.utils.Pair;
-import com.cloud.utils.db.Filter;
-import com.cloud.utils.db.GenericDaoBase;
-import com.cloud.utils.db.SearchBuilder;
-import com.cloud.utils.db.SearchCriteria;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.vm.schedule.VMSchedule;
-import org.apache.cloudstack.vm.schedule.VMScheduleVO;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class VMScheduleDaoImpl extends GenericDaoBase<VMScheduleVO, Long> implements VMScheduleDao {
-
-    private final SearchBuilder<VMScheduleVO> activeScheduleSearch;
-
-    private final SearchBuilder<VMScheduleVO> scheduleSearchByVmIdAndIds;
-
-    private final SearchBuilder<VMScheduleVO> scheduleSearch;
-
-    public VMScheduleDaoImpl() {
-        super();
-        activeScheduleSearch = createSearchBuilder();
-        activeScheduleSearch.and(ApiConstants.ENABLED, activeScheduleSearch.entity().getEnabled(), SearchCriteria.Op.EQ);
-        activeScheduleSearch.and().op(activeScheduleSearch.entity().getEndDate(), SearchCriteria.Op.NULL);
-        activeScheduleSearch.or(ApiConstants.END_DATE, activeScheduleSearch.entity().getEndDate(), SearchCriteria.Op.GT);
-        activeScheduleSearch.cp();
-        activeScheduleSearch.done();
-
-        scheduleSearchByVmIdAndIds = createSearchBuilder();
-        scheduleSearchByVmIdAndIds.and(ApiConstants.ID, scheduleSearchByVmIdAndIds.entity().getId(), SearchCriteria.Op.IN);
-        scheduleSearchByVmIdAndIds.and(ApiConstants.VIRTUAL_MACHINE_ID, scheduleSearchByVmIdAndIds.entity().getVmId(), SearchCriteria.Op.EQ);
-        scheduleSearchByVmIdAndIds.done();
-
-        scheduleSearch = createSearchBuilder();
-        scheduleSearch.and(ApiConstants.ID, scheduleSearch.entity().getId(), SearchCriteria.Op.EQ);
-        scheduleSearch.and(ApiConstants.VIRTUAL_MACHINE_ID, scheduleSearch.entity().getVmId(), SearchCriteria.Op.EQ);
-        scheduleSearch.and(ApiConstants.ACTION, scheduleSearch.entity().getAction(), SearchCriteria.Op.EQ);
-        scheduleSearch.and(ApiConstants.ENABLED, scheduleSearch.entity().getEnabled(), SearchCriteria.Op.EQ);
-        scheduleSearch.done();
-
-    }
-
-    @Override
-    public List<VMScheduleVO> listAllActiveSchedules() {
-        // WHERE enabled = true AND (end_date IS NULL OR end_date > current_date)
-        SearchCriteria<VMScheduleVO> sc = activeScheduleSearch.create();
-        sc.setParameters(ApiConstants.ENABLED, true);
-        sc.setParameters(ApiConstants.END_DATE, new Date());
-        return search(sc, null);
-    }
-
-    @Override
-    public long removeSchedulesForVmIdAndIds(Long vmId, List<Long> ids) {
-        SearchCriteria<VMScheduleVO> sc = scheduleSearchByVmIdAndIds.create();
-        sc.setParameters(ApiConstants.ID, ids.toArray());
-        sc.setParameters(ApiConstants.VIRTUAL_MACHINE_ID, vmId);
-        return remove(sc);
-    }
-
-    @Override
-    public Pair<List<VMScheduleVO>, Integer> searchAndCount(Long id, Long vmId, VMSchedule.Action action, Boolean enabled, Long offset, Long limit) {
-        SearchCriteria<VMScheduleVO> sc = scheduleSearch.create();
-
-        if (id != null) {
-            sc.setParameters(ApiConstants.ID, id);
-        }
-        if (enabled != null) {
-            sc.setParameters(ApiConstants.ENABLED, enabled);
-        }
-        if (action != null) {
-            sc.setParameters(ApiConstants.ACTION, action);
-        }
-        sc.setParameters(ApiConstants.VIRTUAL_MACHINE_ID, vmId);
-
-        Filter filter = new Filter(VMScheduleVO.class, ApiConstants.ID, false, offset, limit);
-        return searchAndCount(sc, filter);
-    }
-
-    @Override
-    public SearchCriteria<VMScheduleVO> getSearchCriteriaForVMId(Long vmId) {
-        SearchCriteria<VMScheduleVO> sc = scheduleSearch.create();
-        sc.setParameters(ApiConstants.VIRTUAL_MACHINE_ID, vmId);
-        return sc;
-    }
-}
diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 26181d3fce0..e2fa6530bdf 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -108,6 +108,7 @@
   <bean id="instanceGroupJoinDaoImpl" class="com.cloud.api.query.dao.InstanceGroupJoinDaoImpl" />
   <bean id="managementServerJoinDaoImpl" class="com.cloud.api.query.dao.ManagementServerJoinDaoImpl" />
   <bean id="instanceGroupVMMapDaoImpl" class="com.cloud.vm.dao.InstanceGroupVMMapDaoImpl" />
+  <bean id="vmIsoMapDaoImpl" class="com.cloud.vm.dao.VmIsoMapDaoImpl" />
   <bean id="itWorkDaoImpl" class="com.cloud.vm.ItWorkDaoImpl" />
   <bean id="lBHealthCheckPolicyDaoImpl" class="com.cloud.network.dao.LBHealthCheckPolicyDaoImpl" />
   <bean id="lBStickinessPolicyDaoImpl" class="com.cloud.network.dao.LBStickinessPolicyDaoImpl" />
@@ -284,8 +285,9 @@
   <bean id="secondaryStorageHeuristicDaoImpl" class="org.apache.cloudstack.secstorage.dao.SecondaryStorageHeuristicDaoImpl" />
   <bean id="heuristicRuleHelper" class="org.apache.cloudstack.storage.heuristics.HeuristicRuleHelper" />
   <bean id="publicIpQuarantineDaoImpl" class="com.cloud.network.dao.PublicIpQuarantineDaoImpl" />
-  <bean id="VMScheduleDaoImpl" class="org.apache.cloudstack.vm.schedule.dao.VMScheduleDaoImpl" />
-  <bean id="VMScheduledJobDaoImpl" class="org.apache.cloudstack.vm.schedule.dao.VMScheduledJobDaoImpl" />
+  <bean id="ResourceScheduleDaoImpl" class="org.apache.cloudstack.schedule.dao.ResourceScheduleDaoImpl" />
+  <bean id="ResourceScheduleDetailsDaoImpl" class="org.apache.cloudstack.schedule.dao.ResourceScheduleDetailsDaoImpl" />
+  <bean id="ResourceScheduledJobDaoImpl" class="org.apache.cloudstack.schedule.dao.ResourceScheduledJobDaoImpl" />
   <bean id="VmwareDatacenterDaoImpl" class="com.cloud.hypervisor.vmware.dao.VmwareDatacenterDaoImpl" />
   <bean id="vnfTemplateDetailsDaoImpl" class="com.cloud.storage.dao.VnfTemplateDetailsDaoImpl" />
   <bean id="vnfTemplateNicDaoImpl" class="com.cloud.storage.dao.VnfTemplateNicDaoImpl" />
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql b/engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql
index 2d25b3355d8..69e2d4b484f 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `cloud`.`api_keypair` (
     `user_id` bigint(20) unsigned NOT NULL,
     `start_date` datetime,
     `end_date` datetime,
-    `description` varchar(100),
+    `description` varchar(1024),
     `api_key` varchar(255) NOT NULL,
     `secret_key` varchar(255) NOT NULL,
     `created` datetime NOT NULL,
@@ -107,17 +107,25 @@ WHERE user.api_key IS NOT NULL AND user.secret_key IS NOT NULL;
 -- Drop API keys from user table
 ALTER TABLE `cloud`.`user` DROP COLUMN api_key, DROP COLUMN secret_key;
 
--- Grant access to the "deleteUserKeys" API to the "User", "Domain Admin" and "Resource Admin" roles, similarly to the "registerUserKeys" API
+-- Grant access to the "deleteUserKeys" and "listUserKeyRules" APIs to the "User", "Domain Admin" and "Resource Admin" roles, similarly to the "registerUserKeys" API
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('User', 'deleteUserKeys', 'ALLOW');
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Domain Admin', 'deleteUserKeys', 'ALLOW');
 CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Resource Admin', 'deleteUserKeys', 'ALLOW');
 
+CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('User', 'listUserKeyRules', 'ALLOW');
+CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Domain Admin', 'listUserKeyRules', 'ALLOW');
+CALL `cloud`.`IDEMPOTENT_UPDATE_API_PERMISSION`('Resource Admin', 'listUserKeyRules', 'ALLOW');
+
 -- Add conserve mode for VPC offerings
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','conserve_mode', 'tinyint(1) unsigned NULL DEFAULT 0 COMMENT ''True if the VPC offering is IP conserve mode enabled, allowing public IP services to be used across multiple VPC tiers'' ');
 
 --- Disable/enable NICs
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.nics','enabled', 'TINYINT(1) NOT NULL DEFAULT 1 COMMENT ''Indicates whether the NIC is enabled or not'' ');
 
+--- Add URLs for OAuth provider
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.oauth_provider','authorize_url', 'VARCHAR(255) DEFAULT NULL COMMENT ''Authorize URL for OAuth initialization'' ');
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.oauth_provider','token_url', 'VARCHAR(255) DEFAULT NULL COMMENT ''Token URL for OAuth finalization'' ');
+
 --- Quota tariff/usage mapping
 CREATE TABLE IF NOT EXISTS `cloud_usage`.`quota_tariff_usage` (
     `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
@@ -128,6 +136,20 @@ CREATE TABLE IF NOT EXISTS `cloud_usage`.`quota_tariff_usage` (
     CONSTRAINT `fk_quota_tariff_usage__tariff_id` FOREIGN KEY (`tariff_id`) REFERENCES `cloud_usage`.`quota_tariff` (`id`),
     CONSTRAINT `fk_quota_tariff_usage__quota_usage_id` FOREIGN KEY (`quota_usage_id`) REFERENCES `cloud_usage`.`quota_usage` (`id`));
 
+--- Per-VM ISO attachments. user_vm.iso_id remains as the primary/bootable ISO pointer.
+CREATE TABLE IF NOT EXISTS `cloud`.`vm_iso_map` (
+    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    `vm_id` bigint(20) unsigned NOT NULL COMMENT 'foreign key to user_vm',
+    `iso_id` bigint(20) unsigned NOT NULL COMMENT 'foreign key to vm_template (ISOs are templates of format ISO)',
+    `device_seq` int(10) unsigned NOT NULL COMMENT 'cdrom slot index used to derive the libvirt device label (3=hdc, 4=hdd)',
+    `created` datetime NOT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uc_vm_iso_map__vm_iso` (`vm_id`, `iso_id`),
+    UNIQUE KEY `uc_vm_iso_map__vm_seq` (`vm_id`, `device_seq`),
+    CONSTRAINT `fk_vm_iso_map__vm_id` FOREIGN KEY (`vm_id`) REFERENCES `cloud`.`user_vm` (`id`) ON DELETE CASCADE,
+    CONSTRAINT `fk_vm_iso_map__iso_id` FOREIGN KEY (`iso_id`) REFERENCES `cloud`.`vm_template` (`id`)
+);
+
 -- Add the 'keep_mac_address_on_public_nic' column to the 'cloud.networks' and 'cloud.vpc' tables
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.networks', 'keep_mac_address_on_public_nic', 'TINYINT(1) NOT NULL DEFAULT 1');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc', 'keep_mac_address_on_public_nic', 'TINYINT(1) NOT NULL DEFAULT 1');
@@ -150,6 +172,61 @@ FROM `cloud`.`configuration` `cfg`
 WHERE NOT EXISTS (SELECT 1 FROM `cloud`.`configuration` WHERE `name` = 'kvm.cpu.dynamic.scaling.capacity')
   AND `cfg`.`name` = 'vm.serviceoffering.cpu.cores.max';
 
+-- Generalise VM schedule tables into resource-agnostic resource_schedule / resource_scheduled_job.
+-- Step 1: rename vm_schedule → resource_schedule, rename vm_id → resource_id, add resource_type column.
+ALTER TABLE `cloud`.`vm_schedule`
+    DROP FOREIGN KEY `fk_vm_schedule__vm_id`,
+    DROP INDEX `i_vm_schedule__vm_id`,
+    DROP INDEX `i_vm_schedule__enabled_end_date`,
+    CHANGE COLUMN `vm_id` `resource_id` bigint unsigned NOT NULL COMMENT 'id of the scheduled resource',
+    ADD COLUMN `resource_type` varchar(64) NOT NULL DEFAULT 'VirtualMachine' COMMENT 'type of the scheduled resource' AFTER `uuid`;
+
+RENAME TABLE `cloud`.`vm_schedule` TO `cloud`.`resource_schedule`;
+
+ALTER TABLE `cloud`.`resource_schedule`
+    ADD INDEX `i_resource_schedule__resource` (`resource_type`, `resource_id`),
+    ADD INDEX `i_resource_schedule__enabled_end_date` (`enabled`, `end_date`);
+
+-- Step 2: rename vm_scheduled_job → resource_scheduled_job, rename columns.
+ALTER TABLE `cloud`.`vm_scheduled_job`
+    DROP FOREIGN KEY `fk_vm_scheduled_job__vm_id`,
+    DROP FOREIGN KEY `fk_vm_scheduled_job__vm_schedule_id`,
+    DROP INDEX `i_vm_scheduled_job__vm_id`,
+    DROP INDEX `i_vm_scheduled_job__scheduled_timestamp`,
+    DROP INDEX `vm_schedule_id`,
+    CHANGE COLUMN `vm_id` `resource_id` bigint unsigned NOT NULL COMMENT 'id of the scheduled resource',
+    CHANGE COLUMN `vm_schedule_id` `schedule_id` bigint unsigned NOT NULL COMMENT 'id of the resource_schedule row',
+    ADD COLUMN `resource_type` varchar(64) NOT NULL DEFAULT 'VirtualMachine' COMMENT 'type of the scheduled resource' AFTER `uuid`;
+
+RENAME TABLE `cloud`.`vm_scheduled_job` TO `cloud`.`resource_scheduled_job`;
+
+ALTER TABLE `cloud`.`resource_scheduled_job`
+    ADD UNIQUE KEY `uc_resource_scheduled_job__schedule_timestamp` (`schedule_id`, `scheduled_timestamp`),
+    ADD INDEX `i_resource_scheduled_job__resource` (`resource_type`, `resource_id`),
+    ADD INDEX `i_resource_scheduled_job__scheduled_timestamp` (`scheduled_timestamp`),
+    ADD CONSTRAINT `fk_resource_scheduled_job__schedule_id` FOREIGN KEY (`schedule_id`) REFERENCES `resource_schedule`(`id`) ON DELETE CASCADE;
+
+-- Step 3: details table for action-specific parameters (used by the generic resource schedule API in Commit 2).
+CREATE TABLE IF NOT EXISTS `cloud`.`resource_schedule_details` (
+    `id` bigint unsigned NOT NULL auto_increment,
+    `schedule_id` bigint unsigned NOT NULL COMMENT 'id of the resource_schedule row',
+    `name` varchar(255) NOT NULL,
+    `value` varchar(1024) NOT NULL,
+    `display` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'should this detail be visible to the end user',
+    PRIMARY KEY (`id`),
+    INDEX `i_resource_schedule_details__schedule_id` (`schedule_id`),
+    CONSTRAINT `fk_resource_schedule_details__schedule_id` FOREIGN KEY (`schedule_id`) REFERENCES `resource_schedule`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- Step 4: rename CRUD event types from VM.SCHEDULE.{CREATE,UPDATE,DELETE} to the new generic SCHEDULE.{CREATE,UPDATE,DELETE}.
+-- Action-execution events (VM.SCHEDULE.START, .STOP, .REBOOT, .FORCE_STOP, .FORCE_REBOOT) keep their existing names.
+UPDATE `cloud`.`event` SET `type` = 'SCHEDULE.CREATE' WHERE `type` = 'VM.SCHEDULE.CREATE';
+UPDATE `cloud`.`event` SET `type` = 'SCHEDULE.UPDATE' WHERE `type` = 'VM.SCHEDULE.UPDATE';
+UPDATE `cloud`.`event` SET `type` = 'SCHEDULE.DELETE' WHERE `type` = 'VM.SCHEDULE.DELETE';
+
+-- Step 5: Rename the global configuration key for the scheduler
+UPDATE `cloud`.`configuration` SET name='scheduler.jobs.expire.interval' WHERE name='vmscheduler.jobs.expire.interval';
+
 -- Remove stale realhostip.com default values; domain has been dead since ~2015.
 UPDATE `cloud`.`configuration`
     SET value = NULL
@@ -208,3 +285,6 @@ INSERT INTO cloud.role_permissions (uuid, role_id, rule, permission, sort_order)
 SELECT uuid(), role_id, 'quotaResourceStatement', permission, sort_order
 FROM cloud.role_permissions rp
 WHERE rule = 'quotaStatement' AND NOT EXISTS(SELECT 1 FROM cloud.role_permissions rp_ WHERE rp.role_id = rp_.role_id AND rp_.rule = 'quotaResourceStatement');
+
+-- Add description for secondary IP addresses
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.nic_secondary_ips', 'description', 'VARCHAR(2048) DEFAULT NULL');
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql
index d9f4e267159..255ce866c42 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql
@@ -64,6 +64,7 @@ SELECT
     guest_os_category.id guest_os_category_id,
     guest_os_category.uuid guest_os_category_uuid,
     guest_os_category.name guest_os_category_name,
+    (SELECT `value` FROM `cloud`.`host_details` `hd` WHERE `hd`.`host_id` = `cloud`.`host`.`id` AND `hd`.`name` = 'guest.os.rule') AS `guest_os_rule`,
     mem_caps.used_capacity memory_used_capacity,
     mem_caps.reserved_capacity memory_reserved_capacity,
     cpu_caps.used_capacity cpu_used_capacity,
diff --git a/engine/schema/src/test/java/com/cloud/vm/VmIsoMapVOTest.java b/engine/schema/src/test/java/com/cloud/vm/VmIsoMapVOTest.java
new file mode 100644
index 00000000000..d5b1fef7a76
--- /dev/null
+++ b/engine/schema/src/test/java/com/cloud/vm/VmIsoMapVOTest.java
@@ -0,0 +1,41 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.vm;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class VmIsoMapVOTest {
+
+    @Test
+    public void testFullConstructorPopulatesAllFields() {
+        VmIsoMapVO row = new VmIsoMapVO(7L, 42L, 4);
+        Assert.assertEquals(7L, row.getVmId());
+        Assert.assertEquals(42L, row.getIsoId());
+        Assert.assertEquals(4, row.getDeviceSeq());
+        Assert.assertNotNull(row.getCreated());
+    }
+
+    @Test
+    public void testNoArgConstructorLeavesNonIdFieldsAtDefaults() {
+        VmIsoMapVO row = new VmIsoMapVO();
+        Assert.assertEquals(0L, row.getVmId());
+        Assert.assertEquals(0L, row.getIsoId());
+        Assert.assertEquals(0, row.getDeviceSeq());
+        Assert.assertNull(row.getCreated());
+    }
+}
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index 8145158dfa4..95362f44b13 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -27,6 +27,7 @@ import java.util.Objects;
 import javax.inject.Inject;
 
 import com.cloud.agent.api.to.DiskTO;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.Storage;
 import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
 import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
@@ -75,6 +76,7 @@ import com.cloud.storage.ScopeType;
 import com.cloud.storage.Snapshot.Type;
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.StorageManager;
+import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.VolumeVO;
@@ -108,6 +110,8 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
     StorageCacheManager cacheMgr;
     @Inject
     VolumeDataStoreDao volumeDataStoreDao;
+    @Inject
+    ClvmPoolManager clvmPoolManager;
 
     @Inject
     StorageManager storageManager;
@@ -309,6 +313,8 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
                 ep = selector.select(srcData, volObj);
             }
 
+            updateLockHostForVolume(ep, volObj);
+
             CopyCommand cmd = new CopyCommand(srcData.getTO(), addFullCloneAndDiskprovisiongStrictnessFlagOnVMwareDest(volObj.getTO()), _createVolumeFromSnapshotWait, VirtualMachineManager.ExecuteInSequence.value());
 
             Answer answer = null;
@@ -331,6 +337,29 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
         }
     }
 
+    private void updateLockHostForVolume(EndPoint ep, DataObject volObj) {
+        if (ep == null || !(volObj instanceof VolumeInfo)) {
+            return;
+        }
+        VolumeInfo volumeInfo = (VolumeInfo) volObj;
+        StoragePool destPool = (StoragePool) volObj.getDataStore();
+        if (destPool == null || !ClvmPoolManager.isClvmPoolType(destPool.getPoolType())) {
+            return;
+        }
+        Long hostId = ep.getId();
+        Long existingHostId = clvmPoolManager.getClvmLockHostId(
+                volumeInfo.getId(),
+                volumeInfo.getUuid(),
+                volumeInfo.getPath(),
+                destPool,
+                true
+        );
+        if (existingHostId == null) {
+            clvmPoolManager.setClvmLockHostId(volumeInfo.getId(), hostId);
+            logger.debug("Set lock host ID {} for CLVM volume {} being created from snapshot", hostId, volumeInfo.getId());
+        }
+    }
+
     protected Answer cloneVolume(DataObject template, DataObject volume) {
         CopyCommand cmd = new CopyCommand(template.getTO(), addFullCloneAndDiskprovisiongStrictnessFlagOnVMwareDest(volume.getTO()), 0, VirtualMachineManager.ExecuteInSequence.value());
         try {
@@ -581,6 +610,9 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
             volumeVo.setPoolId(destPool.getId());
             volumeVo.setPoolType(destPool.getPoolType());
             volumeVo.setLastPoolId(oldPoolId);
+            if (destPool.getPoolType() == StoragePoolType.CLVM) {
+                volumeVo.setFormat(ImageFormat.RAW);
+            }
             // For SMB, pool credentials are also stored in the uri query string.  We trim the query string
             // part  here to make sure the credentials do not get stored in the db unencrypted.
             String folder = destPool.getPath();
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java
index 947b4af8f69..867470dac04 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java
@@ -144,12 +144,16 @@ public class KvmNonManagedStorageDataMotionStrategy extends StorageSystemDataMot
     }
 
     /**
-     * Configures a {@link MigrateDiskInfo} object configured for migrating a File System volume and calls rootImageProvisioning.
+     * Configures a {@link MigrateDiskInfo} object configured for migrating a File System volume.
      */
     @Override
     protected MigrateCommand.MigrateDiskInfo configureMigrateDiskInfo(VolumeInfo srcVolumeInfo, String destPath, String backingPath) {
-            return new MigrateCommand.MigrateDiskInfo(srcVolumeInfo.getPath(), MigrateCommand.MigrateDiskInfo.DiskType.FILE, MigrateCommand.MigrateDiskInfo.DriverType.QCOW2,
-                    MigrateCommand.MigrateDiskInfo.Source.FILE, destPath, backingPath);
+            return new MigrateCommand.MigrateDiskInfo(srcVolumeInfo.getPath(),
+                    MigrateCommand.MigrateDiskInfo.DiskType.FILE,
+                    MigrateCommand.MigrateDiskInfo.DriverType.QCOW2,
+                    MigrateCommand.MigrateDiskInfo.Source.FILE,
+                    destPath,
+                    backingPath);
     }
 
     /**
@@ -158,6 +162,17 @@ public class KvmNonManagedStorageDataMotionStrategy extends StorageSystemDataMot
      */
     @Override
     protected String generateDestPath(Host destHost, StoragePoolVO destStoragePool, VolumeInfo destVolumeInfo) {
+        if (destStoragePool.getPoolType() == StoragePoolType.CLVM || destStoragePool.getPoolType() == StoragePoolType.CLVM_NG) {
+            String vgName = destStoragePool.getPath();
+            if (StringUtils.isBlank(vgName)) {
+                throw new CloudRuntimeException(String.format("CLVM/CLVM_NG destination pool [%s] has empty VG path", destStoragePool.getUuid()));
+            }
+            if (vgName.startsWith("/")) {
+                vgName = vgName.substring(1);
+            }
+            return String.format("/dev/%s/%s", vgName, destVolumeInfo.getUuid());
+        }
+
         return new File(destStoragePool.getPath(), destVolumeInfo.getUuid()).getAbsolutePath();
     }
 
@@ -285,6 +300,7 @@ public class KvmNonManagedStorageDataMotionStrategy extends StorageSystemDataMot
     }
 
     protected Boolean supportStoragePoolType(StoragePoolType storagePoolType) {
-        return super.supportStoragePoolType(storagePoolType, StoragePoolType.Filesystem);
+        return super.supportStoragePoolType(storagePoolType, StoragePoolType.Filesystem,
+                StoragePoolType.CLVM, StoragePoolType.CLVM_NG);
     }
 }
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
index bcade3a371c..2c791d05980 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
@@ -36,6 +36,8 @@ import com.cloud.agent.api.CheckVirtualMachineAnswer;
 import com.cloud.agent.api.CheckVirtualMachineCommand;
 import com.cloud.agent.api.PrepareForMigrationAnswer;
 import com.cloud.resource.ResourceManager;
+import com.cloud.storage.clvm.ClvmPoolManager;
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferCommand;
 import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
 import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
@@ -87,6 +89,7 @@ import com.cloud.agent.api.MigrateCommand;
 import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo;
 import com.cloud.agent.api.ModifyTargetsAnswer;
 import com.cloud.agent.api.ModifyTargetsCommand;
+import com.cloud.agent.api.PreMigrationCommand;
 import com.cloud.agent.api.PrepareForMigrationCommand;
 import com.cloud.agent.api.storage.CopyVolumeAnswer;
 import com.cloud.agent.api.storage.CopyVolumeCommand;
@@ -206,6 +209,8 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
     private VolumeDataFactory _volFactory;
     @Inject
     ResourceManager resourceManager;
+    @Inject
+    private ClvmPoolManager clvmPoolManager;
 
     @Override
     public StrategyPriority canHandle(DataObject srcData, DataObject destData) {
@@ -2023,6 +2028,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
         String errMsg = null;
         boolean success = false;
         Map<VolumeInfo, VolumeInfo> srcVolumeInfoToDestVolumeInfo = new HashMap<>();
+        List<VolumeInfo> samePoolClvmVolumes = new ArrayList<>();
 
         try {
             if (srcHost.getHypervisorType() != HypervisorType.KVM) {
@@ -2052,6 +2058,13 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                     continue;
                 }
 
+                if (sourceStoragePool.getId() == destStoragePool.getId() &&
+                        ClvmPoolManager.isClvmPoolType(destStoragePool.getPoolType())) {
+                    logger.info("Same-pool CLVM migration for volume [{}]: skipping data copy.", srcVolumeInfo.getUuid());
+                    samePoolClvmVolumes.add(srcVolumeInfo);
+                    continue;
+                }
+
                 if (!shouldMigrateVolume(sourceStoragePool, destHost, destStoragePool)) {
                     continue;
                 }
@@ -2071,6 +2084,13 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
                 setVolumeMigrationOptions(srcVolumeInfo, destVolumeInfo, vmTO, srcHost, destStoragePool, migrationType);
 
+                if (ClvmPoolManager.isClvmPoolType(destStoragePool.getPoolType())) {
+                    destVolumeInfo.setDestinationHostId(destHost.getId());
+                    clvmPoolManager.setClvmLockHostId(destVolume.getId(), destHost.getId());
+                    logger.info("Set CLVM lock host {} for volume {} during migration to ensure creation on destination host",
+                            destHost.getId(), destVolumeInfo.getUuid());
+                }
+
                 // create a volume on the destination storage
                 destDataStore.getDriver().createAsync(destDataStore, destVolumeInfo, null);
 
@@ -2096,7 +2116,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
                 MigrateCommand.MigrateDiskInfo migrateDiskInfo;
 
-                boolean isNonManagedToNfs = supportStoragePoolType(sourceStoragePool.getPoolType(), StoragePoolType.Filesystem) && destStoragePool.getPoolType() == StoragePoolType.NetworkFilesystem && !managedStorageDestination;
+                boolean isNonManagedToNfs = supportStoragePoolType(sourceStoragePool.getPoolType(), StoragePoolType.Filesystem, StoragePoolType.CLVM, StoragePoolType.CLVM_NG) && destStoragePool.getPoolType() == StoragePoolType.NetworkFilesystem && !managedStorageDestination;
                 if (isNonManagedToNfs) {
                     migrateDiskInfo = new MigrateCommand.MigrateDiskInfo(srcVolumeInfo.getPath(),
                             MigrateCommand.MigrateDiskInfo.DiskType.FILE,
@@ -2106,9 +2126,12 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                 } else {
                     String backingPath = generateBackingPath(destStoragePool, destVolumeInfo);
                     migrateDiskInfo = configureMigrateDiskInfo(srcVolumeInfo, destPath, backingPath);
+                    migrateDiskInfo = updateMigrateDiskInfoForBlockDevice(migrateDiskInfo, destStoragePool);
                     migrateDiskInfo.setSourceDiskOnStorageFileSystem(isStoragePoolTypeOfFile(sourceStoragePool));
                     migrateDiskInfoList.add(migrateDiskInfo);
                 }
+                migrateDiskInfo.setSourcePoolType(sourceStoragePool.getPoolType());
+                migrateDiskInfo.setDestPoolType(destVolumeInfo.getStoragePoolType());
                 prepareDiskWithSecretConsumerDetail(vmTO, srcVolumeInfo, destVolumeInfo.getPath());
 
                 migrateStorage.put(srcVolumeInfo.getPath(), migrateDiskInfo);
@@ -2116,6 +2139,8 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                 srcVolumeInfoToDestVolumeInfo.put(srcVolumeInfo, destVolumeInfo);
             }
 
+            prepareDisksForMigrationForClvm(vmTO, volumeDataStoreMap, srcHost);
+
             PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(vmTO);
             Answer pfma;
 
@@ -2132,6 +2157,25 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                 throw new AgentUnavailableException("Operation timed out", destHost.getId());
             }
 
+            for (VolumeInfo vol : samePoolClvmVolumes) {
+                StoragePoolVO samePoolClvmPool = _storagePoolDao.findById(vol.getPoolId());
+                String vgName = samePoolClvmPool.getPath();
+                if (vgName.startsWith("/")) {
+                    vgName = vgName.substring(1);
+                }
+                String lvPath = String.format("/dev/%s/%s", vgName, vol.getPath());
+                logger.info("Activating CLVM volume [{}] in shared mode on dest host [{}] for same-pool migration.",
+                        vol.getUuid(), destHost.getId());
+                Answer activateAnswer = agentManager.send(destHost.getId(),
+                        new ClvmLockTransferCommand(ClvmLockTransferCommand.Operation.ACTIVATE_SHARED, lvPath, vol.getUuid()));
+                if (activateAnswer == null || !activateAnswer.getResult()) {
+                    throw new CloudRuntimeException(String.format(
+                            "Failed to activate CLVM volume [%s] in shared mode on dest host [%s]: %s",
+                            vol.getUuid(), destHost.getId(),
+                            activateAnswer != null ? activateAnswer.getDetails() : "null answer"));
+                }
+            }
+
             VMInstanceVO vm = _vmDao.findById(vmTO.getId());
             boolean isWindows = _guestOsCategoryDao.findById(_guestOsDao.findById(vm.getGuestOSId()).getCategoryId()).getName().equalsIgnoreCase("Windows");
 
@@ -2141,6 +2185,9 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
             migrateCommand.setMigrateDiskInfoList(migrateDiskInfoList);
             migrateCommand.setMigrateStorageManaged(managedStorageDestination);
             migrateCommand.setMigrateNonSharedInc(migrateNonSharedInc);
+            boolean hasClvmCrossPoolVolume = migrateStorage.values().stream()
+                    .anyMatch(info -> ClvmPoolManager.isClvmPoolType(info.getSourcePoolType()));
+            migrateCommand.setClvmCrossPoolMigration(hasClvmCrossPoolVolume);
 
             Integer newVmCpuShares = ((PrepareForMigrationAnswer) pfma).getNewVmCpuShares();
             if (newVmCpuShares != null) {
@@ -2171,7 +2218,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                 }
             }
 
-            handlePostMigration(success, srcVolumeInfoToDestVolumeInfo, vmTO, destHost);
+            handlePostMigration(success, srcVolumeInfoToDestVolumeInfo, vmTO, srcHost, destHost);
 
             if (!success) {
                 if (migrateAnswer == null) {
@@ -2211,10 +2258,43 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
         }
     }
 
+    private void prepareDisksForMigrationForClvm(VirtualMachineTO vmTO, Map<VolumeInfo, DataStore> volumeDataStoreMap, Host srcHost) {
+        // For CLVM/CLVM_NG source pools, convert volumes from exclusive to shared mode
+        // on the source host BEFORE PrepareForMigrationCommand on the destination.
+        boolean hasClvmSource = volumeDataStoreMap.keySet().stream()
+                .map(v -> _storagePoolDao.findById(v.getPoolId()))
+                .anyMatch(p -> p != null && (p.getPoolType() == StoragePoolType.CLVM || p.getPoolType() == StoragePoolType.CLVM_NG));
+        if (hasClvmSource && srcHost.getHypervisorType() == HypervisorType.KVM) {
+            logger.info("CLVM/CLVM_NG source pool detected for VM [{}], sending PreMigrationCommand to source host [{}] to convert volumes to shared mode.", vmTO.getName(), srcHost.getId());
+            PreMigrationCommand preMigCmd = new PreMigrationCommand(vmTO, vmTO.getName());
+            try {
+                Answer preMigAnswer = agentManager.send(srcHost.getId(), preMigCmd);
+                if (preMigAnswer == null || !preMigAnswer.getResult()) {
+                    String details = preMigAnswer != null ? preMigAnswer.getDetails() : "null answer returned";
+                    logger.warn("PreMigrationCommand failed for CLVM/CLVM_NG VM [{}] on source host [{}]: {}. Migration will continue but may fail if volumes are exclusively locked.", vmTO.getName(), srcHost.getId(), details);
+                } else {
+                    logger.info("Successfully converted CLVM/CLVM_NG volumes to shared mode on source host [{}] for VM [{}].", srcHost.getId(), vmTO.getName());
+                }
+            } catch (Exception e) {
+                logger.warn("Failed to send PreMigrationCommand to source host [{}] for VM [{}]: {}. Migration will continue but may fail if volumes are exclusively locked.", srcHost.getId(), vmTO.getName(), e.getMessage());
+            }
+        } else if (hasClvmSource) {
+            logger.debug("Skipping PreMigrationCommand for non-KVM hypervisor type: {} on host [{}]", srcHost.getHypervisorType(), srcHost.getId());
+        }
+    }
+
     private MigrationOptions.Type decideMigrationTypeAndCopyTemplateIfNeeded(Host destHost, VMInstanceVO vmInstance, VolumeInfo srcVolumeInfo, StoragePoolVO sourceStoragePool, StoragePoolVO destStoragePool, DataStore destDataStore) {
         VMTemplateVO vmTemplate = _vmTemplateDao.findById(vmInstance.getTemplateId());
         String srcVolumeBackingFile = getVolumeBackingFile(srcVolumeInfo);
+
+        // Check if source is CLVM/CLVM_NG (block device storage)
+        // LinkedClone (VIR_MIGRATE_NON_SHARED_INC) only works for file → file migrations
+        // For block device sources, use FullClone (VIR_MIGRATE_NON_SHARED_DISK)
+        boolean sourceIsBlockDevice = sourceStoragePool.getPoolType() == StoragePoolType.CLVM ||
+                                       sourceStoragePool.getPoolType() == StoragePoolType.CLVM_NG;
+
         if (StringUtils.isNotBlank(srcVolumeBackingFile) && supportStoragePoolType(destStoragePool.getPoolType(), StoragePoolType.Filesystem) &&
+                !sourceIsBlockDevice &&
                 srcVolumeInfo.getTemplateId() != null &&
                 Objects.nonNull(vmTemplate) &&
                 !Arrays.asList(KVM_VM_IMPORT_DEFAULT_TEMPLATE_NAME, VM_IMPORT_DEFAULT_TEMPLATE_NAME).contains(vmTemplate.getName())) {
@@ -2222,8 +2302,12 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
             copyTemplateToTargetFilesystemStorageIfNeeded(srcVolumeInfo, sourceStoragePool, destDataStore, destStoragePool, destHost);
             return MigrationOptions.Type.LinkedClone;
         }
-        logger.debug(String.format("Skipping copy template from source storage pool [%s] to target storage pool [%s] before migration due to volume [%s] does not have a " +
-                "template or we are doing full clone migration.", sourceStoragePool.getId(), destStoragePool.getId(), srcVolumeInfo.getId()));
+
+        if (sourceIsBlockDevice) {
+            logger.debug(String.format("Source storage pool [%s] is block device (CLVM/CLVM_NG). Using FullClone migration for volume [%s] to target storage pool [%s]. Template copy skipped as entire volume will be copied.", sourceStoragePool.getId(), srcVolumeInfo.getId(), destStoragePool.getId()));
+        } else {
+            logger.debug(String.format("Skipping copy template from source storage pool [%s] to target storage pool [%s] before migration due to volume [%s] does not have a template or we are doing full clone migration.", sourceStoragePool.getId(), destStoragePool.getId(), srcVolumeInfo.getId()));
+        }
         return MigrationOptions.Type.FullClone;
     }
 
@@ -2289,6 +2373,39 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                 MigrateCommand.MigrateDiskInfo.Source.DEV, destPath, backingPath);
     }
 
+    /**
+     * UpdatesMigrateDiskInfo for CLVM/CLVM_NG block devices by returning a new instance with corrected disk type, driver type, and source.
+     * For CLVM/CLVM_NG destinations, returns a new MigrateDiskInfo with BLOCK disk type, DEV source, and appropriate driver type (QCOW2 for CLVM_NG, RAW for CLVM).
+     * For other storage types, returns the original MigrateDiskInfo unchanged.
+     *
+     * @param migrateDiskInfo The original MigrateDiskInfo object
+     * @param destStoragePool The destination storage pool
+     * @return A new MigrateDiskInfo with updated values for CLVM/CLVM_NG, or the original for other storage types
+     */
+    protected MigrateCommand.MigrateDiskInfo updateMigrateDiskInfoForBlockDevice(MigrateCommand.MigrateDiskInfo migrateDiskInfo,
+                                                                                   StoragePoolVO destStoragePool) {
+        if (ClvmPoolManager.isClvmPoolType(destStoragePool.getPoolType())) {
+
+            MigrateCommand.MigrateDiskInfo.DriverType driverType =
+                (destStoragePool.getPoolType() == StoragePoolType.CLVM_NG) ?
+                MigrateCommand.MigrateDiskInfo.DriverType.QCOW2 :
+                MigrateCommand.MigrateDiskInfo.DriverType.RAW;
+
+            logger.debug("Updating MigrateDiskInfo for {} destination: setting BLOCK disk type, DEV source, and {} driver type",
+                destStoragePool.getPoolType(), driverType);
+
+            return new MigrateCommand.MigrateDiskInfo(
+                migrateDiskInfo.getSerialNumber(),
+                MigrateCommand.MigrateDiskInfo.DiskType.BLOCK,
+                driverType,
+                MigrateCommand.MigrateDiskInfo.Source.DEV,
+                migrateDiskInfo.getSourceText(),
+                migrateDiskInfo.getBackingStoreText());
+        }
+
+        return migrateDiskInfo;
+    }
+
     /**
      * Sets the volume path as the iScsi name in case of a configured iScsi.
      */
@@ -2320,7 +2437,26 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
         return null;
     }
 
-    private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> srcVolumeInfoToDestVolumeInfo, VirtualMachineTO vmTO, Host destHost) {
+    private void sendClvmLockCommand(long hostId, StoragePoolVO pool, VolumeInfo volumeInfo,
+            ClvmLockTransferCommand.Operation operation) {
+        String vgName = pool.getPath();
+        if (vgName.startsWith("/")) {
+            vgName = vgName.substring(1);
+        }
+        String lvPath = String.format("/dev/%s/%s", vgName, volumeInfo.getPath());
+        try {
+            Answer answer = agentManager.send(hostId,
+                    new ClvmLockTransferCommand(operation, lvPath, volumeInfo.getUuid()));
+            if (answer == null || !answer.getResult()) {
+                String details = answer != null ? answer.getDetails() : "null answer";
+                logger.warn("CLVM lock command [{}] failed for LV [{}] on host [{}]: {}", operation, lvPath, hostId, details);
+            }
+        } catch (AgentUnavailableException | OperationTimedoutException e) {
+            logger.warn("Exception sending CLVM lock command [{}] for LV [{}] on host [{}]: {}", operation, lvPath, hostId, e.getMessage());
+        }
+    }
+
+    private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> srcVolumeInfoToDestVolumeInfo, VirtualMachineTO vmTO, Host srcHost, Host destHost) {
         if (!success) {
             try {
                 PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(vmTO);
@@ -2339,6 +2475,17 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
             catch (Exception e) {
                 logger.debug("Failed to disconnect one or more (original) dest volumes", e);
             }
+
+            if (srcHost != null && srcHost.getHypervisorType() == HypervisorType.KVM) {
+                for (VolumeInfo srcVolumeInfo : srcVolumeInfoToDestVolumeInfo.keySet()) {
+                    StoragePoolVO srcPool = _storagePoolDao.findById(srcVolumeInfo.getPoolId());
+                    if (srcPool == null || !ClvmPoolManager.isClvmPoolType(srcPool.getPoolType())) {
+                        continue;
+                    }
+                    sendClvmLockCommand(srcHost.getId(), srcPool, srcVolumeInfo,
+                            ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE);
+                }
+            }
         }
 
         for (Map.Entry<VolumeInfo, VolumeInfo> entry : srcVolumeInfoToDestVolumeInfo.entrySet()) {
@@ -2349,12 +2496,13 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
             if (success) {
                 VolumeVO volumeVO = _volumeDao.findById(destVolumeInfo.getId());
-                volumeVO.setFormat(ImageFormat.QCOW2);
+                StoragePoolVO srcPoolVO = _storagePoolDao.findById(srcVolumeInfo.getPoolId());
+                StoragePoolVO destPoolVO = _storagePoolDao.findById(destVolumeInfo.getPoolId());
+                volumeVO.setFormat(destPoolVO != null && destPoolVO.getPoolType() == StoragePoolType.CLVM
+                        ? ImageFormat.RAW : ImageFormat.QCOW2);
                 volumeVO.setLastId(srcVolumeInfo.getId());
 
                 if (Objects.equals(srcVolumeInfo.getDiskOfferingId(), destVolumeInfo.getDiskOfferingId())) {
-                    StoragePoolVO srcPoolVO = _storagePoolDao.findById(srcVolumeInfo.getPoolId());
-                    StoragePoolVO destPoolVO = _storagePoolDao.findById(destVolumeInfo.getPoolId());
                     if (srcPoolVO != null && destPoolVO != null &&
                             ((srcPoolVO.isShared() && destPoolVO.isLocal()) || (srcPoolVO.isLocal() && destPoolVO.isShared()))) {
                         Long offeringId = getSuitableDiskOfferingForVolumeOnPool(volumeVO, destPoolVO);
@@ -2365,6 +2513,12 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                 }
 
                 _volumeDao.update(volumeVO.getId(), volumeVO);
+                if (destPoolVO != null && ClvmPoolManager.isClvmPoolType(destPoolVO.getPoolType())
+                        && (srcPoolVO == null || srcPoolVO.getId() != destPoolVO.getId())) {
+                    sendClvmLockCommand(destHost.getId(), destPoolVO, destVolumeInfo,
+                            ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE);
+                    clvmPoolManager.setClvmLockHostId(destVolumeInfo.getId(), destHost.getId());
+                }
 
                 _volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSucceeded, null, srcVolumeInfo, destVolumeInfo, false);
 
diff --git a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java
index e167cc0a965..e84163656b1 100755
--- a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java
+++ b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategyTest.java
@@ -28,14 +28,18 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.any;
 
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.Storage;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
 import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.StorageCacheManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@@ -95,6 +99,14 @@ public class AncientDataMotionStrategyTest {
         f.set(configKey, value);
     }
 
+    private ClvmPoolManager injectMockedClvmPoolManager() throws Exception {
+        ClvmPoolManager clvmPoolManager = Mockito.mock(ClvmPoolManager.class);
+        Field clvmPoolManagerField = AncientDataMotionStrategy.class.getDeclaredField("clvmPoolManager");
+        clvmPoolManagerField.setAccessible(true);
+        clvmPoolManagerField.set(strategy, clvmPoolManager);
+        return clvmPoolManager;
+    }
+
     @Test
     public void testAddFullCloneFlagOnVMwareDest(){
         strategy.addFullCloneAndDiskprovisiongStrictnessFlagOnVMwareDest(dataTO);
@@ -288,4 +300,185 @@ public class AncientDataMotionStrategyTest {
         canBypassSecondaryStorage = (boolean) method.invoke(strategy, destVolumeInfo, srcVolumeInfo);
         Assert.assertTrue(canBypassSecondaryStorage);
     }
+
+    @Test
+    public void testUpdateLockHostForVolume_CLVMPool_SetsLockHost() throws Exception {
+        Method method = AncientDataMotionStrategy.class.getDeclaredMethod(
+                "updateLockHostForVolume",
+                EndPoint.class,
+                DataObject.class);
+        method.setAccessible(true);
+
+        EndPoint endPoint = Mockito.mock(EndPoint.class);
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        DataStore dataStore = Mockito.mock(DataStore.class, Mockito.withSettings().extraInterfaces(StoragePool.class));
+        ClvmPoolManager clvmPoolManager = injectMockedClvmPoolManager();
+
+        Long hostId = 123L;
+        Long volumeId = 456L;
+        String volumeUuid = "test-volume-uuid";
+
+        Mockito.when(endPoint.getId()).thenReturn(hostId);
+        Mockito.when(volumeInfo.getDataStore()).thenReturn(dataStore);
+        Mockito.when(volumeInfo.getId()).thenReturn(volumeId);
+        Mockito.when(volumeInfo.getUuid()).thenReturn(volumeUuid);
+        Mockito.when(volumeInfo.getPath()).thenReturn("test-volume-path");
+        Mockito.when(((StoragePool) dataStore).getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(volumeId), Mockito.eq(volumeUuid),
+                Mockito.anyString(), Mockito.any(StoragePool.class), Mockito.eq(true))).thenReturn(null);
+
+        method.invoke(strategy, endPoint, volumeInfo);
+
+        Mockito.verify(clvmPoolManager).setClvmLockHostId(volumeId, hostId);
+    }
+
+    @Test
+    public void testUpdateLockHostForVolume_CLVM_NG_Pool_SetsLockHost() throws Exception {
+        Method method = AncientDataMotionStrategy.class.getDeclaredMethod(
+                "updateLockHostForVolume",
+                EndPoint.class,
+                DataObject.class);
+        method.setAccessible(true);
+
+        EndPoint endPoint = Mockito.mock(EndPoint.class);
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        DataStore dataStore = Mockito.mock(DataStore.class, Mockito.withSettings().extraInterfaces(StoragePool.class));
+        ClvmPoolManager clvmPoolManager = injectMockedClvmPoolManager();
+
+        Long hostId = 789L;
+        Long volumeId = 101L;
+        String volumeUuid = "test-clvm-ng-volume-uuid";
+
+        Mockito.when(endPoint.getId()).thenReturn(hostId);
+        Mockito.when(volumeInfo.getDataStore()).thenReturn(dataStore);
+        Mockito.when(volumeInfo.getId()).thenReturn(volumeId);
+        Mockito.when(volumeInfo.getUuid()).thenReturn(volumeUuid);
+        Mockito.when(volumeInfo.getPath()).thenReturn("test-clvm-ng-volume-path");
+        Mockito.when(((StoragePool) dataStore).getPoolType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(volumeId), Mockito.eq(volumeUuid),
+                Mockito.anyString(), Mockito.any(StoragePool.class), Mockito.eq(true))).thenReturn(null);
+
+        try {
+            method.invoke(strategy, endPoint, volumeInfo);
+        } catch (InvocationTargetException e) {
+            e.getCause().printStackTrace();
+            throw e;
+        }
+
+        Mockito.verify(clvmPoolManager).setClvmLockHostId(volumeId, hostId);
+    }
+
+    @Test
+    public void testUpdateLockHostForVolume_NonCLVMPool_DoesNotSetLockHost() throws Exception {
+        Method method = AncientDataMotionStrategy.class.getDeclaredMethod(
+                "updateLockHostForVolume",
+                EndPoint.class,
+                DataObject.class);
+        method.setAccessible(true);
+
+        EndPoint endPoint = Mockito.mock(EndPoint.class);
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        // Create mock that implements both DataStore and StoragePool interfaces
+        DataStore dataStore = Mockito.mock(DataStore.class, Mockito.withSettings().extraInterfaces(StoragePool.class));
+        ClvmPoolManager clvmPoolManager = injectMockedClvmPoolManager();
+
+        Mockito.when(volumeInfo.getDataStore()).thenReturn(dataStore);
+        Mockito.when(((StoragePool) dataStore).getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+
+        method.invoke(strategy, endPoint, volumeInfo);
+
+        Mockito.verify(clvmPoolManager, never()).setClvmLockHostId(any(Long.class), any(Long.class));
+        Mockito.verify(clvmPoolManager, never()).getClvmLockHostId(any(Long.class), any(String.class),
+                any(String.class), any(StoragePool.class), Mockito.anyBoolean());
+    }
+
+    @Test
+    public void testUpdateLockHostForVolume_ExistingLockHost_DoesNotOverwrite() throws Exception {
+        Method method = AncientDataMotionStrategy.class.getDeclaredMethod(
+                "updateLockHostForVolume",
+                EndPoint.class,
+                DataObject.class);
+        method.setAccessible(true);
+
+        EndPoint endPoint = Mockito.mock(EndPoint.class);
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        DataStore dataStore = Mockito.mock(DataStore.class, Mockito.withSettings().extraInterfaces(StoragePool.class));
+        ClvmPoolManager clvmPoolManager = injectMockedClvmPoolManager();
+
+        Long hostId = 555L;
+        Long existingHostId = 666L;
+        Long volumeId = 777L;
+        String volumeUuid = "existing-lock-volume-uuid";
+
+        Mockito.when(endPoint.getId()).thenReturn(hostId);
+        Mockito.when(volumeInfo.getDataStore()).thenReturn(dataStore);
+        Mockito.when(volumeInfo.getId()).thenReturn(volumeId);
+        Mockito.when(volumeInfo.getUuid()).thenReturn(volumeUuid);
+        Mockito.when(volumeInfo.getPath()).thenReturn("existing-lock-volume-path");
+        Mockito.when(((StoragePool) dataStore).getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(clvmPoolManager.getClvmLockHostId(Mockito.eq(volumeId), Mockito.eq(volumeUuid),
+                Mockito.anyString(), Mockito.any(StoragePool.class), Mockito.eq(true))).thenReturn(existingHostId);
+
+        method.invoke(strategy, endPoint, volumeInfo);
+
+        Mockito.verify(clvmPoolManager, never()).setClvmLockHostId(any(Long.class), any(Long.class));
+        Mockito.verify(clvmPoolManager).getClvmLockHostId(Mockito.eq(volumeId), Mockito.eq(volumeUuid),
+                Mockito.anyString(), Mockito.any(StoragePool.class), Mockito.eq(true));
+    }
+
+    @Test
+    public void testUpdateLockHostForVolume_NullEndPoint_DoesNotSetLockHost() throws Exception {
+        Method method = AncientDataMotionStrategy.class.getDeclaredMethod(
+                "updateLockHostForVolume",
+                EndPoint.class,
+                DataObject.class);
+        method.setAccessible(true);
+
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        ClvmPoolManager clvmPoolManager = injectMockedClvmPoolManager();
+
+        method.invoke(strategy, null, volumeInfo);
+
+        Mockito.verify(clvmPoolManager, never()).setClvmLockHostId(any(Long.class), any(Long.class));
+        Mockito.verify(clvmPoolManager, never()).getClvmLockHostId(any(Long.class), any(String.class),
+                any(String.class), any(StoragePool.class), Mockito.anyBoolean());
+    }
+
+    @Test
+    public void testUpdateLockHostForVolume_NonVolumeDataObject_DoesNotSetLockHost() throws Exception {
+        Method method = AncientDataMotionStrategy.class.getDeclaredMethod(
+                "updateLockHostForVolume",
+                EndPoint.class,
+                DataObject.class);
+        method.setAccessible(true);
+
+        EndPoint endPoint = Mockito.mock(EndPoint.class);
+        SnapshotInfo snapshotInfo = Mockito.mock(SnapshotInfo.class);
+        ClvmPoolManager clvmPoolManager = injectMockedClvmPoolManager();
+
+        method.invoke(strategy, endPoint, snapshotInfo);
+
+        Mockito.verify(clvmPoolManager, never()).setClvmLockHostId(any(Long.class), any(Long.class));
+        Mockito.verify(clvmPoolManager, never()).getClvmLockHostId(any(Long.class), any(String.class),
+                any(String.class), any(StoragePool.class), Mockito.anyBoolean());
+    }
+
+    @Test
+    public void testUpdateLockHostForVolume_NullPool_DoesNotSetLockHost() throws Exception {
+        Method method = AncientDataMotionStrategy.class.getDeclaredMethod(
+                "updateLockHostForVolume",
+                EndPoint.class,
+                DataObject.class);
+        method.setAccessible(true);
+
+        EndPoint endPoint = Mockito.mock(EndPoint.class);
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        ClvmPoolManager clvmPoolManager = injectMockedClvmPoolManager();
+
+        method.invoke(strategy, endPoint, volumeInfo);
+
+        Mockito.verify(clvmPoolManager, never()).setClvmLockHostId(any(Long.class), any(Long.class));
+        Mockito.verify(clvmPoolManager, never()).getClvmLockHostId(any(Long.class), any(String.class),
+                any(String.class), any(StoragePool.class), Mockito.anyBoolean());
+    }
 }
diff --git a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java
index 808c319b40f..6f0776b27c8 100644
--- a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java
+++ b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java
@@ -168,6 +168,8 @@ public class KvmNonManagedStorageSystemDataMotionTest {
         supportedTypes.add(StoragePoolType.Filesystem);
         supportedTypes.add(StoragePoolType.NetworkFilesystem);
         supportedTypes.add(StoragePoolType.SharedMountPoint);
+        supportedTypes.add(StoragePoolType.CLVM);
+        supportedTypes.add(StoragePoolType.CLVM_NG);
 
         return supportedTypes.contains(storagePoolType);
     }
@@ -505,6 +507,8 @@ public class KvmNonManagedStorageSystemDataMotionTest {
         supportedTypes.add(StoragePoolType.Filesystem);
         supportedTypes.add(StoragePoolType.NetworkFilesystem);
         supportedTypes.add(StoragePoolType.SharedMountPoint);
+        supportedTypes.add(StoragePoolType.CLVM);
+        supportedTypes.add(StoragePoolType.CLVM_NG);
 
         for (StoragePoolType poolType : StoragePoolType.values()) {
             boolean isSupported = kvmNonManagedStorageDataMotionStrategy.supportStoragePoolType(poolType);
diff --git a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java
index 45357fa64b2..fc51eeba7b6 100644
--- a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java
+++ b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java
@@ -369,4 +369,286 @@ public class StorageSystemDataMotionStrategyTest {
 
         assertFalse(strategy.isStoragePoolTypeInList(StoragePoolType.SharedMountPoint, listTypes));
     }
+
+    /**
+     * Test updateMigrateDiskInfoForBlockDevice with CLVM destination pool
+     * Should set driver type to RAW for CLVM
+     */
+    @Test
+    public void testUpdateMigrateDiskInfoForBlockDevice_ClvmDestination() {
+        MigrateCommand.MigrateDiskInfo originalDiskInfo = new MigrateCommand.MigrateDiskInfo(
+                "serial123",
+                MigrateCommand.MigrateDiskInfo.DiskType.FILE,
+                MigrateCommand.MigrateDiskInfo.DriverType.QCOW2,
+                MigrateCommand.MigrateDiskInfo.Source.FILE,
+                "/source/path",
+                null
+        );
+
+        StoragePoolVO destStoragePool = new StoragePoolVO();
+        destStoragePool.setPoolType(StoragePoolType.CLVM);
+
+        MigrateCommand.MigrateDiskInfo updatedDiskInfo = strategy.updateMigrateDiskInfoForBlockDevice(
+                originalDiskInfo, destStoragePool);
+
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DiskType.BLOCK, updatedDiskInfo.getDiskType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DriverType.RAW, updatedDiskInfo.getDriverType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.Source.DEV, updatedDiskInfo.getSource());
+        Assert.assertEquals("serial123", updatedDiskInfo.getSerialNumber());
+        Assert.assertEquals("/source/path", updatedDiskInfo.getSourceText());
+    }
+
+    /**
+     * Test updateMigrateDiskInfoForBlockDevice with CLVM_NG destination pool
+     * Should set driver type to QCOW2 for CLVM_NG
+     */
+    @Test
+    public void testUpdateMigrateDiskInfoForBlockDevice_ClvmNgDestination() {
+        MigrateCommand.MigrateDiskInfo originalDiskInfo = new MigrateCommand.MigrateDiskInfo(
+                "serial456",
+                MigrateCommand.MigrateDiskInfo.DiskType.FILE,
+                MigrateCommand.MigrateDiskInfo.DriverType.RAW,
+                MigrateCommand.MigrateDiskInfo.Source.FILE,
+                "/source/path",
+                "/backing/path"
+        );
+
+        StoragePoolVO destStoragePool = new StoragePoolVO();
+        destStoragePool.setPoolType(StoragePoolType.CLVM_NG);
+
+        MigrateCommand.MigrateDiskInfo updatedDiskInfo = strategy.updateMigrateDiskInfoForBlockDevice(
+                originalDiskInfo, destStoragePool);
+
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DiskType.BLOCK, updatedDiskInfo.getDiskType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DriverType.QCOW2, updatedDiskInfo.getDriverType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.Source.DEV, updatedDiskInfo.getSource());
+        Assert.assertEquals("serial456", updatedDiskInfo.getSerialNumber());
+        Assert.assertEquals("/source/path", updatedDiskInfo.getSourceText());
+        Assert.assertEquals("/backing/path", updatedDiskInfo.getBackingStoreText());
+    }
+
+    /**
+     * Test updateMigrateDiskInfoForBlockDevice with non-CLVM destination pool
+     * Should return original DiskInfo unchanged
+     */
+    @Test
+    public void testUpdateMigrateDiskInfoForBlockDevice_NonClvmDestination() {
+        MigrateCommand.MigrateDiskInfo originalDiskInfo = new MigrateCommand.MigrateDiskInfo(
+                "serial789",
+                MigrateCommand.MigrateDiskInfo.DiskType.FILE,
+                MigrateCommand.MigrateDiskInfo.DriverType.QCOW2,
+                MigrateCommand.MigrateDiskInfo.Source.FILE,
+                "/source/path",
+                null
+        );
+
+        StoragePoolVO destStoragePool = new StoragePoolVO();
+        destStoragePool.setPoolType(StoragePoolType.NetworkFilesystem);
+
+        MigrateCommand.MigrateDiskInfo updatedDiskInfo = strategy.updateMigrateDiskInfoForBlockDevice(
+                originalDiskInfo, destStoragePool);
+
+        Assert.assertSame(originalDiskInfo, updatedDiskInfo);
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DiskType.FILE, updatedDiskInfo.getDiskType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DriverType.QCOW2, updatedDiskInfo.getDriverType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.Source.FILE, updatedDiskInfo.getSource());
+    }
+
+    /**
+     * Test supportStoragePoolType with CLVM and CLVM_NG types
+     */
+    @Test
+    public void testSupportStoragePoolType_ClvmTypes() {
+        assertTrue(strategy.supportStoragePoolType(StoragePoolType.CLVM, StoragePoolType.CLVM, StoragePoolType.CLVM_NG));
+        assertTrue(strategy.supportStoragePoolType(StoragePoolType.CLVM_NG, StoragePoolType.CLVM, StoragePoolType.CLVM_NG));
+
+        assertFalse(strategy.supportStoragePoolType(StoragePoolType.CLVM));
+        assertFalse(strategy.supportStoragePoolType(StoragePoolType.CLVM_NG));
+    }
+
+    /**
+     * Test configureMigrateDiskInfo with CLVM destination
+     */
+    @Test
+    public void testConfigureMigrateDiskInfo_ForClvm() {
+        VolumeObject srcVolumeInfo = Mockito.spy(new VolumeObject());
+        Mockito.doReturn("/dev/vg/volume-path").when(srcVolumeInfo).getPath();
+
+        MigrateCommand.MigrateDiskInfo migrateDiskInfo = strategy.configureMigrateDiskInfo(
+                srcVolumeInfo, "/dev/vg/dest-path", null);
+
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DiskType.BLOCK, migrateDiskInfo.getDiskType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DriverType.RAW, migrateDiskInfo.getDriverType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.Source.DEV, migrateDiskInfo.getSource());
+        Assert.assertEquals("/dev/vg/dest-path", migrateDiskInfo.getSourceText());
+        Assert.assertEquals("/dev/vg/volume-path", migrateDiskInfo.getSerialNumber());
+    }
+
+    /**
+     * Test configureMigrateDiskInfo with CLVM_NG destination and backing file
+     */
+    @Test
+    public void testConfigureMigrateDiskInfo_ForClvmNgWithBacking() {
+        VolumeObject srcVolumeInfo = Mockito.spy(new VolumeObject());
+        Mockito.doReturn("/dev/vg/volume-path").when(srcVolumeInfo).getPath();
+
+        MigrateCommand.MigrateDiskInfo migrateDiskInfo = strategy.configureMigrateDiskInfo(
+                srcVolumeInfo, "/dev/vg/dest-path", "/dev/vg/backing-template");
+
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DiskType.BLOCK, migrateDiskInfo.getDiskType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.DriverType.RAW, migrateDiskInfo.getDriverType());
+        Assert.assertEquals(MigrateCommand.MigrateDiskInfo.Source.DEV, migrateDiskInfo.getSource());
+        Assert.assertEquals("/dev/vg/dest-path", migrateDiskInfo.getSourceText());
+        Assert.assertEquals("/dev/vg/backing-template", migrateDiskInfo.getBackingStoreText());
+        Assert.assertEquals("/dev/vg/volume-path", migrateDiskInfo.getSerialNumber());
+    }
+
+    /**
+     * Test isStoragePoolTypeInList with CLVM types
+     */
+    @Test
+    public void testIsStoragePoolTypeInList_WithClvmTypes() {
+        StoragePoolType[] clvmTypes = new StoragePoolType[] {
+            StoragePoolType.CLVM,
+            StoragePoolType.CLVM_NG,
+            StoragePoolType.Filesystem
+        };
+
+        assertTrue(strategy.isStoragePoolTypeInList(StoragePoolType.CLVM, clvmTypes));
+        assertTrue(strategy.isStoragePoolTypeInList(StoragePoolType.CLVM_NG, clvmTypes));
+        assertTrue(strategy.isStoragePoolTypeInList(StoragePoolType.Filesystem, clvmTypes));
+        assertFalse(strategy.isStoragePoolTypeInList(StoragePoolType.NetworkFilesystem, clvmTypes));
+    }
+
+    /**
+     * Test supportStoragePoolType with mixed CLVM and NFS types
+     */
+    @Test
+    public void testSupportStoragePoolType_MixedClvmAndNfs() {
+        assertTrue(strategy.supportStoragePoolType(
+                StoragePoolType.CLVM,
+                StoragePoolType.CLVM,
+                StoragePoolType.CLVM_NG,
+                StoragePoolType.NetworkFilesystem
+        ));
+
+        assertTrue(strategy.supportStoragePoolType(
+                StoragePoolType.CLVM_NG,
+                StoragePoolType.CLVM,
+                StoragePoolType.CLVM_NG,
+                StoragePoolType.NetworkFilesystem
+        ));
+
+        assertTrue(strategy.supportStoragePoolType(
+                StoragePoolType.NetworkFilesystem,
+                StoragePoolType.CLVM,
+                StoragePoolType.CLVM_NG
+        ));
+    }
+
+    /**
+     * Test internalCanHandle with CLVM source and managed destination
+     */
+    @Test
+    public void testInternalCanHandle_ClvmSourceManagedDestination() {
+        VolumeObject volumeInfo = Mockito.spy(new VolumeObject());
+        Mockito.doReturn(0L).when(volumeInfo).getPoolId();
+
+        DataStore ds = Mockito.spy(new PrimaryDataStoreImpl());
+
+        Map<VolumeInfo, DataStore> volumeMap = new HashMap<>();
+        volumeMap.put(volumeInfo, ds);
+
+        StoragePoolVO sourcePool = Mockito.spy(new StoragePoolVO());
+        Mockito.lenient().doReturn(StoragePoolType.CLVM).when(sourcePool).getPoolType();
+        Mockito.doReturn(true).when(sourcePool).isManaged();
+
+        Mockito.doReturn(sourcePool).when(primaryDataStoreDao).findById(0L);
+
+        StrategyPriority result = strategy.internalCanHandle(
+                volumeMap, new HostVO("srcHostUuid"), new HostVO("destHostUuid"));
+
+        Assert.assertEquals(StrategyPriority.HIGHEST, result);
+    }
+
+    /**
+     * Test internalCanHandle with CLVM_NG source and managed destination
+     */
+    @Test
+    public void testInternalCanHandle_ClvmNgSourceManagedDestination() {
+        VolumeObject volumeInfo = Mockito.spy(new VolumeObject());
+        Mockito.doReturn(0L).when(volumeInfo).getPoolId();
+
+        DataStore ds = Mockito.spy(new PrimaryDataStoreImpl());
+
+        Map<VolumeInfo, DataStore> volumeMap = new HashMap<>();
+        volumeMap.put(volumeInfo, ds);
+
+        StoragePoolVO sourcePool = Mockito.spy(new StoragePoolVO());
+        Mockito.lenient().doReturn(StoragePoolType.CLVM_NG).when(sourcePool).getPoolType();
+        Mockito.doReturn(true).when(sourcePool).isManaged();
+
+        Mockito.doReturn(sourcePool).when(primaryDataStoreDao).findById(0L);
+
+        StrategyPriority result = strategy.internalCanHandle(
+                volumeMap, new HostVO("srcHostUuid"), new HostVO("destHostUuid"));
+
+        Assert.assertEquals(StrategyPriority.HIGHEST, result);
+    }
+
+    /**
+     * Test internalCanHandle with both CLVM source and CLVM_NG destination
+     */
+    @Test
+    public void testInternalCanHandle_ClvmToClvmNg() {
+        VolumeObject volumeInfo = Mockito.spy(new VolumeObject());
+        Mockito.doReturn(0L).when(volumeInfo).getPoolId();
+
+        DataStore ds = Mockito.spy(new PrimaryDataStoreImpl());
+
+        Map<VolumeInfo, DataStore> volumeMap = new HashMap<>();
+        volumeMap.put(volumeInfo, ds);
+
+        StoragePoolVO sourcePool = Mockito.spy(new StoragePoolVO());
+        Mockito.lenient().doReturn(StoragePoolType.CLVM).when(sourcePool).getPoolType();
+        Mockito.doReturn(true).when(sourcePool).isManaged();
+
+        StoragePoolVO destPool = Mockito.spy(new StoragePoolVO());
+        Mockito.lenient().doReturn(StoragePoolType.CLVM_NG).when(destPool).getPoolType();
+
+        Mockito.doReturn(sourcePool).when(primaryDataStoreDao).findById(0L);
+
+        StrategyPriority result = strategy.internalCanHandle(
+                volumeMap, new HostVO("srcHostUuid"), new HostVO("destHostUuid"));
+
+        Assert.assertEquals(StrategyPriority.HIGHEST, result);
+    }
+
+    /**
+     * Test internalCanHandle with CLVM_NG to CLVM migration
+     */
+    @Test
+    public void testInternalCanHandle_ClvmNgToClvm() {
+        VolumeObject volumeInfo = Mockito.spy(new VolumeObject());
+        Mockito.doReturn(0L).when(volumeInfo).getPoolId();
+
+        DataStore ds = Mockito.spy(new PrimaryDataStoreImpl());
+
+        Map<VolumeInfo, DataStore> volumeMap = new HashMap<>();
+        volumeMap.put(volumeInfo, ds);
+
+        StoragePoolVO sourcePool = Mockito.spy(new StoragePoolVO());
+        Mockito.lenient().doReturn(StoragePoolType.CLVM_NG).when(sourcePool).getPoolType();
+        Mockito.doReturn(true).when(sourcePool).isManaged();
+
+        StoragePoolVO destPool = Mockito.spy(new StoragePoolVO());
+        Mockito.lenient().doReturn(StoragePoolType.CLVM).when(destPool).getPoolType();
+
+        Mockito.doReturn(sourcePool).when(primaryDataStoreDao).findById(0L);
+
+        StrategyPriority result = strategy.internalCanHandle(
+                volumeMap, new HostVO("srcHostUuid"), new HostVO("destHostUuid"));
+
+        Assert.assertEquals(StrategyPriority.HIGHEST, result);
+    }
 }
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
index 88f479c0904..d85e862bfb6 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
@@ -60,6 +60,7 @@ import com.cloud.event.UsageEventUtils;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.CreateSnapshotPayload;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.Snapshot;
@@ -643,6 +644,10 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
                 return StrategyPriority.DEFAULT;
             }
 
+            if (isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO)) {
+                return StrategyPriority.DEFAULT;
+            }
+
             return StrategyPriority.CANT_HANDLE;
         }
         if (zoneId != null && SnapshotOperation.DELETE.equals(op)) {
@@ -691,4 +696,32 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
                         dataStoreMgr.getStoreZoneId(s.getDataStoreId(), s.getRole()), volumeVO.getDataCenterId()));
     }
 
+    /**
+     * Checks if a CLVM volume snapshot is stored on secondary storage in the same zone.
+     * CLVM snapshots are backed up to secondary storage and removed from primary storage.
+     */
+    protected boolean isSnapshotStoredOnSecondaryForCLVMVolume(Snapshot snapshot, VolumeVO volumeVO) {
+        if (volumeVO == null) {
+            return false;
+        }
+
+        Long poolId = volumeVO.getPoolId();
+        if (poolId == null) {
+            return false;
+        }
+
+        StoragePool pool = (StoragePool) dataStoreMgr.getDataStore(poolId, DataStoreRole.Primary);
+        if (pool == null || !ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            return false;
+        }
+
+        List<SnapshotDataStoreVO> snapshotStores = snapshotStoreDao.listReadyBySnapshot(snapshot.getId(), DataStoreRole.Image);
+        if (CollectionUtils.isEmpty(snapshotStores)) {
+            return false;
+        }
+
+        return snapshotStores.stream().anyMatch(s -> Objects.equals(
+                dataStoreMgr.getStoreZoneId(s.getDataStoreId(), s.getRole()), volumeVO.getDataCenterId()));
+    }
+
 }
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
index b71d6cf3afa..665c3a4659c 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
@@ -27,6 +27,7 @@ import javax.naming.ConfigurationException;
 
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.Snapshot;
+import com.cloud.storage.Storage;
 import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
@@ -468,6 +469,13 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot
 
     @Override
     public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
+        UserVmVO vm = userVmDao.findById(vmSnapshot.getVmId());
+        String cantHandleLog = String.format("Default VM snapshot cannot handle VM snapshot for [%s]", vm);
+
+        if (isRunningVMVolumeOnCLVMStorage(vm, cantHandleLog)) {
+            return StrategyPriority.CANT_HANDLE;
+        }
+
         return StrategyPriority.DEFAULT;
     }
 
@@ -493,10 +501,31 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot
         return vmSnapshotDao.remove(vmSnapshot.getId());
     }
 
+    protected boolean isRunningVMVolumeOnCLVMStorage(UserVmVO vm, String cantHandleLog) {
+        Long vmId = vm.getId();
+        if (State.Running.equals(vm.getState())) {
+            List<VolumeVO> volumes = volumeDao.findByInstance(vmId);
+            for (VolumeVO volume : volumes) {
+                StoragePool pool = primaryDataStoreDao.findById(volume.getPoolId());
+                if (pool != null && pool.getPoolType() == Storage.StoragePoolType.CLVM) {
+                    logger.warn("Rejecting VM snapshot request: {} - VM is running on CLVM storage (pool: {}, poolType: CLVM)",
+                            cantHandleLog, pool.getName());
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
         UserVmVO vm = userVmDao.findById(vmId);
         String cantHandleLog = String.format("Default VM snapshot cannot handle VM snapshot for [%s]", vm);
+
+        if (isRunningVMVolumeOnCLVMStorage(vm, cantHandleLog)) {
+            return StrategyPriority.CANT_HANDLE;
+        }
+
         if (State.Running.equals(vm.getState()) && !snapshotMemory) {
             logger.debug("{} as it is running and its memory will not be affected.", cantHandleLog, vm);
             return StrategyPriority.CANT_HANDLE;
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
index 31b13fc279e..4ae6e26fbd9 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
@@ -345,6 +345,13 @@ public class StorageVMSnapshotStrategy extends DefaultVMSnapshotStrategy {
            }
        }
 
+       Long vmId = vmSnapshot.getVmId();
+       UserVmVO vm = userVmDao.findById(vmId);
+       String cantHandleLog = String.format("Storage VM snapshot strategy cannot handle VM snapshot for [%s]", vm);
+       if (vm != null && isRunningVMVolumeOnCLVMStorage(vm, cantHandleLog)) {
+           return StrategyPriority.CANT_HANDLE;
+       }
+
        if ( SnapshotManager.VmStorageSnapshotKvm.value() && userVm.getHypervisorType() == Hypervisor.HypervisorType.KVM
                     && vmSnapshot.getType() == VMSnapshot.Type.Disk) {
            return StrategyPriority.HYPERVISOR;
diff --git a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategyTest.java b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategyTest.java
index 41bfaa6f0c7..c27d4e13fa4 100644
--- a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategyTest.java
+++ b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategyTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.StoragePool;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
@@ -322,4 +323,236 @@ public class DefaultSnapshotStrategyTest {
         prepareMocksForIsSnapshotStoredOnSameZoneStoreForQCOW2VolumeTest(100L);
         Assert.assertTrue(defaultSnapshotStrategySpy.isSnapshotStoredOnSameZoneStoreForQCOW2Volume(snapshot, volumeVO));
     }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_NullVolume() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, null));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_NullPoolId() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(null);
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_NullPool() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn(null);
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_NonCLVMPool() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_RBDPool() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.RBD);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_CLVMPoolNoSnapshotStores() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        Mockito.when(snapshotDataStoreDao.listReadyBySnapshot(1L, DataStoreRole.Image)).thenReturn(new ArrayList<>());
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_CLVMPoolSnapshotInDifferentZone() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+        Mockito.when(volumeVO.getDataCenterId()).thenReturn(100L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        SnapshotDataStoreVO snapshotStore1 = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore1.getDataStoreId()).thenReturn(201L);
+        Mockito.when(snapshotStore1.getRole()).thenReturn(DataStoreRole.Image);
+
+        SnapshotDataStoreVO snapshotStore2 = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore2.getDataStoreId()).thenReturn(202L);
+        Mockito.when(snapshotStore2.getRole()).thenReturn(DataStoreRole.Image);
+
+        Mockito.when(snapshotDataStoreDao.listReadyBySnapshot(1L, DataStoreRole.Image))
+            .thenReturn(List.of(snapshotStore1, snapshotStore2));
+
+        Mockito.when(dataStoreManager.getStoreZoneId(201L, DataStoreRole.Image)).thenReturn(111L);
+        Mockito.when(dataStoreManager.getStoreZoneId(202L, DataStoreRole.Image)).thenReturn(112L);
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_CLVMPoolSnapshotInSameZone() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+        Mockito.when(volumeVO.getDataCenterId()).thenReturn(100L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        SnapshotDataStoreVO snapshotStore = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore.getDataStoreId()).thenReturn(201L);
+        Mockito.when(snapshotStore.getRole()).thenReturn(DataStoreRole.Image);
+
+        Mockito.when(snapshotDataStoreDao.listReadyBySnapshot(1L, DataStoreRole.Image))
+            .thenReturn(List.of(snapshotStore));
+
+        Mockito.when(dataStoreManager.getStoreZoneId(201L, DataStoreRole.Image)).thenReturn(100L);
+
+        Assert.assertTrue(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_CLVMPoolMultipleSnapshotsOneMatches() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+        Mockito.when(volumeVO.getDataCenterId()).thenReturn(100L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        SnapshotDataStoreVO snapshotStore1 = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore1.getDataStoreId()).thenReturn(201L);
+        Mockito.when(snapshotStore1.getRole()).thenReturn(DataStoreRole.Image);
+
+        SnapshotDataStoreVO snapshotStore2 = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore2.getDataStoreId()).thenReturn(202L);
+        Mockito.when(snapshotStore2.getRole()).thenReturn(DataStoreRole.Image);
+
+        SnapshotDataStoreVO snapshotStore3 = Mockito.mock(SnapshotDataStoreVO.class);
+
+        Mockito.when(snapshotDataStoreDao.listReadyBySnapshot(1L, DataStoreRole.Image))
+            .thenReturn(List.of(snapshotStore1, snapshotStore2, snapshotStore3));
+
+        Mockito.when(dataStoreManager.getStoreZoneId(201L, DataStoreRole.Image)).thenReturn(111L);
+        Mockito.when(dataStoreManager.getStoreZoneId(202L, DataStoreRole.Image)).thenReturn(100L);
+
+        Assert.assertTrue(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_CLVMPoolNullZoneIds() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+        Mockito.when(volumeVO.getDataCenterId()).thenReturn(100L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        SnapshotDataStoreVO snapshotStore = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore.getDataStoreId()).thenReturn(201L);
+        Mockito.when(snapshotStore.getRole()).thenReturn(DataStoreRole.Image);
+
+        Mockito.when(snapshotDataStoreDao.listReadyBySnapshot(1L, DataStoreRole.Image))
+            .thenReturn(List.of(snapshotStore));
+
+        Mockito.when(dataStoreManager.getStoreZoneId(201L, DataStoreRole.Image)).thenReturn(null);
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_CLVMPoolVolumeNullDataCenter() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+        Mockito.when(volumeVO.getDataCenterId()).thenReturn(1L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        SnapshotDataStoreVO snapshotStore = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore.getDataStoreId()).thenReturn(201L);
+        Mockito.when(snapshotStore.getRole()).thenReturn(DataStoreRole.Image);
+
+        Mockito.when(snapshotDataStoreDao.listReadyBySnapshot(1L, DataStoreRole.Image))
+            .thenReturn(List.of(snapshotStore));
+
+        Mockito.when(dataStoreManager.getStoreZoneId(201L, DataStoreRole.Image)).thenReturn(100L);
+
+        Assert.assertFalse(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
+
+    @Test
+    public void testIsSnapshotStoredOnSecondaryForCLVMVolume_CLVMPoolMultipleSnapshotsAllInSameZone() {
+        Snapshot snapshot = Mockito.mock(Snapshot.class);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+
+        VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
+        Mockito.when(volumeVO.getPoolId()).thenReturn(10L);
+        Mockito.when(volumeVO.getDataCenterId()).thenReturn(100L);
+
+        StoragePool pool = Mockito.mock(StoragePool.class, Mockito.withSettings().extraInterfaces(DataStore.class));
+        Mockito.when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(dataStoreManager.getDataStore(10L, DataStoreRole.Primary)).thenReturn((DataStore) pool);
+
+        SnapshotDataStoreVO snapshotStore1 = Mockito.mock(SnapshotDataStoreVO.class);
+        Mockito.when(snapshotStore1.getDataStoreId()).thenReturn(201L);
+        Mockito.when(snapshotStore1.getRole()).thenReturn(DataStoreRole.Image);
+
+        SnapshotDataStoreVO snapshotStore2 = Mockito.mock(SnapshotDataStoreVO.class);
+
+        Mockito.when(snapshotDataStoreDao.listReadyBySnapshot(1L, DataStoreRole.Image))
+            .thenReturn(List.of(snapshotStore1, snapshotStore2));
+
+        Mockito.when(dataStoreManager.getStoreZoneId(201L, DataStoreRole.Image)).thenReturn(100L);
+
+        Assert.assertTrue(defaultSnapshotStrategySpy.isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO));
+    }
 }
diff --git a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategyTest.java b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategyTest.java
index da377f96ec3..365ba3d4eb3 100644
--- a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategyTest.java
+++ b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategyTest.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
@@ -39,6 +40,10 @@ import com.cloud.storage.Storage;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.snapshot.VMSnapshot;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultVMSnapshotStrategyTest {
@@ -46,6 +51,8 @@ public class DefaultVMSnapshotStrategyTest {
     VolumeDao volumeDao;
     @Mock
     PrimaryDataStoreDao primaryDataStoreDao;
+    @Mock
+    UserVmDao userVmDao;
 
     @Spy
     @InjectMocks
@@ -85,7 +92,7 @@ public class DefaultVMSnapshotStrategyTest {
         Mockito.when(vol2.getChainInfo()).thenReturn(newVolChain);
         Mockito.when(vol2.getSize()).thenReturn(vmSnapshotChainSize);
         Mockito.when(vol2.getId()).thenReturn(volumeId);
-        VolumeVO volumeVO = new VolumeVO("name", 0l, 0l, 0l, 0l, 0l, "folder", "path", Storage.ProvisioningType.THIN, 0l, Volume.Type.ROOT);
+        VolumeVO volumeVO = new VolumeVO("name", 0L, 0L, 0L, 0L, 0L, "folder", "path", Storage.ProvisioningType.THIN, 0L, Volume.Type.ROOT);
         volumeVO.setPoolId(oldPoolId);
         volumeVO.setChainInfo(oldVolChain);
         volumeVO.setPath(oldVolPath);
@@ -103,4 +110,110 @@ public class DefaultVMSnapshotStrategyTest {
         Assert.assertEquals(vmSnapshotChainSize, persistedVolume.getVmSnapshotChainSize());
         Assert.assertEquals(newVolChain, persistedVolume.getChainInfo());
     }
+
+    @Test
+    public void testCanHandleRunningVMOnClvmStorageCantHandle() {
+        Long vmId = 1L;
+        VMSnapshot vmSnapshot = Mockito.mock(VMSnapshot.class);
+        Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId);
+
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        Mockito.when(vm.getId()).thenReturn(vmId);
+        Mockito.when(vm.getState()).thenReturn(State.Running);
+        Mockito.when(userVmDao.findById(vmId)).thenReturn(vm);
+
+        VolumeVO volumeOnClvm = createVolume(vmId, 1L);
+        List<VolumeVO> volumes = List.of(volumeOnClvm);
+        Mockito.when(volumeDao.findByInstance(vmId)).thenReturn(volumes);
+
+        StoragePoolVO clvmPool = createStoragePool("clvm-pool", Storage.StoragePoolType.CLVM);
+        Mockito.when(primaryDataStoreDao.findById(1L)).thenReturn(clvmPool);
+
+        StrategyPriority result = defaultVMSnapshotStrategy.canHandle(vmSnapshot);
+
+        Assert.assertEquals("Should return CANT_HANDLE for running VM on CLVM storage",
+                StrategyPriority.CANT_HANDLE, result);
+    }
+
+    @Test
+    public void testCanHandleStoppedVMOnClvmStorageCanHandle() {
+        Long vmId = 1L;
+        VMSnapshot vmSnapshot = Mockito.mock(VMSnapshot.class);
+        Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId);
+
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        Mockito.when(vm.getId()).thenReturn(vmId);
+        Mockito.when(vm.getState()).thenReturn(State.Stopped);
+        Mockito.when(userVmDao.findById(vmId)).thenReturn(vm);
+
+        StrategyPriority result = defaultVMSnapshotStrategy.canHandle(vmSnapshot);
+        Assert.assertEquals("Should return DEFAULT for stopped VM on CLVM storage",
+                StrategyPriority.DEFAULT, result);
+    }
+
+    @Test
+    public void testCanHandleRunningVMOnNfsStorageCanHandle() {
+        Long vmId = 1L;
+        VMSnapshot vmSnapshot = Mockito.mock(VMSnapshot.class);
+        Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId);
+
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        Mockito.when(vm.getId()).thenReturn(vmId);
+        Mockito.when(vm.getState()).thenReturn(State.Running);
+        Mockito.when(userVmDao.findById(vmId)).thenReturn(vm);
+
+        VolumeVO volumeOnNfs = createVolume(vmId, 1L);
+        List<VolumeVO> volumes = List.of(volumeOnNfs);
+        Mockito.when(volumeDao.findByInstance(vmId)).thenReturn(volumes);
+
+        StoragePoolVO nfsPool = createStoragePool("nfs-pool", Storage.StoragePoolType.NetworkFilesystem);
+        Mockito.when(primaryDataStoreDao.findById(1L)).thenReturn(nfsPool);
+
+        StrategyPriority result = defaultVMSnapshotStrategy.canHandle(vmSnapshot);
+
+        Assert.assertEquals("Should return DEFAULT for running VM on NFS storage",
+                StrategyPriority.DEFAULT, result);
+    }
+
+    @Test
+    public void testCanHandleRunningVMWithMixedStorageClvmAndNfsCantHandle() {
+        // Arrange - VM has volumes on both CLVM and NFS
+        Long vmId = 1L;
+        VMSnapshot vmSnapshot = Mockito.mock(VMSnapshot.class);
+        Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId);
+
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        Mockito.when(vm.getId()).thenReturn(vmId);
+        Mockito.when(vm.getState()).thenReturn(State.Running);
+        Mockito.when(userVmDao.findById(vmId)).thenReturn(vm);
+
+        VolumeVO volumeOnClvm = createVolume(vmId, 1L);
+        VolumeVO volumeOnNfs = createVolume(vmId, 2L);
+        List<VolumeVO> volumes = List.of(volumeOnClvm, volumeOnNfs);
+        Mockito.when(volumeDao.findByInstance(vmId)).thenReturn(volumes);
+
+        StoragePoolVO clvmPool = createStoragePool("clvm-pool", Storage.StoragePoolType.CLVM);
+        StoragePoolVO nfsPool = createStoragePool("nfs-pool", Storage.StoragePoolType.NetworkFilesystem);
+        Mockito.when(primaryDataStoreDao.findById(1L)).thenReturn(clvmPool);
+
+        StrategyPriority result = defaultVMSnapshotStrategy.canHandle(vmSnapshot);
+
+        Assert.assertEquals("Should return CANT_HANDLE if any volume is on CLVM storage for running VM",
+                StrategyPriority.CANT_HANDLE, result);
+    }
+
+    private VolumeVO createVolume(Long vmId, Long poolId) {
+        VolumeVO volume = new VolumeVO("volume", 0L, 0L, 0L, 0L, 0L,
+                "folder", "path", Storage.ProvisioningType.THIN, 0L, Volume.Type.ROOT);
+        volume.setInstanceId(vmId);
+        volume.setPoolId(poolId);
+        return volume;
+    }
+
+    private StoragePoolVO createStoragePool(String name, Storage.StoragePoolType poolType) {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        Mockito.when(pool.getName()).thenReturn(name);
+        Mockito.when(pool.getPoolType()).thenReturn(poolType);
+        return pool;
+    }
 }
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index 061d18dc376..7eee32b9f1b 100644
--- a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -32,8 +32,12 @@ import javax.inject.Inject;
 
 import com.cloud.dc.DedicatedResourceVO;
 import com.cloud.dc.dao.DedicatedResourceDao;
+import com.cloud.storage.Volume;
+import com.cloud.storage.clvm.ClvmPoolManager;
+import com.cloud.storage.dao.VolumeDetailsDao;
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
+import com.cloud.utils.db.QueryBuilder;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -46,6 +50,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.storage.LocalHostEndpoint;
 import org.apache.cloudstack.storage.RemoteHostEndPoint;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
@@ -59,8 +64,8 @@ import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.Storage.TemplateType;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import com.cloud.utils.db.DB;
-import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -75,6 +80,12 @@ public class DefaultEndPointSelector implements EndPointSelector {
     private HostDao hostDao;
     @Inject
     private DedicatedResourceDao dedicatedResourceDao;
+    @Inject
+    private PrimaryDataStoreDao _storagePoolDao;
+    @Inject
+    private VolumeDetailsDao _volDetailsDao;
+    @Inject
+    private ClvmPoolManager clvmPoolManager;
 
     private static final String VOL_ENCRYPT_COLUMN_NAME = "volume_encryption_support";
     private final String findOneHostOnPrimaryStorage = "select t.id from "
@@ -264,6 +275,27 @@ public class DefaultEndPointSelector implements EndPointSelector {
 
     @Override
     public EndPoint select(DataObject srcData, DataObject destData, boolean volumeEncryptionSupportRequired) {
+        if (destData instanceof VolumeInfo) {
+            EndPoint clvmEndpoint = selectClvmEndpointIfApplicable((VolumeInfo) destData, "template-to-volume copy");
+            if (clvmEndpoint != null) {
+                return clvmEndpoint;
+            }
+        }
+
+        // Check if SOURCE is a CLVM volume with active lock (for operations copying FROM CLVM to secondary storage)
+        if (srcData instanceof VolumeInfo) {
+            VolumeInfo srcVolume = (VolumeInfo) srcData;
+            DataStore srcStore = srcVolume.getDataStore();
+            if (srcStore.getRole() == DataStoreRole.Primary) {
+                StoragePoolVO pool = _storagePoolDao.findById(srcStore.getId());
+                EndPoint clvmEp = tryRouteToClvmLockHolder(srcVolume, pool, "copy operation");
+                if (clvmEp != null) {
+                    return clvmEp;
+                }
+            }
+        }
+
+        // Default behavior for non-CLVM or when no destination host is set
         DataStore srcStore = srcData.getDataStore();
         DataStore destStore = destData.getDataStore();
         if (moveBetweenPrimaryImage(srcStore, destStore)) {
@@ -305,7 +337,6 @@ public class DefaultEndPointSelector implements EndPointSelector {
 
     @Override
     public EndPoint select(DataObject srcData, DataObject destData, StorageAction action, boolean encryptionRequired) {
-        logger.error("IR24 select BACKUPSNAPSHOT from primary to secondary {} dest={}", srcData, destData);
         if (action == StorageAction.BACKUPSNAPSHOT && srcData.getDataStore().getRole() == DataStoreRole.Primary) {
             SnapshotInfo srcSnapshot = (SnapshotInfo)srcData;
             VolumeInfo volumeInfo = srcSnapshot.getBaseVolume();
@@ -314,6 +345,17 @@ public class DefaultEndPointSelector implements EndPointSelector {
                 if (vm != null && vm.getState() == VirtualMachine.State.Running) {
                     return getEndPointFromHostId(vm.getHostId());
                 }
+                // For CLVM pools, the snapshot LVM device only exists on the lock-holder host.
+                // Route the backup CopyCommand to that same host regardless of VM state.
+                DataStore srcStore = volumeInfo.getDataStore();
+                if (srcStore != null && srcStore.getRole() == DataStoreRole.Primary) {
+                    StoragePoolVO pool = _storagePoolDao.findById(srcStore.getId());
+                    logger.debug("Checking if CLVM store and lock-holder routing applicable for snapshot {}", srcSnapshot.getUuid());
+                    EndPoint clvmEp = tryRouteToClvmLockHolder(volumeInfo, pool, "snapshot backup");
+                    if (clvmEp != null) {
+                        return clvmEp;
+                    }
+                }
             }
             if (srcSnapshot.getHypervisorType() == Hypervisor.HypervisorType.VMware) {
                 if (vm != null) {
@@ -388,18 +430,103 @@ public class DefaultEndPointSelector implements EndPointSelector {
         return sc.list();
     }
 
+    /**
+     * Selects endpoint for CLVM volumes with destination host hint.
+     * This ensures volumes are created on the correct host with exclusive locks.
+     *
+     * @param volume The volume to check for CLVM routing
+     * @param operation Description of the operation (for logging)
+     * @return EndPoint for the destination host if CLVM routing applies, null otherwise
+     */
+    private EndPoint selectClvmEndpointIfApplicable(VolumeInfo volume, String operation) {
+        DataStore store = volume.getDataStore();
+
+        if (store.getRole() != DataStoreRole.Primary) {
+            return null;
+        }
+
+
+        // Check if this is a CLVM pool
+        StoragePoolVO pool = _storagePoolDao.findById(store.getId());
+        if (pool == null || !ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            return null;
+        }
+        if (Volume.State.Allocated == volume.getState()) {
+            // Check if destination host hint is set
+            Long destHostId = volume.getDestinationHostId();
+            if (destHostId == null) {
+                return null;
+            }
+
+            logger.info("CLVM {}: routing volume {} to destination host {} for optimal exclusive lock placement",
+                    operation, volume.getUuid(), destHostId);
+
+            EndPoint ep = getEndPointFromHostId(destHostId);
+            if (ep != null) {
+                return ep;
+            }
+        }
+
+        Long lockHostId = getClvmLockHostId(volume);
+        if (lockHostId == null) {
+            return null;
+        }
+        logger.info("CLVM {}: routing existing volume {} to live lock-holder host {}",
+                operation, volume.getUuid(), lockHostId);
+        EndPoint ep = getEndPointFromHostId(lockHostId);
+        if (ep != null) {
+            return ep;
+        }
+        logger.warn("Could not get endpoint for lock host {}, falling back to default selection", lockHostId);
+        return null;
+    }
+
     @Override
     public EndPoint select(DataObject object, boolean encryptionSupportRequired) {
         DataStore store = object.getDataStore();
+
+        // This ensures volumes are created on the correct host with exclusive locks
+        String operation = "";
+        if (DataStoreRole.Primary == store.getRole()) {
+            VolumeInfo volume = null;
+            if (object instanceof VolumeInfo) {
+                volume = (VolumeInfo) object;
+                operation = "volume creation";
+            } else if (object instanceof SnapshotInfo) {
+                volume = ((SnapshotInfo) object).getBaseVolume();
+                operation = "snapshot creation";
+            }
+
+            if (volume != null) {
+                EndPoint clvmEndpoint = selectClvmEndpointIfApplicable(volume, operation);
+                if (clvmEndpoint != null) {
+                    return clvmEndpoint;
+                }
+            }
+        }
+
+        // Default behavior for non-CLVM or when no destination host is set
         if (store.getRole() == DataStoreRole.Primary) {
             return findEndPointInScope(store.getScope(), findOneHostOnPrimaryStorage, store.getId(), encryptionSupportRequired);
         }
         throw new CloudRuntimeException(String.format("Storage role %s doesn't support encryption", store.getRole()));
     }
 
+
     @Override
     public EndPoint select(DataObject object) {
         DataStore store = object.getDataStore();
+
+        // For CLVM volumes, check if there's a lock host ID to route to
+        if (object instanceof VolumeInfo && store.getRole() == DataStoreRole.Primary) {
+            VolumeInfo volume = (VolumeInfo) object;
+            StoragePoolVO pool = _storagePoolDao.findById(store.getId());
+            EndPoint clvmEp = tryRouteToClvmLockHolder(volume, pool, "operation");
+            if (clvmEp != null) {
+                return clvmEp;
+            }
+        }
+
         EndPoint ep = select(store);
         if (ep != null) {
             return ep;
@@ -493,6 +620,19 @@ public class DefaultEndPointSelector implements EndPointSelector {
             }
             case DELETEVOLUME: {
                 VolumeInfo volume = (VolumeInfo) object;
+
+                // For CLVM volumes, route to the host holding the exclusive lock
+                if (volume.getHypervisorType() == Hypervisor.HypervisorType.KVM) {
+                    DataStore store = volume.getDataStore();
+                    if (store.getRole() == DataStoreRole.Primary) {
+                        StoragePoolVO pool = _storagePoolDao.findById(store.getId());
+                        EndPoint clvmEp = tryRouteToClvmLockHolder(volume, pool, "deletion");
+                        if (clvmEp != null) {
+                            return clvmEp;
+                        }
+                    }
+                }
+
                 if (volume.getHypervisorType() == Hypervisor.HypervisorType.VMware) {
                     VirtualMachine vm = volume.getAttachedVM();
                     if (vm != null) {
@@ -540,6 +680,14 @@ public class DefaultEndPointSelector implements EndPointSelector {
 
         if (vm.getState() == VirtualMachine.State.Running) {
             return getEndPointFromHostId(vm.getHostId());
+        } else if (vm.getState() == VirtualMachine.State.Stopped) {
+            StoragePoolVO pool = _storagePoolDao.findById(volumeInfo.getPoolId());
+            if (pool != null && ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+                EndPoint ep = getApplicableEndpointForClvm(snapshotInfo, volumeInfo);
+                if (ep != null) {
+                    return ep;
+                }
+            }
         }
 
         Long hostId = vm.getLastHostId();
@@ -552,6 +700,20 @@ public class DefaultEndPointSelector implements EndPointSelector {
         return select(snapshotInfo, encryptionRequired);
     }
 
+    private EndPoint getApplicableEndpointForClvm(SnapshotInfo snapshotInfo, VolumeInfo volumeInfo) {
+        Long lockHostId = getClvmLockHostId(volumeInfo);
+        if (lockHostId != null) {
+            logger.debug("CLVM snapshot operation: routing snapshot [{}] to lock-holder host [{}]",
+                    snapshotInfo.getUuid(), lockHostId);
+            EndPoint ep = getEndPointFromHostId(lockHostId);
+            if (ep != null) {
+                return ep;
+            }
+            logger.warn("Could not get endpoint for CLVM lock host {}, falling back", lockHostId);
+        }
+        return null;
+    }
+
     @Override
     public EndPoint select(Scope scope, Long storeId) {
         return findEndPointInScope(scope, findOneHostOnPrimaryStorage, storeId);
@@ -589,4 +751,46 @@ public class DefaultEndPointSelector implements EndPointSelector {
         }
         return endPoints;
     }
+
+    protected EndPoint tryRouteToClvmLockHolder(VolumeInfo volume, StoragePoolVO pool, String operation) {
+        if (pool == null || !ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            return null;
+        }
+        Long lockHostId = getClvmLockHostId(volume);
+        if (lockHostId == null) {
+            logger.debug("No CLVM lock host tracked for volume {}, using default endpoint selection", volume.getUuid());
+            return null;
+        }
+        logger.info("Routing CLVM volume {} {} to lock holder host {}", volume.getUuid(), operation, lockHostId);
+        EndPoint ep = getEndPointFromHostId(lockHostId);
+        if (ep != null) {
+            return ep;
+        }
+        logger.warn("Could not get endpoint for CLVM lock host {}, falling back to default selection", lockHostId);
+        return null;
+    }
+
+    /**
+     * Gets the CLVM lock host ID for a volume by querying actual LVM state.
+     *
+     * @param volume The CLVM volume
+     * @return Host ID holding the lock, or null if not found
+     */
+    protected Long getClvmLockHostId(VolumeInfo volume) {
+        StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
+
+        Long lockHostId = clvmPoolManager.getClvmLockHostId(
+                volume.getId(),
+                volume.getUuid(),
+                volume.getPath(),
+                pool,
+                true
+        );
+
+        if (lockHostId != null) {
+            logger.debug("Found actual lock host {} for volume {} via LVM query", lockHostId, volume.getUuid());
+        }
+
+        return lockHostId;
+    }
 }
diff --git a/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java b/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java
index 9f01ab162ba..ca124ec30f0 100644
--- a/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java
+++ b/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java
@@ -17,20 +17,41 @@
 package org.apache.cloudstack.storage.endpoint;
 
 
+import com.cloud.host.Host;
+import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.Volume;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.DataStoreRole;
+import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.VolumeDetailVO;
+import com.cloud.storage.dao.VolumeDetailsDao;
 import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
+import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
 import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.StorageAction;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.storage.RemoteHostEndPoint;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mockStatic;
+
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultEndPointSelectorTest {
 
@@ -46,12 +67,55 @@ public class DefaultEndPointSelectorTest {
     @Mock
     private DataStore datastoreMock;
 
-    @Spy
-    private DefaultEndPointSelector defaultEndPointSelectorSpy;
+    @Mock
+    private StoragePoolVO storagePoolVOMock;
+
+    @Mock
+    private PrimaryDataStoreDao _storagePoolDao;
+
+    @Mock
+    private VolumeDetailsDao _volDetailsDao;
+
+    @Mock
+    private VolumeDetailVO volumeDetailVOMock;
+
+    @Mock
+    private EndPoint endPointMock;
+
+    @Mock
+    ClvmPoolManager clvmPoolManager;
+
+    @Mock
+    HostDao hostDao;
+
+    static MockedStatic<RemoteHostEndPoint> remoteHostEndPointMock;
+
+    @InjectMocks
+    private DefaultEndPointSelector defaultEndPointSelectorSpy = Mockito.spy(new DefaultEndPointSelector());
+
+    private static final Long VOLUME_ID = 1L;
+    private static final Long HOST_ID = 10L;
+    private static final Long DEST_HOST_ID = 20L;
+    private static final Long STORE_ID = 100L;
+    private static final String VOLUME_UUID = "test-volume-uuid";
+
+    @BeforeClass
+    public static void init() {
+        remoteHostEndPointMock = mockStatic(RemoteHostEndPoint.class);
+    }
+
+    @AfterClass
+    public static void close() {
+        remoteHostEndPointMock.close();
+    }
 
     @Before
     public void setup() {
         Mockito.doReturn(volumeInfoMock).when(snapshotInfoMock).getBaseVolume();
+
+        // Common volume mock setup
+        Mockito.when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
+        Mockito.when(volumeInfoMock.getUuid()).thenReturn(VOLUME_UUID);
     }
 
     @Test
@@ -197,4 +261,293 @@ public class DefaultEndPointSelectorTest {
         Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(snapshotInfoMock, false);
     }
 
+
+    @Test
+    public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.when(volumeInfoMock.getDestinationHostId()).thenReturn(DEST_HOST_ID);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(DEST_HOST_ID);
+        Mockito.when(volumeInfoMock.getState()).thenReturn(Volume.State.Allocated);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(DEST_HOST_ID);
+    }
+
+    @Test
+    public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM_NG() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM_NG);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(DEST_HOST_ID);
+        Mockito.doReturn(DEST_HOST_ID).when(defaultEndPointSelectorSpy).getClvmLockHostId(volumeInfoMock);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(DEST_HOST_ID);
+    }
+
+    @Test
+    public void testSelectClvmEndpoint_VolumeWithoutDestinationHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.when(volumeInfoMock.getDestinationHostId()).thenReturn(null);
+        Mockito.when(datastoreMock.getScope()).thenReturn(Mockito.mock(Scope.class));
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).findEndPointInScope(
+                Mockito.any(), Mockito.anyString(), Mockito.eq(STORE_ID), Mockito.eq(false));
+        Mockito.when(volumeInfoMock.getState()).thenReturn(Volume.State.Allocated);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, false);
+
+        assertNotNull(result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.never()).getEndPointFromHostId(DEST_HOST_ID);
+    }
+
+    @Test
+    public void testSelectClvmEndpoint_NonCLVMPool() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.NetworkFilesystem);
+        Mockito.when(datastoreMock.getScope()).thenReturn(Mockito.mock(Scope.class));
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).findEndPointInScope(
+                Mockito.any(), Mockito.anyString(), Mockito.eq(STORE_ID), Mockito.eq(false));
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, false);
+
+        assertNotNull(result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.never()).getEndPointFromHostId(DEST_HOST_ID);
+    }
+
+    @Test
+    public void testSelectClvmEndpoint_SnapshotWithBaseVolumeDestHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(snapshotInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(snapshotInfoMock.getBaseVolume()).thenReturn(volumeInfoMock);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM_NG);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(DEST_HOST_ID);
+        Mockito.doReturn(DEST_HOST_ID).when(defaultEndPointSelectorSpy).getClvmLockHostId(volumeInfoMock);
+        Mockito.when(volumeInfoMock.getState()).thenReturn(Volume.State.Creating);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(snapshotInfoMock, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(DEST_HOST_ID);
+    }
+
+    @Test
+    public void testSelectWithAction_DeleteVolume_CLVMWithLockHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(volumeInfoMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.doReturn(HOST_ID).when(defaultEndPointSelectorSpy).getClvmLockHostId(volumeInfoMock);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(HOST_ID);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, StorageAction.DELETEVOLUME, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(HOST_ID);
+    }
+
+    @Test
+    public void testSelectWithAction_DeleteVolume_CLVM_NG_WithLockHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(volumeInfoMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM_NG);
+        Mockito.doReturn(HOST_ID).when(defaultEndPointSelectorSpy).getClvmLockHostId(volumeInfoMock);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(HOST_ID);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, StorageAction.DELETEVOLUME, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(HOST_ID);
+    }
+
+    @Test
+    public void testSelectWithAction_DeleteVolume_CLVMWithoutLockHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(volumeInfoMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).select(volumeInfoMock, false);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, StorageAction.DELETEVOLUME, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(volumeInfoMock, false);
+    }
+
+    @Test
+    public void testSelectWithAction_DeleteVolume_NonCLVM() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(volumeInfoMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.NetworkFilesystem);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).select(volumeInfoMock, false);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock, StorageAction.DELETEVOLUME, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(_volDetailsDao, Mockito.never()).findDetail(Mockito.anyLong(), Mockito.anyString());
+    }
+
+    @Test
+    public void testSelectObject_CLVMVolumeWithLockHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.doReturn(HOST_ID).when(defaultEndPointSelectorSpy).getClvmLockHostId(volumeInfoMock);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(HOST_ID);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(HOST_ID);
+    }
+
+    @Test
+    public void testSelectObject_CLVM_NG_VolumeWithLockHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM_NG);
+        Mockito.doReturn(HOST_ID).when(defaultEndPointSelectorSpy).getClvmLockHostId(volumeInfoMock);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(HOST_ID);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(HOST_ID);
+    }
+
+    @Test
+    public void testSelectObject_CLVMVolumeWithoutLockHost() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).select(datastoreMock);
+        RemoteHostEndPoint ep = Mockito.mock(RemoteHostEndPoint.class);
+        Host lockHost = Mockito.mock(Host.class);
+        remoteHostEndPointMock.when(() -> RemoteHostEndPoint.getHypervisorHostEndPoint(lockHost)).thenReturn(ep);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(datastoreMock);
+    }
+
+    @Test
+    public void testSelectObject_CLVMVolumeWithInvalidLockHostId() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).select(datastoreMock);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(datastoreMock);
+    }
+
+    @Test
+    public void testSelectObject_CLVMVolumeWithEmptyLockHostId() {
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).select(datastoreMock);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(volumeInfoMock);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(datastoreMock);
+    }
+
+    @Test
+    public void testSelectTwoObjects_TemplateToVolume_CLVMWithDestHost() {
+        DataObject srcDataMock = Mockito.mock(DataObject.class);
+
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM_NG);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).getEndPointFromHostId(DEST_HOST_ID);
+        Mockito.doReturn(DEST_HOST_ID).when(defaultEndPointSelectorSpy).getClvmLockHostId(volumeInfoMock);
+        Mockito.when(volumeInfoMock.getState()).thenReturn(Volume.State.Creating);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(srcDataMock, volumeInfoMock, false);
+
+        assertNotNull(result);
+        assertEquals(endPointMock, result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).getEndPointFromHostId(DEST_HOST_ID);
+    }
+
+    @Test
+    public void testSelectTwoObjects_TemplateToVolume_CLVMWithoutDestHost() {
+        DataObject srcDataMock = Mockito.mock(DataObject.class);
+        DataStore srcStoreMock = Mockito.mock(DataStore.class);
+
+        Mockito.when(srcDataMock.getDataStore()).thenReturn(srcStoreMock);
+        Mockito.when(srcStoreMock.getRole()).thenReturn(DataStoreRole.Image);
+
+        Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
+        Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
+        Mockito.when(_storagePoolDao.findById(STORE_ID)).thenReturn(storagePoolVOMock);
+        Mockito.when(storagePoolVOMock.getPoolType()).thenReturn(StoragePoolType.CLVM);
+        Mockito.doReturn(endPointMock).when(defaultEndPointSelectorSpy).findEndPointForImageMove(
+                srcStoreMock, datastoreMock, false);
+
+        EndPoint result = defaultEndPointSelectorSpy.select(srcDataMock, volumeInfoMock, false);
+
+        assertNotNull(result);
+        Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).findEndPointForImageMove(srcStoreMock, datastoreMock, false);
+    }
+
 }
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
index 7de9000782e..7644d4688f7 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
@@ -37,6 +37,7 @@ import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.offerings.NetworkOfferingVO;
 import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.Storage;
 import com.cloud.storage.StorageManager;
@@ -139,6 +140,18 @@ public class DefaultHostListener implements HypervisorHostListener {
         Map<String, String> nfsMountOpts = storageManager.getStoragePoolNFSMountOpts(pool, null).first();
 
         Optional.ofNullable(nfsMountOpts).ifPresent(detailsMap::putAll);
+
+        // Propagate CLVM secure zero-fill setting to the host
+        // Note: This is done during host connection (agent start, MS restart, host reconnection)
+        // so the setting is non-dynamic. Changes require host reconnection to take effect.
+        if (ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            Boolean clvmSecureZeroFill = ClvmPoolManager.CLVMSecureZeroFill.valueIn(poolId);
+            if (clvmSecureZeroFill != null) {
+                detailsMap.put("clvmsecurezerofill", String.valueOf(clvmSecureZeroFill));
+                logger.debug("Added CLVM secure zero-fill setting: {} for storage pool: {}", clvmSecureZeroFill, pool);
+            }
+        }
+
         ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool, detailsMap);
         cmd.setWait(modifyStoragePoolCommandWait);
         HostVO host = hostDao.findById(hostId);
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
index 43218b3f6a0..20d677f9013 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
@@ -24,6 +24,7 @@ import com.cloud.configuration.Resource.ResourceType;
 import com.cloud.dc.VsphereStoragePolicyVO;
 import com.cloud.dc.dao.VsphereStoragePolicyDao;
 import com.cloud.storage.StorageManager;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.utils.Pair;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallbackNoReturn;
@@ -126,6 +127,7 @@ public class VolumeObject implements VolumeInfo {
     private boolean directDownload;
     private String vSphereStoragePolicyId;
     private boolean followRedirects;
+    private Long destinationHostId;  // For CLVM: hints where volume should be created
 
     private List<String> checkpointPaths;
     private Set<String> checkpointImageStoreUrls;
@@ -361,6 +363,30 @@ public class VolumeObject implements VolumeInfo {
         this.directDownload = directDownload;
     }
 
+    @Override
+    public Long getDestinationHostId() {
+        // If not in memory, try to load from the database (volume_details table)
+        // For CLVM volumes, this uses the CLVM_LOCK_HOST_ID, which serves a dual purpose:
+        // 1. During creation: hints where to create the volume
+        // 2. After creation: tracks which host holds the exclusive lock
+        if (destinationHostId == null && volumeVO != null) {
+            VolumeDetailVO detail = volumeDetailsDao.findDetail(volumeVO.getId(), ClvmPoolManager.CLVM_LOCK_HOST_ID);
+            if (detail != null && detail.getValue() != null && !detail.getValue().isEmpty()) {
+                try {
+                    destinationHostId = Long.parseLong(detail.getValue());
+                } catch (NumberFormatException e) {
+                    logger.warn("Invalid CLVM lock host ID value in volume_details for volume {}: {}", volumeVO.getUuid(), detail.getValue());
+                }
+            }
+        }
+        return destinationHostId;
+    }
+
+    @Override
+    public void setDestinationHostId(Long hostId) {
+        this.destinationHostId = hostId;
+    }
+
     public void update() {
         volumeDao.update(volumeVO.getId(), volumeVO);
         volumeVO = volumeDao.findById(volumeVO.getId());
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 8731e8791dd..6fe4c2708c5 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -32,6 +32,8 @@ import java.util.concurrent.ExecutionException;
 
 import javax.inject.Inject;
 
+import com.cloud.storage.clvm.ClvmPoolManager;
+import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
@@ -221,6 +223,8 @@ public class VolumeServiceImpl implements VolumeService {
     private PassphraseDao passphraseDao;
     @Inject
     protected DiskOfferingDao diskOfferingDao;
+    @Inject
+    ClvmPoolManager clvmPoolManager;
 
     public VolumeServiceImpl() {
     }
@@ -2970,4 +2974,173 @@ public class VolumeServiceImpl implements VolumeService {
     protected String buildVolumePath(long accountId, long volumeId) {
         return String.format("%s/%s/%s", TemplateConstants.DEFAULT_VOLUME_ROOT_DIR, accountId, volumeId);
     }
+
+    @Override
+    public boolean transferVolumeLock(VolumeInfo volume, Long sourceHostId, Long destHostId) {
+        StoragePoolVO pool = storagePoolDao.findById(volume.getPoolId());
+        if (pool == null) {
+            logger.error("Cannot transfer volume lock for volume {}: storage pool not found", volume.getUuid());
+            return false;
+        }
+
+        logger.info("Transferring CLVM lock for volume {} (pool: {}) from host {} to host {}",
+                volume.getUuid(), pool.getName(), sourceHostId, destHostId);
+
+        return clvmPoolManager.transferClvmVolumeLock(volume.getUuid(), volume.getId(), volume.getPath(),
+                pool, sourceHostId, destHostId);
+    }
+
+    @Override
+    public Long findVolumeLockHost(VolumeInfo volume) {
+        if (volume == null) {
+            logger.warn("Cannot find volume lock host: volume is null");
+            return null;
+        }
+
+        StoragePoolVO pool = storagePoolDao.findById(volume.getPoolId());
+
+        Long lockHostId = clvmPoolManager.getClvmLockHostId(
+                volume.getId(),
+                volume.getUuid(),
+                volume.getPath(),
+                pool,
+                true
+        );
+
+        if (lockHostId != null) {
+            logger.debug("Found actual lock host {} for volume {}", lockHostId, volume.getUuid());
+            return lockHostId;
+        }
+
+        Long instanceId = volume.getInstanceId();
+        if (instanceId != null) {
+            VMInstanceVO vmInstance = vmDao.findById(instanceId);
+            if (vmInstance != null && vmInstance.getHostId() != null) {
+                logger.debug("Volume {} is attached to VM {} on host {}",
+                        volume.getUuid(), vmInstance.getUuid(), vmInstance.getHostId());
+                return vmInstance.getHostId();
+            }
+        }
+
+        if (pool != null && pool.getClusterId() != null) {
+            List<HostVO> hosts = _hostDao.findByClusterId(pool.getClusterId());
+            if (hosts != null && !hosts.isEmpty()) {
+                for (HostVO host : hosts) {
+                    if (host.getStatus() == com.cloud.host.Status.Up) {
+                        logger.debug("Using fallback: first UP host {} in cluster {} for volume {}",
+                                host.getId(), pool.getClusterId(), volume.getUuid());
+                        return host.getId();
+                    }
+                }
+            }
+        }
+
+        logger.warn("Could not determine lock host for volume {}", volume.getUuid());
+        return null;
+    }
+
+    @Override
+    public VolumeInfo performLockMigration(VolumeInfo volume, Long destHostId) {
+        if (volume == null) {
+            throw new CloudRuntimeException("Cannot perform CLVM lock migration: volume is null");
+        }
+
+        String volumeUuid = volume.getUuid();
+        logger.info("Starting CLVM lock migration for volume {} (id: {}) to host {}",
+                volumeUuid, volume.getUuid(), destHostId);
+
+        Long sourceHostId = findVolumeLockHost(volume);
+        if (sourceHostId == null) {
+            logger.warn("Could not determine source host for CLVM volume {} lock, assuming volume is not exclusively locked",
+                    volumeUuid);
+            sourceHostId = destHostId;
+        }
+
+        if (sourceHostId.equals(destHostId)) {
+            logger.info("CLVM volume {} already has lock on destination host {}, no migration needed",
+                    volumeUuid, destHostId);
+            return volume;
+        }
+
+        logger.info("Migrating CLVM volume {} lock from host {} to host {}",
+                volumeUuid, sourceHostId, destHostId);
+
+        boolean success = transferVolumeLock(volume, sourceHostId, destHostId);
+        if (!success) {
+            throw new CloudRuntimeException(
+                    String.format("Failed to transfer CLVM lock for volume %s from host %s to host %s",
+                            volumeUuid, sourceHostId, destHostId));
+        }
+
+        logger.info("Successfully migrated CLVM volume {} lock from host {} to host {}",
+                volumeUuid, sourceHostId, destHostId);
+
+        return volFactory.getVolume(volume.getId());
+    }
+
+    @Override
+    public boolean areBothPoolsClvmType(StoragePoolType volumePoolType, StoragePoolType vmPoolType) {
+        if (volumePoolType == null || vmPoolType == null) {
+            logger.debug("Cannot check if both pools are CLVM type: one or both pool types are null");
+            return false;
+        }
+        return ClvmPoolManager.isClvmPoolType(volumePoolType) &&
+               ClvmPoolManager.isClvmPoolType(vmPoolType);
+    }
+
+    @Override
+    public boolean isLockTransferRequired(VolumeInfo volumeToAttach, StoragePoolType volumePoolType, StoragePoolType vmPoolType,
+                                          Long volumePoolId, Long vmPoolId, Long vmHostId) {
+        if (volumePoolType != null && !ClvmPoolManager.isClvmPoolType(volumePoolType)) {
+            return false;
+        }
+
+        if (volumePoolId == null || !volumePoolId.equals(vmPoolId)) {
+            return false;
+        }
+
+        Long volumeLockHostId = findVolumeLockHost(volumeToAttach);
+
+        if (volumeLockHostId == null) {
+            VolumeVO volumeVO = _volumeDao.findById(volumeToAttach.getId());
+            if (volumeVO != null && volumeVO.getState() == Volume.State.Ready && volumeVO.getInstanceId() == null) {
+                logger.debug("CLVM volume {} is detached on same pool, lock transfer may be needed",
+                        volumeToAttach.getUuid());
+                return true;
+            }
+        }
+
+        if (volumeLockHostId != null && vmHostId != null && !volumeLockHostId.equals(vmHostId)) {
+            logger.info("CLVM lock transfer required: Volume {} lock is on host {} but VM is on host {}",
+                    volumeToAttach.getUuid(), volumeLockHostId, vmHostId);
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean isLightweightMigrationNeeded(StoragePoolType volumePoolType, StoragePoolType vmPoolType,
+                                                String volumePoolPath, String vmPoolPath) {
+        if (!areBothPoolsClvmType(volumePoolType, vmPoolType)) {
+            return false;
+        }
+
+        String volumeVgName = extractVgNameFromPath(volumePoolPath);
+        String vmVgName = extractVgNameFromPath(vmPoolPath);
+
+        if (volumeVgName != null && volumeVgName.equals(vmVgName)) {
+            logger.info("CLVM lightweight migration detected: Volume is in same VG ({}), only lock transfer needed (no data copy)", volumeVgName);
+            return true;
+        }
+
+        return false;
+    }
+
+    private String extractVgNameFromPath(String poolPath) {
+        if (poolPath == null) {
+            return null;
+        }
+        return poolPath.startsWith("/") ? poolPath.substring(1) : poolPath;
+    }
 }
diff --git a/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeServiceImplClvmTest.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeServiceImplClvmTest.java
new file mode 100644
index 00000000000..38af2a7550b
--- /dev/null
+++ b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeServiceImplClvmTest.java
@@ -0,0 +1,520 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.storage.volume;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.eq;
+
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.storage.clvm.ClvmPoolManager;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.VolumeDao;
+
+/**
+ * Tests for CLVM lock management methods in VolumeServiceImpl.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class VolumeServiceImplClvmTest {
+
+    @Spy
+    @InjectMocks
+    private VolumeServiceImpl volumeService;
+
+    @Mock
+    private VolumeDao volumeDao;
+
+    @Mock
+    private PrimaryDataStoreDao storagePoolDao;
+
+    @Mock
+    private HostDao _hostDao;
+
+    @Mock
+    private VMInstanceDao vmDao;
+
+    @Mock
+    private VolumeDataFactory volFactory;
+
+    @Mock
+    private VolumeInfo volumeInfoMock;
+
+    @Mock
+    private VolumeVO volumeVOMock;
+
+    @Mock
+    private StoragePoolVO storagePoolVOMock;
+
+    @Mock
+    private HostVO hostVOMock;
+
+    @Mock
+    private VMInstanceVO vmInstanceVOMock;
+
+    @Mock
+    private ClvmPoolManager clvmPoolManager;
+
+    private static final Long VOLUME_ID = 1L;
+    private static final Long POOL_ID_1 = 100L;
+    private static final Long POOL_ID_2 = 200L;
+    private static final Long HOST_ID_1 = 10L;
+    private static final Long HOST_ID_2 = 20L;
+    private static final String POOL_PATH_VG1 = "/vg1";
+
+    @Before
+    public void setup() {
+        when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
+        when(volumeInfoMock.getUuid()).thenReturn("test-volume-uuid");
+        when(volumeInfoMock.getPath()).thenReturn("test-volume-path");
+
+        volumeService.storagePoolDao = storagePoolDao;
+        volumeService._hostDao = _hostDao;
+        volumeService.vmDao = vmDao;
+        volumeService.volFactory = volFactory;
+        volumeService._volumeDao = volumeDao;
+        volumeService.clvmPoolManager = clvmPoolManager;
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_BothCLVM() {
+        assertTrue(volumeService.areBothPoolsClvmType(StoragePoolType.CLVM, StoragePoolType.CLVM));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_BothCLVM_NG() {
+        assertTrue(volumeService.areBothPoolsClvmType(StoragePoolType.CLVM_NG, StoragePoolType.CLVM_NG));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_MixedCLVMAndCLVM_NG() {
+        assertTrue(volumeService.areBothPoolsClvmType(StoragePoolType.CLVM, StoragePoolType.CLVM_NG));
+        assertTrue(volumeService.areBothPoolsClvmType(StoragePoolType.CLVM_NG, StoragePoolType.CLVM));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_OneCLVMOneNFS() {
+        assertFalse(volumeService.areBothPoolsClvmType(StoragePoolType.CLVM, StoragePoolType.NetworkFilesystem));
+        assertFalse(volumeService.areBothPoolsClvmType(StoragePoolType.NetworkFilesystem, StoragePoolType.CLVM));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_OneCLVM_NGOneNFS() {
+        assertFalse(volumeService.areBothPoolsClvmType(StoragePoolType.CLVM_NG, StoragePoolType.NetworkFilesystem));
+        assertFalse(volumeService.areBothPoolsClvmType(StoragePoolType.NetworkFilesystem, StoragePoolType.CLVM_NG));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_BothNFS() {
+        assertFalse(volumeService.areBothPoolsClvmType(StoragePoolType.NetworkFilesystem, StoragePoolType.NetworkFilesystem));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_NullVolumePoolType() {
+        assertFalse(volumeService.areBothPoolsClvmType(null, StoragePoolType.CLVM));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_NullVmPoolType() {
+        assertFalse(volumeService.areBothPoolsClvmType(StoragePoolType.CLVM, null));
+    }
+
+    @Test
+    public void testAreBothPoolsClvmType_BothNull() {
+        assertFalse(volumeService.areBothPoolsClvmType(null, null));
+    }
+
+
+    @Test
+    public void testIsLockTransferRequired_NonCLVMPool() {
+        assertFalse(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.NetworkFilesystem, StoragePoolType.CLVM,
+                POOL_ID_1, POOL_ID_1, HOST_ID_1));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_DifferentPools() {
+        assertFalse(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                POOL_ID_1, POOL_ID_2, HOST_ID_1));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_NullPoolIds() {
+        assertFalse(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                null, POOL_ID_1, HOST_ID_1));
+
+        assertFalse(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                POOL_ID_1, null, HOST_ID_1));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_DetachedVolumeReady() {
+        when(volumeDao.findById(VOLUME_ID)).thenReturn(volumeVOMock);
+        when(volumeVOMock.getState()).thenReturn(Volume.State.Ready);
+        when(volumeVOMock.getInstanceId()).thenReturn(null); // Detached
+
+        when(volumeService.findVolumeLockHost(volumeInfoMock)).thenReturn(null);
+
+        assertTrue(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                POOL_ID_1, POOL_ID_1, HOST_ID_1));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_DetachedVolumeNotReady() {
+        when(volumeDao.findById(VOLUME_ID)).thenReturn(volumeVOMock);
+        when(volumeVOMock.getState()).thenReturn(Volume.State.Allocated);
+
+        when(volumeService.findVolumeLockHost(volumeInfoMock)).thenReturn(null);
+
+        assertFalse(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                POOL_ID_1, POOL_ID_1, HOST_ID_1));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_DifferentHosts() {
+        when(volumeService.findVolumeLockHost(volumeInfoMock)).thenReturn(HOST_ID_1);
+
+        assertTrue(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                POOL_ID_1, POOL_ID_1, HOST_ID_2));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_SameHost() {
+        when(volumeService.findVolumeLockHost(volumeInfoMock)).thenReturn(HOST_ID_1);
+
+        assertFalse(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                POOL_ID_1, POOL_ID_1, HOST_ID_1));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_NullVmHostId() {
+        when(volumeService.findVolumeLockHost(volumeInfoMock)).thenReturn(HOST_ID_1);
+
+        assertFalse(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM, StoragePoolType.CLVM,
+                POOL_ID_1, POOL_ID_1, null));
+    }
+
+    @Test
+    public void testIsLockTransferRequired_CLVM_NG_DifferentHosts() {
+        when(volumeService.findVolumeLockHost(volumeInfoMock)).thenReturn(HOST_ID_1);
+
+        assertTrue(volumeService.isLockTransferRequired(
+                volumeInfoMock, StoragePoolType.CLVM_NG, StoragePoolType.CLVM_NG,
+                POOL_ID_1, POOL_ID_1, HOST_ID_2));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_NonCLVMPools() {
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.NetworkFilesystem, StoragePoolType.NetworkFilesystem,
+                POOL_PATH_VG1, POOL_PATH_VG1));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_OneCLVMOneNFS() {
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.NetworkFilesystem,
+                POOL_PATH_VG1, POOL_PATH_VG1));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_SameVG() {
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "/vg1", "/vg1"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_SameVG_NoSlash() {
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "vg1", "vg1"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_SameVG_MixedSlash() {
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "/vg1", "vg1"));
+
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "vg1", "/vg1"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_DifferentVG() {
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "/vg1", "/vg2"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_CLVM_NG_SameVG() {
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM_NG, StoragePoolType.CLVM_NG,
+                "/vg1", "/vg1"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_CLVM_NG_DifferentVG() {
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM_NG, StoragePoolType.CLVM_NG,
+                "/vg1", "/vg2"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_MixedCLVM_CLVM_NG_SameVG() {
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM_NG,
+                "/vg1", "/vg1"));
+
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM_NG, StoragePoolType.CLVM,
+                "/vg1", "/vg1"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_NullVolumePath() {
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                null, "/vg1"));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_NullVmPath() {
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "/vg1", null));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_BothPathsNull() {
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                null, null));
+    }
+
+    @Test
+    public void testIsLightweightMigrationNeeded_ComplexVGNames() {
+        assertTrue(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "/cloudstack-vg-01", "/cloudstack-vg-01"));
+
+        assertFalse(volumeService.isLightweightMigrationNeeded(
+                StoragePoolType.CLVM, StoragePoolType.CLVM,
+                "/cloudstack-vg-01", "/cloudstack-vg-02"));
+    }
+
+    @Test
+    public void testTransferVolumeLock_Success() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
+        when(volumeInfoMock.getPath()).thenReturn("/dev/vg1/volume-1");
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(storagePoolVOMock.getName()).thenReturn("test-pool");
+        when(clvmPoolManager.transferClvmVolumeLock(
+                "test-volume-uuid", VOLUME_ID, "/dev/vg1/volume-1", storagePoolVOMock, HOST_ID_1, HOST_ID_2))
+                .thenReturn(true);
+
+        assertTrue(volumeService.transferVolumeLock(volumeInfoMock, HOST_ID_1, HOST_ID_2));
+    }
+
+    @Test
+    public void testTransferVolumeLock_Failure() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
+        when(volumeInfoMock.getPath()).thenReturn("/dev/vg1/volume-1");
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(storagePoolVOMock.getName()).thenReturn("test-pool");
+        when(clvmPoolManager.transferClvmVolumeLock(
+                "test-volume-uuid", VOLUME_ID, "/dev/vg1/volume-1", storagePoolVOMock, HOST_ID_1, HOST_ID_2))
+                .thenReturn(false);
+
+        assertFalse(volumeService.transferVolumeLock(volumeInfoMock, HOST_ID_1, HOST_ID_2));
+    }
+
+    @Test
+    public void testTransferVolumeLock_PoolNotFound() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(null);
+
+        assertFalse(volumeService.transferVolumeLock(volumeInfoMock, HOST_ID_1, HOST_ID_2));
+    }
+
+    @Test
+    public void testFindVolumeLockHost_NullVolume() {
+        Long result = volumeService.findVolumeLockHost(null);
+        assertNull(result);
+    }
+
+    @Test
+    public void testFindVolumeLockHost_ExplicitLockFound() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("test-volume-path"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(HOST_ID_1);
+
+        Long result = volumeService.findVolumeLockHost(volumeInfoMock);
+        assertEquals(HOST_ID_1, result);
+    }
+
+    @Test
+    public void testFindVolumeLockHost_FromAttachedVM() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("test-volume-path"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(null);
+        when(volumeInfoMock.getInstanceId()).thenReturn(100L);
+        when(vmDao.findById(100L)).thenReturn(vmInstanceVOMock);
+        when(vmInstanceVOMock.getUuid()).thenReturn("vm-uuid");
+        when(vmInstanceVOMock.getHostId()).thenReturn(HOST_ID_1);
+
+        Long result = volumeService.findVolumeLockHost(volumeInfoMock);
+        assertEquals(HOST_ID_1, result);
+    }
+
+    @Test
+    public void testFindVolumeLockHost_FallbackToClusterHost() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("test-volume-path"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(null);
+        when(volumeInfoMock.getInstanceId()).thenReturn(null);
+        when(storagePoolVOMock.getClusterId()).thenReturn(10L);
+        when(hostVOMock.getId()).thenReturn(HOST_ID_1);
+        when(hostVOMock.getStatus()).thenReturn(com.cloud.host.Status.Up);
+        when(_hostDao.findByClusterId(10L)).thenReturn(java.util.Collections.singletonList(hostVOMock));
+
+        Long result = volumeService.findVolumeLockHost(volumeInfoMock);
+        assertEquals(HOST_ID_1, result);
+    }
+
+    @Test
+    public void testFindVolumeLockHost_NoHostFound() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("test-volume-path"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(null);
+        when(volumeInfoMock.getInstanceId()).thenReturn(null);
+        when(storagePoolVOMock.getClusterId()).thenReturn(10L);
+        when(_hostDao.findByClusterId(10L)).thenReturn(java.util.Collections.emptyList());
+
+        Long result = volumeService.findVolumeLockHost(volumeInfoMock);
+        assertNull(result);
+    }
+
+    @Test
+    public void testPerformLockMigration_Success() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
+        when(volumeInfoMock.getPath()).thenReturn("/dev/vg1/volume-1");
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("/dev/vg1/volume-1"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(HOST_ID_1);
+        when(storagePoolVOMock.getName()).thenReturn("test-pool");
+        when(clvmPoolManager.transferClvmVolumeLock(
+                "test-volume-uuid", VOLUME_ID, "/dev/vg1/volume-1", storagePoolVOMock, HOST_ID_1, HOST_ID_2))
+                .thenReturn(true);
+        when(volFactory.getVolume(VOLUME_ID)).thenReturn(volumeInfoMock);
+
+        VolumeInfo result = volumeService.performLockMigration(volumeInfoMock, HOST_ID_2);
+        assertNotNull(result);
+    }
+
+    @Test
+    public void testPerformLockMigration_SameHost() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("test-volume-path"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(HOST_ID_1);
+
+        VolumeInfo result = volumeService.performLockMigration(volumeInfoMock, HOST_ID_1);
+        assertEquals(volumeInfoMock, result);
+    }
+
+    @Test
+    public void testPerformLockMigration_SourceHostNull() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("test-volume-path"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(null);
+        when(volumeInfoMock.getInstanceId()).thenReturn(null);
+        when(storagePoolVOMock.getClusterId()).thenReturn(null);
+
+        VolumeInfo result = volumeService.performLockMigration(volumeInfoMock, HOST_ID_2);
+        assertNotNull(result);
+    }
+
+    @Test(expected = com.cloud.utils.exception.CloudRuntimeException.class)
+    public void testPerformLockMigration_NullVolume() {
+        volumeService.performLockMigration(null, HOST_ID_2);
+    }
+
+    @Test(expected = com.cloud.utils.exception.CloudRuntimeException.class)
+    public void testPerformLockMigration_TransferFails() {
+        when(volumeInfoMock.getPoolId()).thenReturn(POOL_ID_1);
+        when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
+        when(volumeInfoMock.getPath()).thenReturn("/dev/vg1/volume-1");
+        when(storagePoolDao.findById(POOL_ID_1)).thenReturn(storagePoolVOMock);
+        when(clvmPoolManager.getClvmLockHostId(
+                eq(VOLUME_ID), eq("test-volume-uuid"), eq("/dev/vg1/volume-1"), eq(storagePoolVOMock), eq(true)))
+                .thenReturn(HOST_ID_1);
+        when(storagePoolVOMock.getName()).thenReturn("test-pool");
+        when(clvmPoolManager.transferClvmVolumeLock(
+                "test-volume-uuid", VOLUME_ID, "/dev/vg1/volume-1", storagePoolVOMock, HOST_ID_1, HOST_ID_2))
+                .thenReturn(false);
+
+        volumeService.performLockMigration(volumeInfoMock, HOST_ID_2);
+    }
+}
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java
index 20bc0b015bb..5afef8bc95b 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java
@@ -320,7 +320,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
 
         Map<UsageVO, Pair<QuotaUsageVO, List<QuotaTariffUsageVO>>> mapUsageAndQuotaUsage = new LinkedHashMap<>();
 
-        try (JsInterpreter jsInterpreter = new JsInterpreter(QuotaConfig.QuotaActivationRuleTimeout.value())) {
+        try (JsInterpreter jsInterpreter = new JsInterpreter(QuotaConfig.QuotaActivationRuleTimeout.value(), QuotaConfig.QuotaActivationRuleTimeout.key())) {
             for (UsageVO usageRecord : usageRecords) {
                 int usageType = usageRecord.getUsageType();
 
diff --git a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
index e974f7d8b2c..5d6524b508a 100644
--- a/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
+++ b/plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
@@ -1171,7 +1171,7 @@ public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
         addAllPresetVariables(PresetVariables.class, quotaType, usageTypeVariablesAndDescriptions, null);
         List<String> usageTypeVariables = usageTypeVariablesAndDescriptions.stream().map(Pair::first).collect(Collectors.toList());
 
-        try (JsInterpreter jsInterpreter = new JsInterpreter(QuotaConfig.QuotaActivationRuleTimeout.value())) {
+        try (JsInterpreter jsInterpreter = new JsInterpreter(QuotaConfig.QuotaActivationRuleTimeout.value(), QuotaConfig.QuotaActivationRuleTimeout.key())) {
             Map<String, String> newVariables = injectUsageTypeVariables(jsInterpreter, usageTypeVariables);
             String scriptToExecute = jsInterpreterHelper.replaceScriptVariables(activationRule, newVariables);
             jsInterpreter.executeScript(String.format("new Function(\"%s\")", scriptToExecute.replaceAll("\n", "")));
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index d0a162e0f6f..41716881fa4 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -16,6 +16,7 @@
 // under the License.
 package com.cloud.hypervisor.kvm.resource;
 
+import static com.cloud.host.Host.HOST_CDROM_MAX_COUNT;
 import static com.cloud.host.Host.HOST_INSTANCE_CONVERSION;
 import static com.cloud.host.Host.HOST_OVFTOOL_VERSION;
 import static com.cloud.host.Host.HOST_VDDK_LIB_DIR;
@@ -79,6 +80,7 @@ import org.apache.cloudstack.command.ReconcileCommandService;
 import org.apache.cloudstack.command.ReconcileCommandUtils;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.gpu.GpuDevice;
+import org.apache.cloudstack.storage.command.browser.ListDataStoreObjectsAnswer;
 import org.apache.cloudstack.storage.command.browser.ListDataStoreObjectsCommand;
 import org.apache.cloudstack.storage.configdrive.ConfigDrive;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
@@ -225,9 +227,11 @@ import com.cloud.resource.ResourceStatusUpdater;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.ServerResourceBase;
 import com.cloud.storage.JavaStorageLayer;
+import com.cloud.template.TemplateManager;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.StorageLayer;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.Volume;
 import com.cloud.storage.resource.StorageSubsystemCommandHandler;
 import com.cloud.storage.resource.StorageSubsystemCommandHandlerBase;
@@ -2584,6 +2588,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 
         if (pool.getType() == StoragePoolType.CLVM && volFormat == PhysicalDiskFormat.RAW) {
             return "CLVM";
+        } else if (poolType == StoragePoolType.CLVM_NG) {
+            return "CLVM_NG";
         } else if ((poolType == StoragePoolType.NetworkFilesystem
                 || poolType == StoragePoolType.SharedMountPoint
                 || poolType == StoragePoolType.Filesystem
@@ -3692,6 +3698,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         if (vmSpec.getOs().toLowerCase().contains("window")) {
             isWindowsTemplate = true;
         }
+        final Set<Integer> definedCdromSlots = new HashSet<>();
         for (final DiskTO volume : disks) {
             KVMPhysicalDisk physicalDisk = null;
             KVMStoragePool pool = null;
@@ -3770,6 +3777,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
             if (volume.getType() == Volume.Type.ISO) {
                 final DiskDef.DiskType diskType = getDiskType(physicalDisk);
                 disk.defISODisk(volPath, devId, isUefiEnabled, diskType);
+                definedCdromSlots.add(devId);
 
                 if (guestCpuArch != null && (guestCpuArch.equals("aarch64") || guestCpuArch.equals("s390x"))) {
                     disk.setBusType(DiskDef.DiskBus.SCSI);
@@ -3822,13 +3830,18 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
                     final String glusterVolume = pool.getSourceDir().replace("/", "");
                     disk.defNetworkBasedDisk(glusterVolume + path.replace(mountpoint, ""), pool.getSourceHost(), pool.getSourcePort(), null,
                             null, devId, diskBusType, DiskProtocol.GLUSTER, DiskDef.DiskFmtType.QCOW2);
-                } else if (pool.getType() == StoragePoolType.CLVM || physicalDisk.getFormat() == PhysicalDiskFormat.RAW) {
+                } else if (pool.getType() == StoragePoolType.CLVM || pool.getType() == StoragePoolType.CLVM_NG || physicalDisk.getFormat() == PhysicalDiskFormat.RAW) {
                     if (volume.getType() == Volume.Type.DATADISK && !(isWindowsTemplate && isUefiEnabled)) {
                         disk.defBlockBasedDisk(physicalDisk.getPath(), devId, diskBusTypeData);
-                    }
-                    else {
+                    } else {
                         disk.defBlockBasedDisk(physicalDisk.getPath(), devId, diskBusType);
                     }
+
+                    // CLVM_NG uses QCOW2 format on block devices, override the default RAW format
+                    if (pool.getType() == StoragePoolType.CLVM_NG) {
+                        disk.setDiskFormatType(DiskDef.DiskFmtType.QCOW2);
+                    }
+
                     if (pool.getType() == StoragePoolType.Linstor && isQemuDiscardBugFree(diskBusType)) {
                         disk.setDiscard(DiscardType.UNMAP);
                     }
@@ -3862,6 +3875,17 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
             vm.getDevices().addDevice(disk);
         }
 
+        if (vmSpec.getType() == VirtualMachine.Type.User) {
+            for (int slot = TemplateManager.CDROM_PRIMARY_DEVICE_SEQ;
+                    slot < TemplateManager.CDROM_PRIMARY_DEVICE_SEQ + LibvirtVMDef.MAX_CDROMS_PER_VM; slot++) {
+                if (!definedCdromSlots.contains(slot)) {
+                    final DiskDef emptyCdrom = new DiskDef();
+                    emptyCdrom.defISODisk(null, slot, isUefiEnabled, DiskDef.DiskType.FILE);
+                    vm.getDevices().addDevice(emptyCdrom);
+                }
+            }
+        }
+
         if (vmSpec.getType() != VirtualMachine.Type.User) {
             final DiskDef iso = new DiskDef();
             iso.defISODisk(sysvmISOPath, DiskDef.DiskType.FILE);
@@ -4372,6 +4396,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         boolean instanceConversionSupported = hostSupportsInstanceConversion();
         cmd.getHostDetails().put(HOST_INSTANCE_CONVERSION, String.valueOf(instanceConversionSupported));
         cmd.getHostDetails().put(HOST_VDDK_SUPPORT, String.valueOf(hostSupportsVddk()));
+        cmd.getHostDetails().put(HOST_CDROM_MAX_COUNT, String.valueOf(LibvirtVMDef.MAX_CDROMS_PER_VM));
         if (StringUtils.isNotBlank(vddkLibDir)) {
             cmd.getHostDetails().put(HOST_VDDK_LIB_DIR, vddkLibDir);
         }
@@ -5728,10 +5753,73 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 
     public Answer listFilesAtPath(ListDataStoreObjectsCommand command) {
         DataStoreTO store = command.getStore();
-        KVMStoragePool storagePool = storagePoolManager.getStoragePool(StoragePoolType.NetworkFilesystem, store.getUuid());
+        StoragePoolType poolType = StoragePoolType.NetworkFilesystem;
+        if (store instanceof PrimaryDataStoreTO) {
+            poolType = ((PrimaryDataStoreTO) store).getPoolType();
+        }
+        KVMStoragePool storagePool = storagePoolManager.getStoragePool(poolType, store.getUuid());
+        if (ClvmPoolManager.isClvmPoolType(poolType)) {
+            return listLvmVolumes(storagePool.getLocalPath(), command.getStartIndex(), command.getPageSize());
+        }
         return listFilesAtPath(storagePool.getLocalPath(), command.getPath(), command.getStartIndex(), command.getPageSize());
     }
 
+    private Answer listLvmVolumes(String localPath, int startIndex, int pageSize) {
+        String vgName = localPath;
+        if (vgName.startsWith("/")) {
+            String[] parts = vgName.split("/");
+            for (int i = parts.length - 1; i >= 0; i--) {
+                if (!parts[i].isEmpty()) {
+                    vgName = parts[i];
+                    break;
+                }
+            }
+        }
+
+        Script lvs = new Script("lvs", 30000, logger);
+        lvs.add("--noheadings");
+        lvs.add("--nosuffix");
+        lvs.add("-o", "lv_name,lv_size");
+        lvs.add("--units", "b");
+        lvs.add(vgName);
+        AllLinesParser parser = new AllLinesParser();
+        String result = lvs.execute(parser);
+
+        List<String> names = new ArrayList<>();
+        List<String> paths = new ArrayList<>();
+        List<String> absPaths = new ArrayList<>();
+        List<Boolean> isDirs = new ArrayList<>();
+        List<Long> sizes = new ArrayList<>();
+        List<Long> lastModified = new ArrayList<>();
+
+        if (result != null) {
+            logger.warn("lvs listing failed for VG {}: {}", vgName, result);
+            return new ListDataStoreObjectsAnswer(false, 0, names, paths, absPaths, isDirs, sizes, lastModified);
+        }
+
+        List<String[]> entries = new ArrayList<>();
+        for (String line : parser.getLines().split("\n")) {
+            String trimmed = line.trim();
+            if (trimmed.isEmpty()) continue;
+            String[] cols = trimmed.split("\\s+");
+            if (cols.length >= 2) entries.add(cols);
+        }
+
+        int count = entries.size();
+        for (int i = startIndex; i < startIndex + pageSize && i < count; i++) {
+            String lvName = entries.get(i)[0];
+            long size = 0;
+            try { size = Long.parseLong(entries.get(i)[1]); } catch (NumberFormatException ignored) {}
+            names.add(lvName);
+            paths.add("/" + lvName);
+            absPaths.add("/dev/" + vgName + "/" + lvName);
+            isDirs.add(false);
+            sizes.add(size);
+            lastModified.add(0L);
+        }
+        return new ListDataStoreObjectsAnswer(true, count, names, paths, absPaths, isDirs, sizes, lastModified);
+    }
+
     public boolean addNetworkRules(final String vmName, final String vmId, final String guestIP, final String guestIP6, final String sig, final String seq, final String mac, final String rules, final String vif, final String brname,
                                    final String secIps) {
         if (!canBridgeFirewall) {
@@ -6820,4 +6908,237 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     public String getGuestCpuArch() {
         return guestCpuArch;
     }
+
+    /**
+     * CLVM volume state for migration operations on source host
+     */
+    public enum ClvmVolumeState {
+        /** Shared mode (-asy) - used before migration to allow both hosts to access volume */
+        SHARED("-asy", "shared", "Before migration: activating in shared mode"),
+
+        /** Deactivate (-an) - used after successful migration to release volume on source */
+        DEACTIVATE("-an", "deactivated", "After successful migration: deactivating volume"),
+
+        /** Exclusive mode (-aey) - used after failed migration to revert to original exclusive state */
+        EXCLUSIVE("-aey", "exclusive", "After failed migration: reverting to exclusive mode");
+
+        private final String lvchangeFlag;
+        private final String description;
+        private final String logMessage;
+
+        ClvmVolumeState(String lvchangeFlag, String description, String logMessage) {
+            this.lvchangeFlag = lvchangeFlag;
+            this.description = description;
+            this.logMessage = logMessage;
+        }
+
+        public String getLvchangeFlag() {
+            return lvchangeFlag;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getLogMessage() {
+            return logMessage;
+        }
+    }
+
+    public static void modifyClvmVolumesStateForMigration(List<DiskDef> disks, VirtualMachineTO vmSpec, ClvmVolumeState state) {
+        for (DiskDef disk : disks) {
+            if (isClvmVolume(disk, vmSpec)) {
+                String volumePath = disk.getDiskPath();
+                try {
+                    modifyClvmVolumeState(volumePath, state.getLvchangeFlag(), state.getDescription(), state.getLogMessage());
+                } catch (Exception e) {
+                    LOGGER.error("[CLVM Migration] Exception while setting volume [{}] to {} state: {}",
+                            volumePath, state.getDescription(), e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    private static void modifyClvmVolumeState(String volumePath, String lvchangeFlag,
+                                       String stateDescription, String logMessage) {
+        try {
+            LOGGER.info("{} for volume [{}]", logMessage, volumePath);
+
+            Script cmd = new Script("lvchange", Duration.standardSeconds(300), LOGGER);
+            cmd.add(lvchangeFlag);
+            cmd.add(volumePath);
+
+            String result = cmd.execute();
+            if (result != null) {
+                String errorMsg = String.format(
+                        "Failed to set volume [%s] to %s state. Command result: %s",
+                        volumePath, stateDescription, result);
+                LOGGER.error(errorMsg);
+                throw new CloudRuntimeException(errorMsg);
+            } else {
+                LOGGER.info("Successfully set volume [{}] to {} state.",
+                        volumePath, stateDescription);
+            }
+        } catch (CloudRuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            String errorMsg = String.format(
+                    "Exception while setting volume [%s] to %s state: %s",
+                    volumePath, stateDescription, e.getMessage());
+            LOGGER.error(errorMsg, e);
+            throw new CloudRuntimeException(errorMsg, e);
+        }
+    }
+
+    public static void activateClvmVolumeExclusive(String volumePath) {
+        modifyClvmVolumeState(volumePath, ClvmVolumeState.EXCLUSIVE.getLvchangeFlag(),
+                ClvmVolumeState.EXCLUSIVE.getDescription(),
+                "Activating CLVM volume in exclusive mode");
+    }
+
+    public static void deactivateClvmVolume(String volumePath) {
+        try {
+            modifyClvmVolumeState(volumePath, ClvmVolumeState.DEACTIVATE.getLvchangeFlag(),
+                    ClvmVolumeState.DEACTIVATE.getDescription(),
+                    "Deactivating CLVM volume");
+        } catch (Exception e) {
+            LOGGER.warn("Failed to deactivate CLVM volume {}: {}", volumePath, e.getMessage());
+        }
+    }
+
+    public static void setClvmVolumeToSharedMode(String volumePath) {
+        try {
+            modifyClvmVolumeState(volumePath, ClvmVolumeState.SHARED.getLvchangeFlag(),
+                    ClvmVolumeState.SHARED.getDescription(),
+                    "Setting CLVM volume to shared mode");
+        } catch (Exception e) {
+            LOGGER.warn("Failed to set CLVM volume {} to shared mode: {}", volumePath, e.getMessage());
+        }
+    }
+
+    /**
+     * Determines if a disk is on a CLVM storage pool by checking the actual pool type from VirtualMachineTO.
+     * This is the most reliable method as it uses CloudStack's own storage pool information.
+     *
+     * @param disk The disk definition to check
+     * @param resource The LibvirtComputingResource instance (unused but kept for compatibility)
+     * @param vmSpec The VirtualMachineTO specification containing disk and pool information
+     * @return true if the disk is on a CLVM storage pool, false otherwise
+     */
+    private static boolean isClvmVolume(DiskDef disk, VirtualMachineTO vmSpec) {
+        String diskPath = disk.getDiskPath();
+        if (diskPath == null || vmSpec == null) {
+            return false;
+        }
+
+        try {
+            if (vmSpec.getDisks() != null) {
+                for (DiskTO diskTO : vmSpec.getDisks()) {
+                    if (!(diskTO.getData() instanceof VolumeObjectTO)) {
+                        continue;
+                    }
+                    VolumeObjectTO volumeTO = (VolumeObjectTO) diskTO.getData();
+                    if (!diskPath.equals(volumeTO.getPath()) && !diskPath.equals(diskTO.getPath())) {
+                        continue;
+                    }
+                    DataStoreTO dataStore = volumeTO.getDataStore();
+                    if (!(dataStore instanceof PrimaryDataStoreTO)) {
+                        continue;
+                    }
+                    PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO) dataStore;
+                    boolean isClvm = StoragePoolType.CLVM == primaryStore.getPoolType() ||
+                                     StoragePoolType.CLVM_NG == primaryStore.getPoolType();
+                    LOGGER.debug("Disk {} identified as CLVM/CLVM_NG={} via VirtualMachineTO pool type: {}",
+                                diskPath, isClvm, primaryStore.getPoolType());
+                    return isClvm;
+                }
+            }
+
+            if (diskPath.startsWith("/dev/") && !diskPath.contains("/dev/mapper/")) {
+                String vgName = extractVolumeGroupFromPath(diskPath);
+                if (vgName != null) {
+                    boolean isClustered = checkIfVolumeGroupIsClustered(vgName);
+                    LOGGER.debug("Disk {} VG {} identified as clustered={} via vgs attribute check",
+                                diskPath, vgName, isClustered);
+                    return isClustered;
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.error("Error determining if volume {} is CLVM: {}", diskPath, e.getMessage(), e);
+        }
+
+        return false;
+    }
+
+    /**
+     * Extracts the volume group name from a device path.
+     *
+     * @param devicePath The device path (e.g., /dev/vgname/lvname)
+     * @return The volume group name, or null if cannot be determined
+     */
+     static String extractVolumeGroupFromPath(String devicePath) {
+        if (devicePath == null || !devicePath.startsWith("/dev/")) {
+            return null;
+        }
+
+        // Format: /dev/<vgname>/<lvname>
+        String[] parts = devicePath.split("/");
+        if (parts.length >= 3) {
+            return parts[2]; // ["", "dev", "vgname", ...]
+        }
+
+        return null;
+    }
+
+    /**
+     * Checks if a volume group is clustered (CLVM) by examining its attributes.
+     * Uses 'vgs' command to check for the clustered/shared flag in VG attributes.
+     *
+     * VG Attr format (6 characters): wz--nc or wz--ns
+     *   Position 6: Clustered flag - 'c' = CLVM (clustered), 's' = shared (lvmlockd), '-' = not clustered
+     *
+     * @param vgName The volume group name
+     * @return true if the VG is clustered or shared, false otherwise
+     */
+     static boolean checkIfVolumeGroupIsClustered(String vgName) {
+        if (vgName == null) {
+            return false;
+        }
+
+        try {
+            OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+            Script vgsCmd = new Script("vgs", 30000, LOGGER);
+            vgsCmd.add("--noheadings");
+            vgsCmd.add("--unbuffered");
+            vgsCmd.add("-o");
+            vgsCmd.add("vg_attr");
+            vgsCmd.add(vgName);
+
+            String result = vgsCmd.execute(parser);
+
+            if (result == null && parser.getLines() != null) {
+                String output = parser.getLines();
+                if (output != null && !output.isEmpty()) {
+                    String vgAttr = output.trim();
+                    if (vgAttr.length() >= 6) {
+                        char clusterFlag = vgAttr.charAt(5);  // Position 6 (0-indexed 5)
+                        boolean isClustered = (clusterFlag == 'c' || clusterFlag == 's');
+                        LOGGER.debug("VG {} has attributes '{}', cluster/shared flag '{}' = {}",
+                                    vgName, vgAttr, clusterFlag, isClustered);
+                        return isClustered;
+                    } else {
+                        LOGGER.warn("VG {} attributes '{}' have unexpected format (expected 6+ chars)", vgName, vgAttr);
+                    }
+                }
+            } else {
+                LOGGER.warn("Failed to get VG attributes for {}: {}", vgName, result);
+            }
+
+        } catch (Exception e) {
+            LOGGER.debug("Error checking if VG {} is clustered: {}", vgName, e.getMessage());
+        }
+
+        return false;
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index bf8b1af6c18..7f6725b6d15 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -57,6 +57,10 @@ import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
 public class LibvirtVMDef {
     protected static Logger LOGGER = LogManager.getLogger(LibvirtVMDef.class);
 
+    // CD-ROM slot allocation: getDevLabel() maps deviceSeq=3,4 to hdc and hdd on the IDE bus.
+    // Bumping this requires extending getDevLabel() (e.g. to spill onto SATA or a second IDE controller).
+    public static final int MAX_CDROMS_PER_VM = 2;
+
     private String _hvsType;
     private static long s_libvirtVersion;
     private static long s_qemuVersion;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtClvmLockTransferCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtClvmLockTransferCommandWrapper.java
new file mode 100644
index 00000000000..18c4324addf
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtClvmLockTransferCommandWrapper.java
@@ -0,0 +1,173 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferCommand;
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferAnswer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.script.Script;
+import com.cloud.utils.script.OutputInterpreter;
+
+@ResourceWrapper(handles = ClvmLockTransferCommand.class)
+public class LibvirtClvmLockTransferCommandWrapper
+        extends CommandWrapper<ClvmLockTransferCommand, Answer, LibvirtComputingResource> {
+
+    @Override
+    public Answer execute(ClvmLockTransferCommand cmd, LibvirtComputingResource serverResource) {
+        String lvPath = cmd.getLvPath();
+        ClvmLockTransferCommand.Operation operation = cmd.getOperation();
+        String volumeUuid = cmd.getVolumeUuid();
+
+        logger.info("Executing CLVM lock transfer: operation={}, lv={}, volume={}",
+                operation, lvPath, volumeUuid);
+
+        try {
+
+            if (operation == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE) {
+                return handleQueryLockState(cmd, lvPath, volumeUuid);
+            }
+
+            String lvchangeOpt;
+            String operationDesc;
+            switch (operation) {
+                case DEACTIVATE:
+                    lvchangeOpt = "-an";
+                    operationDesc = "deactivated";
+                    break;
+                case ACTIVATE_EXCLUSIVE:
+                    lvchangeOpt = "-aey";
+                    operationDesc = "activated exclusively";
+                    break;
+                case ACTIVATE_SHARED:
+                    lvchangeOpt = "-asy";
+                    operationDesc = "activated in shared mode";
+                    break;
+                default:
+                    return new ClvmLockTransferAnswer(cmd, false, "Unknown operation: " + operation);
+            }
+
+            Script script = new Script("/usr/sbin/lvchange", 60000, logger);
+            script.add(lvchangeOpt);
+            script.add(lvPath);
+
+            String result = script.execute();
+
+            if (result != null) {
+                logger.error("CLVM lock transfer failed for volume {}: {}",
+                        volumeUuid, result);
+                return new ClvmLockTransferAnswer(cmd, false,
+                    String.format("lvchange %s %s failed: %s", lvchangeOpt, lvPath, result));
+            }
+
+            logger.info("Successfully executed CLVM lock transfer: {} {} for volume {}",
+                    lvchangeOpt, lvPath, volumeUuid);
+
+            return new ClvmLockTransferAnswer(cmd, true,
+                String.format("Successfully %s CLVM volume %s", operationDesc, volumeUuid));
+
+        } catch (Exception e) {
+            logger.error("Exception during CLVM lock transfer for volume {}: {}",
+                    volumeUuid, e.getMessage(), e);
+            return new ClvmLockTransferAnswer(cmd, false, "Exception: " + e.getMessage());
+        }
+    }
+
+    /**
+     * Query whether this host currently has the CLVM LV activated locally.
+     * Executes: lvs -o lv_attr,lv_host,lv_active --noheadings <lvPath>
+     *
+     * lv_attr[4]=='a' (isActive) is LOCAL and is the authoritative signal — true only on
+     * the host where the LV is currently activated. The management server fans out this
+     * query to all cluster hosts; the one returning isActive=true is the lock holder.
+     * lv_attr[5]=='o' (isOpen) means a VM has the device open on this host (doing I/O).
+     * lv_host is retained for diagnostic logging only — do NOT use it to identify the
+     * lock holder.
+     */
+    private Answer handleQueryLockState(ClvmLockTransferCommand cmd, String lvPath, String volumeUuid) {
+        try {
+            Script script = new Script("/usr/sbin/lvs", 30000, logger);
+            script.add("-o");
+            script.add("lv_attr,lv_host");
+            script.add("--noheadings");
+            script.add(lvPath);
+
+            OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+            String result = script.execute(parser);
+
+            if (result != null) {
+                logger.error("Failed to query lock state for volume {}: {}", volumeUuid, result);
+                return new ClvmLockTransferAnswer(cmd, false,
+                    String.format("lvs command failed: %s", result));
+            }
+
+            String[] lines = parser.getLines().split("\n");
+            String dataLine = null;
+
+            for (String line : lines) {
+                String trimmed = line.trim();
+                if (!trimmed.isEmpty() &&
+                    trimmed.length() >= 10 &&
+                    "-wrsvmpco".indexOf(trimmed.charAt(0)) >= 0) {
+                    dataLine = trimmed;
+                    break;
+                }
+            }
+
+            if (dataLine == null) {
+                String allOutput = parser.getLines();
+                logger.warn("Could not find lv_attr data line in lvs output for volume {}: {}",
+                          volumeUuid, allOutput);
+                return new ClvmLockTransferAnswer(cmd, false,
+                    String.format("Could not parse lvs output. Full output: %s", allOutput));
+            }
+
+            logger.debug("Parsed lv_attr data line for volume {}: {}", volumeUuid, dataLine);
+
+            String[] parts = dataLine.split("\\s+");
+            if (parts.length < 1) {
+                return new ClvmLockTransferAnswer(cmd, false, "Invalid lvs output format");
+            }
+
+            String lvAttr = parts[0];
+            // lv_host: for diagnostics only, unreliable for lock-holder identification
+            String hostname = parts.length > 1 ? parts[1] : null;
+
+            // lv_attr[4]=='a' → LV is active on THIS host (local activation state)
+            boolean isActive = lvAttr.length() > 4 && lvAttr.charAt(4) == 'a';
+            // lv_attr[5]=='o' → a process has the device file open on this host (VM doing I/O)
+            boolean isOpen   = lvAttr.length() > 5 && lvAttr.charAt(5) == 'o';
+
+            logger.info("Queried lock state for volume {}: attr={}, hostname={}, active={}, open={}",
+                    volumeUuid, lvAttr, hostname, isActive, isOpen);
+
+            return new ClvmLockTransferAnswer(cmd, true,
+                    String.format("Lock state: active=%s, open=%s, host=%s",
+                            isActive, isOpen, hostname != null ? hostname : "none"),
+                    hostname, isActive, isOpen, lvAttr);
+
+        } catch (Exception e) {
+            logger.error("Exception during lock state query for volume {}: {}",
+                    volumeUuid, e.getMessage(), e);
+            return new ClvmLockTransferAnswer(cmd, false, "Exception: " + e.getMessage());
+        }
+    }
+
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
index f54918bbc22..ed02ae6da38 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
@@ -1,5 +1,3 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file
@@ -42,9 +40,16 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
 import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.agent.api.to.DataTO;
 import com.cloud.agent.api.to.GPUDeviceTO;
 import com.cloud.hypervisor.kvm.resource.LibvirtGpuDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtXMLParser;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.storage.Storage;
+import com.cloud.utils.Ternary;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.utils.security.ParserUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -69,7 +74,6 @@ import com.cloud.agent.api.Command;
 import com.cloud.agent.api.MigrateAnswer;
 import com.cloud.agent.api.MigrateCommand;
 import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo;
-import com.cloud.agent.api.to.DataTO;
 import com.cloud.agent.api.to.DiskTO;
 import com.cloud.agent.api.to.DpdkTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
@@ -82,11 +86,6 @@ import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef;
 import com.cloud.hypervisor.kvm.resource.MigrateKVMAsync;
 import com.cloud.hypervisor.kvm.resource.VifDriver;
-import com.cloud.resource.CommandWrapper;
-import com.cloud.resource.ResourceWrapper;
-import com.cloud.utils.Ternary;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.VirtualMachine;
 
 @ResourceWrapper(handles =  MigrateCommand.class)
 public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCommand, Answer, LibvirtComputingResource> {
@@ -117,7 +116,8 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
         Command.State commandState = null;
 
         List<InterfaceDef> ifaces = null;
-        List<DiskDef> disks;
+        List<DiskDef> disks = new ArrayList<>();
+        VirtualMachineTO to = null;
 
         Domain dm = null;
         Connect dconn = null;
@@ -136,7 +136,7 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
             if (logger.isDebugEnabled()) {
                 logger.debug(String.format("Found domain with name [%s]. Starting VM migration to host [%s].", vmName, destinationUri));
             }
-            VirtualMachineTO to = command.getVirtualMachine();
+            to = command.getVirtualMachine();
 
             dm = conn.domainLookupByName(vmName);
             /*
@@ -338,6 +338,14 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
                     logger.debug(String.format("Cleaning the disks of VM [%s] in the source pool after VM migration finished.", vmName));
                 }
                 resumeDomainIfPaused(destDomain, vmName);
+
+                // For cross-pool CLVM migration, skip deactivation so the source LV stays
+                // active (in shared mode) and deletion can route directly to the source host
+                // without fanning out across the cluster to find an inactive LV.
+                if (to != null && !command.isClvmCrossPoolMigration()) {
+                    LibvirtComputingResource.modifyClvmVolumesStateForMigration(disks, to, LibvirtComputingResource.ClvmVolumeState.DEACTIVATE);
+                }
+
                 deleteOrDisconnectDisksOnSourcePool(libvirtComputingResource, migrateDiskInfoList, disks);
                 libvirtComputingResource.cleanOldSecretsByDiskDef(conn, disks);
             }
@@ -384,6 +392,10 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
                 if (destDomain != null) {
                     destDomain.free();
                 }
+                // Revert CLVM volumes to exclusive mode on failure
+                if (to != null && result != null) {
+                    LibvirtComputingResource.modifyClvmVolumesStateForMigration(disks, to, LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE);
+                }
             } catch (final LibvirtException e) {
                 logger.trace("Ignoring libvirt error.", e);
             }
@@ -683,7 +695,7 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
     protected void deleteOrDisconnectDisksOnSourcePool(final LibvirtComputingResource libvirtComputingResource, final List<MigrateDiskInfo> migrateDiskInfoList,
             List<DiskDef> disks) {
         for (DiskDef disk : disks) {
-            MigrateDiskInfo migrateDiskInfo = searchDiskDefOnMigrateDiskInfoList(migrateDiskInfoList, disk);
+            MigrateCommand.MigrateDiskInfo migrateDiskInfo = searchDiskDefOnMigrateDiskInfoList(migrateDiskInfoList, disk);
             if (migrateDiskInfo != null && migrateDiskInfo.isSourceDiskOnStorageFileSystem()) {
                 deleteLocalVolume(disk.getDiskPath());
             } else {
@@ -800,7 +812,10 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
                             for (int z = 0; z < diskChildNodes.getLength(); z++) {
                                 Node diskChildNode = diskChildNodes.item(z);
 
-                                if (migrateStorageManaged && "driver".equals(diskChildNode.getNodeName())) {
+                                boolean shouldUpdateDriverType = shouldUpdateDriverTypeForMigration(
+                                    migrateStorageManaged, migrateDiskInfo);
+
+                                if (shouldUpdateDriverType && "driver".equals(diskChildNode.getNodeName())) {
                                     Node driverNode = diskChildNode;
 
                                     NamedNodeMap driverNodeAttributes = driverNode.getAttributes();
@@ -1066,4 +1081,64 @@ public final class LibvirtMigrateCommandWrapper extends CommandWrapper<MigrateCo
         return xmlDesc.replaceAll("(graphics\\s+[^>]*type=['\"]vnc['\"][^>]*passwd=['\"])([^'\"]*)(['\"])",
                 "$1*****$3");
     }
+
+    /**
+     * Checks if any of the destination disks in the migration target a CLVM or CLVM_NG storage pool.
+     * This is used to determine if incremental migration should be disabled to avoid libvirt
+     * precreate errors with QCOW2-on-LVM setups.
+     *
+     * @param mapMigrateStorage the map containing migration disk information with destination pool types
+     * @return true if any destination disk targets CLVM or CLVM_NG, false otherwise
+     */
+    protected boolean hasClvmDestinationDisks(Map<String, MigrateCommand.MigrateDiskInfo> mapMigrateStorage) {
+        if (MapUtils.isEmpty(mapMigrateStorage)) {
+            return false;
+        }
+
+        try {
+            for (Map.Entry<String, MigrateCommand.MigrateDiskInfo> entry : mapMigrateStorage.entrySet()) {
+                MigrateCommand.MigrateDiskInfo diskInfo = entry.getValue();
+               if (isClvmBlockDevice(diskInfo)) {
+                    logger.debug("Found disk targeting CLVM/CLVM_NG destination pool");
+                    return true;
+               }
+            }
+        } catch (final Exception e) {
+            logger.debug("Failed to check for CLVM destination disks: {}. Assuming no CLVM disks.", e.getMessage());
+        }
+
+        return false;
+    }
+
+    private boolean isClvmBlockDevice(MigrateCommand.MigrateDiskInfo diskInfo) {
+        if (diskInfo == null ||diskInfo.getDestPoolType() == null) {
+            return false;
+        }
+        return (Storage.StoragePoolType.CLVM.equals(diskInfo.getDestPoolType()) || Storage.StoragePoolType.CLVM_NG.equals(diskInfo.getDestPoolType()));
+    }
+
+    /**
+     * Determines if the driver type should be updated during migration based on CLVM involvement.
+     * The driver type needs to be updated when:
+     * - Managed storage is being migrated, OR
+     * - Source pool is CLVM or CLVM_NG, OR
+     * - Destination pool is CLVM or CLVM_NG
+     *
+     * This ensures the libvirt XML driver type matches the destination format (raw/qcow2/etc).
+     *
+     * @param migrateStorageManaged true if migrating managed storage
+     * @param migrateDiskInfo the migration disk information containing source and destination pool types
+     * @return true if driver type should be updated, false otherwise
+     */
+    private boolean shouldUpdateDriverTypeForMigration(boolean migrateStorageManaged,
+                                                        MigrateCommand.MigrateDiskInfo migrateDiskInfo) {
+        boolean sourceIsClvm = Storage.StoragePoolType.CLVM == migrateDiskInfo.getSourcePoolType() ||
+                Storage.StoragePoolType.CLVM_NG == migrateDiskInfo.getSourcePoolType();
+
+        boolean destIsClvm = Storage.StoragePoolType.CLVM == migrateDiskInfo.getDestPoolType() ||
+                Storage.StoragePoolType.CLVM_NG == migrateDiskInfo.getDestPoolType();
+
+        boolean isClvmRelatedMigration = sourceIsClvm || destIsClvm;
+        return migrateStorageManaged || isClvmRelatedMigration;
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java
index 990cefda8f3..bc22d7bfd70 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapper.java
@@ -52,9 +52,19 @@ public final class LibvirtModifyStoragePoolCommandWrapper extends CommandWrapper
 
         final KVMStoragePool storagepool;
         try {
+            Map<String, String> poolDetails = command.getDetails();
+            if (poolDetails == null) {
+                poolDetails = new HashMap<>();
+            }
+
+            // Ensure CLVM secure zero-fill setting has a default value if not provided by MS
+            if (!poolDetails.containsKey(KVMStoragePool.CLVM_SECURE_ZERO_FILL)) {
+                poolDetails.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "false");
+            }
+
             storagepool =
                     storagePoolMgr.createStoragePool(command.getPool().getUuid(), command.getPool().getHost(), command.getPool().getPort(), command.getPool().getPath(), command.getPool()
-                            .getUserInfo(), command.getPool().getType(), command.getDetails());
+                            .getUserInfo(), command.getPool().getType(), poolDetails);
             if (storagepool == null) {
                 return new Answer(command, false, " Failed to create storage pool");
             }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapper.java
new file mode 100644
index 00000000000..608770974dc
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapper.java
@@ -0,0 +1,82 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.libvirt.Connect;
+import org.libvirt.LibvirtException;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.PostMigrationAnswer;
+import com.cloud.agent.api.PostMigrationCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+
+/**
+ * Wrapper for PostMigrationCommand on KVM hypervisor.
+ * Handles post-migration tasks on the destination host after a VM has been successfully migrated.
+ * Primary responsibility: Convert CLVM volumes from shared mode to exclusive mode on destination.
+ */
+@ResourceWrapper(handles = PostMigrationCommand.class)
+public final class LibvirtPostMigrationCommandWrapper extends CommandWrapper<PostMigrationCommand, Answer, LibvirtComputingResource> {
+
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    @Override
+    public Answer execute(final PostMigrationCommand command, final LibvirtComputingResource libvirtComputingResource) {
+        final VirtualMachineTO vm = command.getVirtualMachine();
+        final String vmName = command.getVmName();
+
+        if (vm == null || vmName == null) {
+            return new PostMigrationAnswer(command, "VM or VM name is null");
+        }
+
+        logger.debug("Executing post-migration tasks for VM {} on destination host", vmName);
+
+        try {
+            final Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
+
+            List<DiskDef> disks = libvirtComputingResource.getDisks(conn, vmName);
+            logger.debug("[CLVM Post-Migration] Processing volumes for VM {} to claim exclusive locks on any CLVM volumes", vmName);
+            LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                disks,
+                vm,
+                LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE
+            );
+
+            logger.debug("Successfully completed post-migration tasks for VM {}", vmName);
+            return new PostMigrationAnswer(command);
+
+        } catch (final LibvirtException e) {
+            logger.error("Libvirt error during post-migration for VM {}: {}", vmName, e.getMessage(), e);
+            return new PostMigrationAnswer(command, e);
+        } catch (final Exception e) {
+            logger.error("Error during post-migration for VM {}: {}", vmName, e.getMessage(), e);
+            return new PostMigrationAnswer(command, e);
+        }
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapper.java
new file mode 100644
index 00000000000..c47760040c8
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapper.java
@@ -0,0 +1,84 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.PreMigrationCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.LibvirtException;
+
+import java.util.List;
+
+/**
+ * Handles PreMigrationCommand on the source host before live migration.
+ * Converts CLVM volume locks from exclusive to shared mode so the destination host can access them.
+ */
+@ResourceWrapper(handles = PreMigrationCommand.class)
+public class LibvirtPreMigrationCommandWrapper extends CommandWrapper<PreMigrationCommand, Answer, LibvirtComputingResource> {
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    @Override
+    public Answer execute(PreMigrationCommand command, LibvirtComputingResource libvirtComputingResource) {
+        String vmName = command.getVmName();
+        VirtualMachineTO vmSpec = command.getVirtualMachine();
+
+        logger.info("Preparing source host for migration of VM: {}", vmName);
+
+        Connect conn = null;
+        Domain dm = null;
+
+        try {
+            LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
+            conn = libvirtUtilitiesHelper.getConnectionByVmName(vmName);
+            dm = conn.domainLookupByName(vmName);
+
+            List<DiskDef> disks = libvirtComputingResource.getDisks(conn, vmName);
+            logger.info("Converting CLVM volumes to shared mode for VM: {}", vmName);
+            LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                disks,
+                vmSpec,
+                LibvirtComputingResource.ClvmVolumeState.SHARED
+            );
+
+            logger.info("Successfully prepared source host for migration of VM: {}", vmName);
+            return new Answer(command, true, "Source host prepared for migration");
+
+        } catch (LibvirtException e) {
+            logger.error("Failed to prepare source host for migration of VM: {}", vmName, e);
+            return new Answer(command, false, "Failed to prepare source host: " + e.getMessage());
+        } finally {
+            if (dm != null) {
+                try {
+                    dm.free();
+                } catch (LibvirtException e) {
+                    logger.warn("Failed to free domain {}: {}", vmName, e.getMessage());
+                }
+            }
+        }
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java
index d9323df4477..f7ca79127da 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareForMigrationCommandWrapper.java
@@ -21,6 +21,7 @@ package com.cloud.hypervisor.kvm.resource.wrapper;
 
 import java.net.URISyntaxException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.cloudstack.storage.configdrive.ConfigDrive;
@@ -124,6 +125,19 @@ public final class LibvirtPrepareForMigrationCommandWrapper extends CommandWrapp
                 return new PrepareForMigrationAnswer(command, "failed to connect physical disks to host");
             }
 
+            // Activate CLVM volumes in shared mode on destination host for live migration
+            try {
+                List<LibvirtVMDef.DiskDef> disks = libvirtComputingResource.getDisks(conn, vm.getName());
+                LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    disks,
+                    vm,
+                    LibvirtComputingResource.ClvmVolumeState.SHARED
+                );
+            } catch (Exception e) {
+                logger.warn("Failed to activate CLVM volumes in shared mode on destination for VM {}: {}",
+                    vm.getName(), e.getMessage(), e);
+            }
+
             logger.info("Successfully prepared destination host for migration of VM {}", vm.getName());
             return createPrepareForMigrationAnswer(command, dpdkInterfaceMapping, libvirtComputingResource, vm);
         } catch (final LibvirtException | CloudRuntimeException | InternalErrorException | URISyntaxException e) {
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
index f2af46d4cc8..a43b584dd6d 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
@@ -113,7 +113,8 @@ public final class LibvirtResizeVolumeCommandWrapper extends CommandWrapper<Resi
             logger.debug("Resizing volume: " + path + ", from: " + toHumanReadableSize(currentSize) + ", to: " + toHumanReadableSize(newSize) + ", type: " + type + ", name: " + vmInstanceName + ", shrinkOk: " + shrinkOk);
 
             /* libvirt doesn't support resizing (C)LVM devices, and corrupts QCOW2 in some scenarios, so we have to do these via qemu-img */
-            if (pool.getType() != StoragePoolType.CLVM && pool.getType() != StoragePoolType.Linstor && pool.getType() != StoragePoolType.PowerFlex
+            if (pool.getType() != StoragePoolType.CLVM && pool.getType() != StoragePoolType.CLVM_NG
+                    && pool.getType() != StoragePoolType.Linstor && pool.getType() != StoragePoolType.PowerFlex
                     && vol.getFormat() != PhysicalDiskFormat.QCOW2) {
                 logger.debug("Volume " + path +  " can be resized by libvirt. Asking libvirt to resize the volume.");
                 try {
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java
index 5d76d140f22..16c1a5a2fac 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java
@@ -117,7 +117,7 @@ public class LibvirtRevertSnapshotCommandWrapper extends CommandWrapper<RevertSn
                     secondaryStoragePool = storagePoolMgr.getStoragePoolByURI(snapshotImageStore.getUrl());
                 }
 
-                if (primaryPool.getType() == StoragePoolType.CLVM) {
+                if (primaryPool.getType() == StoragePoolType.CLVM || primaryPool.getType() == StoragePoolType.CLVM_NG) {
                     Script cmd = new Script(libvirtComputingResource.manageSnapshotPath(), libvirtComputingResource.getCmdsTimeout(), logger);
                     cmd.add("-v", getFullPathAccordingToStorage(secondaryStoragePool, snapshotRelPath));
                     cmd.add("-n", snapshotDisk.getName());
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java
new file mode 100644
index 00000000000..e9ec65505e4
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java
@@ -0,0 +1,1071 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.hypervisor.kvm.storage;
+
+import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
+import com.cloud.hypervisor.kvm.resource.LibvirtStoragePoolDef;
+import com.cloud.storage.Storage;
+import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.storage.StorageLayer;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
+import org.joda.time.Duration;
+import org.libvirt.Connect;
+import org.libvirt.LibvirtException;
+import org.libvirt.StoragePool;
+import org.libvirt.StorageVol;
+
+/**
+ * Storage adaptor for CLVM and CLVM_NG pool types.
+ * Extends LibvirtStorageAdaptor and overrides methods with CLVM-specific logic,
+ * using direct LVM commands instead of libvirt for volume operations.
+ */
+public class ClvmStorageAdaptor extends LibvirtStorageAdaptor {
+
+    public ClvmStorageAdaptor(StorageLayer storage) {
+        super(storage);
+    }
+
+    @Override
+    public StoragePoolType getStoragePoolType() {
+        // Registered manually for both CLVM and CLVM_NG in KVMStoragePoolManager
+        return null;
+    }
+
+    @Override
+    public KVMStoragePool createStoragePool(String name, String host, int port, String path,
+            String userInfo, StoragePoolType type, Map<String, String> details, boolean isPrimaryStorage) {
+        logger.info("Attempting to create CLVM/CLVM_NG storage pool {} in libvirt", name);
+
+        Connect conn;
+        try {
+            conn = LibvirtConnection.getConnection();
+        } catch (LibvirtException e) {
+            throw new CloudRuntimeException(e.toString());
+        }
+
+        StoragePool sp = createCLVMStoragePool(conn, name, host, path);
+        if (sp == null) {
+            logger.info("Falling back to virtual CLVM/CLVM_NG pool without libvirt for: {}", name);
+            return createVirtualClvmPool(name, host, path, type, details);
+        }
+
+        try {
+            if (!isPrimaryStorage) {
+                incStoragePoolRefCount(name);
+            }
+            // CLVM/CLVM_NG pools are kept inactive in libvirt; we use direct LVM commands
+            return getStoragePool(name);
+        } catch (Exception e) {
+            decStoragePoolRefCount(name);
+            throw new CloudRuntimeException("Failed to create CLVM storage pool: " + name, e);
+        }
+    }
+
+    @Override
+    public KVMStoragePool getStoragePool(String uuid, boolean refreshInfo) {
+        logger.info("Fetching CLVM/CLVM_NG storage pool {} ", uuid);
+        try {
+            Connect conn = LibvirtConnection.getConnection();
+            StoragePool storage = conn.storagePoolLookupByUUIDString(uuid);
+
+            LibvirtStoragePoolDef spd = getStoragePoolDef(conn, storage);
+            if (spd == null) {
+                throw new CloudRuntimeException("Unable to parse storage pool definition for pool " + uuid);
+            }
+
+            // CLVM pools in libvirt are always LOGICAL type
+            StoragePoolType type = StoragePoolType.CLVM;
+
+            // Do NOT activate the pool — CLVM/CLVM_NG pools stay inactive in libvirt
+            LibvirtStoragePool pool = new LibvirtStoragePool(uuid, storage.getName(), type, this, storage);
+            pool.setLocalPath(spd.getTargetPath());
+
+            // Always read capacity from LVM directly
+            String vgName = storage.getName();
+            try {
+                long[] vgStats = getVgStats(vgName);
+                setPoolCapacityFromVgStats(pool, vgStats, vgName);
+            } catch (CloudRuntimeException e) {
+                logger.warn("Failed to get VG stats for CLVM/CLVM_NG pool {}: {}. Using libvirt values (may be 0)", vgName, e.getMessage());
+                pool.setCapacity(storage.getInfo().capacity);
+                pool.setUsed(storage.getInfo().allocation);
+                pool.setAvailable(storage.getInfo().available);
+            }
+
+            return pool;
+        } catch (LibvirtException e) {
+            logger.debug("CLVM/CLVM_NG pool {} not found in libvirt, creating virtual pool", uuid);
+            throw new CloudRuntimeException(e.toString(), e);
+        }
+    }
+
+    @Override
+    public KVMPhysicalDisk getPhysicalDisk(String volumeUuid, KVMStoragePool pool) {
+        LibvirtStoragePool libvirtPool = (LibvirtStoragePool) pool;
+
+        // Pool has no libvirt backing - go directly to block device
+        if (libvirtPool.getPool() == null) {
+            logger.debug("CLVM/CLVM_NG pool has no libvirt backing, using direct block device access for volume: {}", volumeUuid);
+            return getPhysicalDiskViaDirectBlockDevice(volumeUuid, pool);
+        }
+
+        try {
+            StorageVol vol = getVolume(libvirtPool.getPool(), volumeUuid);
+            if (vol == null) {
+                logger.debug("Volume {} not found in libvirt, falling back to CLVM direct access", volumeUuid);
+                return getPhysicalDiskWithClvmFallback(volumeUuid, pool, libvirtPool);
+            }
+
+            boolean isQcow2 = StoragePoolType.CLVM_NG.equals(pool.getType());
+            KVMPhysicalDisk disk = new KVMPhysicalDisk(vol.getPath(), vol.getName(), pool);
+            disk.setSize(vol.getInfo().allocation);
+            disk.setVirtualSize(isQcow2 ? getQcow2VirtualSize(vol.getPath()) : vol.getInfo().capacity);
+            disk.setFormat(isQcow2 ? PhysicalDiskFormat.QCOW2 : PhysicalDiskFormat.RAW);
+            return disk;
+        } catch (LibvirtException e) {
+            logger.warn("LibvirtException looking up volume {}: {}", volumeUuid, e.getMessage());
+            return getPhysicalDiskWithClvmFallback(volumeUuid, pool, libvirtPool);
+        }
+    }
+
+    @Override
+    public KVMPhysicalDisk createPhysicalDisk(String name, KVMStoragePool pool,
+            PhysicalDiskFormat format, Storage.ProvisioningType provisioningType, long size, byte[] passphrase) {
+        logger.info("Creating CLVM/CLVM_NG volume {} in pool {} with size {}", name, pool.getUuid(), toHumanReadableSize(size));
+
+        if (StoragePoolType.CLVM_NG.equals(pool.getType())) {
+            return createClvmNgDiskWithBacking(name, 0, size, null, pool, provisioningType);
+        } else {
+            return createClvmVolume(name, size, pool);
+        }
+    }
+
+    @Override
+    public boolean connectPhysicalDisk(String name, KVMStoragePool pool, Map<String, String> details, boolean isVMMigrate) {
+        if (isVMMigrate) {
+            logger.info("Activating CLVM/CLVM_NG volume {} in shared mode for VM migration", name);
+            Script activateVol = new Script("lvchange", 30000, logger);
+            activateVol.add("-asy");
+            activateVol.add(pool.getLocalPath() + File.separator + name);
+            String result = activateVol.execute();
+            if (result != null) {
+                logger.error("Failed to activate CLVM/CLVM_NG volume {} in shared mode. Output: {}", name, result);
+                return false;
+            }
+        }
+
+        if (StoragePoolType.CLVM_NG.equals(pool.getType())) {
+            ensureClvmNgBackingFileAccessible(name, pool);
+        }
+
+        return true;
+    }
+
+    @Override
+    public KVMPhysicalDisk createDiskFromTemplate(KVMPhysicalDisk template,
+            String name, PhysicalDiskFormat format, Storage.ProvisioningType provisioningType,
+            long size, KVMStoragePool destPool, int timeout, byte[] passphrase) {
+
+        if (StoragePoolType.CLVM_NG.equals(destPool.getType()) && format == PhysicalDiskFormat.QCOW2) {
+            logger.info("Creating CLVM_NG volume {} with backing file from template {}", name, template.getName());
+            String backingFile = getClvmBackingFile(template, destPool);
+            return createClvmNgDiskWithBacking(name, timeout, size, backingFile, destPool, provisioningType);
+        }
+
+        return super.createDiskFromTemplate(template, name, format, provisioningType, size, destPool, timeout, passphrase);
+    }
+
+    @Override
+    public void createTemplate(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) {
+        String vgName = getVgName(pool.getLocalPath());
+        String lvName = "template-" + templateUuid;
+        String lvPath = "/dev/" + vgName + "/" + lvName;
+
+        if (lvExists(lvPath)) {
+            logger.info("Template LV {} already exists in VG {}. Skipping creation.", lvName, vgName);
+            return;
+        }
+
+        logger.info("Creating new template LV {} in VG {} for template {}", lvName, vgName, templateUuid);
+
+        long virtualSize = getQcow2VirtualSize(templatePath);
+        long physicalSize = getQcow2PhysicalSize(templatePath);
+        long lvSize = virtualSize;
+
+        logger.info("Template source - Physical: {} bytes, Virtual: {} bytes, LV will be: {} bytes", physicalSize, virtualSize, lvSize);
+
+        Script lvcreate = new Script("lvcreate", Duration.millis(timeout), logger);
+        lvcreate.add("-n", lvName);
+        lvcreate.add("-L", lvSize + "B");
+        lvcreate.add("--yes");
+        lvcreate.add(vgName);
+        String result = lvcreate.execute();
+        if (result != null) {
+            throw new CloudRuntimeException("Failed to create LV for CLVM_NG template: " + result);
+        }
+
+        Script qemuImgConvert = new Script("qemu-img", Duration.millis(timeout), logger);
+        qemuImgConvert.add("convert");
+        qemuImgConvert.add(templatePath);
+        qemuImgConvert.add("-O", "qcow2");
+        qemuImgConvert.add("-o", "cluster_size=64k,extended_l2=off,preallocation=off");
+        qemuImgConvert.add(lvPath);
+        result = qemuImgConvert.execute();
+
+        if (result != null) {
+            removeLvOnFailure(lvPath, timeout);
+            throw new CloudRuntimeException("Failed to convert template to CLVM_NG volume: " + result);
+        }
+
+        long actualVirtualSize = getQcow2VirtualSize(lvPath);
+
+        try {
+            ensureTemplateLvInSharedMode(lvPath, true);
+        } catch (CloudRuntimeException e) {
+            logger.error("Failed to activate template LV {} in shared mode. Cleaning up.", lvPath);
+            removeLvOnFailure(lvPath, timeout);
+            throw e;
+        }
+
+        KVMPhysicalDisk templateDisk = new KVMPhysicalDisk(lvPath, lvName, pool);
+        templateDisk.setFormat(PhysicalDiskFormat.QCOW2);
+        templateDisk.setVirtualSize(actualVirtualSize);
+        templateDisk.setSize(lvSize);
+    }
+
+    private StoragePool createCLVMStoragePool(Connect conn, String uuid, String host, String path) {
+        String volgroupPath = "/dev/" + path;
+        String volgroupName = path;
+        volgroupName = volgroupName.replaceFirst("^/", "");
+
+        Script checkVgExists = new Script("vgs", 30000, logger);
+        checkVgExists.add("--noheadings");
+        checkVgExists.add("-o", "vg_name");
+        checkVgExists.add(volgroupName);
+        String vgCheckResult = checkVgExists.execute();
+
+        if (vgCheckResult != null) {
+            logger.error("Volume group {} does not exist or is not accessible", volgroupName);
+            return null;
+        }
+
+        logger.info("Volume group {} verified, creating libvirt pool definition for CLVM/CLVM_NG", volgroupName);
+        LibvirtStoragePoolDef poolDef = new LibvirtStoragePoolDef(
+            LibvirtStoragePoolDef.PoolType.LOGICAL,
+            volgroupName,
+            uuid,
+            null,
+            volgroupName,
+            volgroupPath
+        );
+
+        try {
+            StoragePool pool = conn.storagePoolDefineXML(poolDef.toString(), 0);
+            logger.info("Created libvirt pool definition for CLVM/CLVM_NG VG: {} (pool will remain inactive)", volgroupName);
+            pool.setAutostart(1);
+            return pool;
+        } catch (LibvirtException e) {
+            logger.warn("Failed to define CLVM/CLVM_NG pool in libvirt: {}", e.getMessage());
+            return null;
+        }
+    }
+
+    private void setPoolCapacityFromVgStats(LibvirtStoragePool pool, long[] vgStats, String vgName) {
+        long capacity = vgStats[0];
+        long available = vgStats[1];
+        long used = capacity - available;
+
+        pool.setCapacity(capacity);
+        pool.setAvailable(available);
+        pool.setUsed(used);
+
+        logger.debug("CLVM/CLVM_NG pool {} - Capacity: {}, Used: {}, Available: {}",
+                vgName, toHumanReadableSize(capacity), toHumanReadableSize(used), toHumanReadableSize(available));
+    }
+
+    private long[] getVgStats(String vgName) {
+        Script getVgStats = new Script("vgs", 30000, logger);
+        getVgStats.add("--noheadings");
+        getVgStats.add("--units", "b");
+        getVgStats.add("--nosuffix");
+        getVgStats.add("-o", "vg_size,vg_free");
+        getVgStats.add(vgName);
+
+        OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+        String result = getVgStats.execute(parser);
+
+        if (result != null) {
+            String errorMsg = "Failed to get statistics for volume group " + vgName + ": " + result;
+            logger.error(errorMsg);
+            throw new CloudRuntimeException(errorMsg);
+        }
+
+        String output = parser.getLines().trim();
+        String[] lines = output.split("\\n");
+        String dataLine = null;
+
+        for (String line : lines) {
+            line = line.trim();
+            if (!line.isEmpty() && Character.isDigit(line.charAt(0))) {
+                dataLine = line;
+                break;
+            }
+        }
+
+        if (dataLine == null) {
+            String errorMsg = "No valid data line found in vgs output for " + vgName + ": " + output;
+            logger.error(errorMsg);
+            throw new CloudRuntimeException(errorMsg);
+        }
+
+        String[] stats = dataLine.split("\\s+");
+
+        if (stats.length < 2) {
+            String errorMsg = "Unexpected output from vgs command for " + vgName + ": " + dataLine;
+            logger.error(errorMsg);
+            throw new CloudRuntimeException(errorMsg);
+        }
+
+        try {
+            long capacity = Long.parseLong(stats[0].trim());
+            long available = Long.parseLong(stats[1].trim());
+            return new long[]{capacity, available};
+        } catch (NumberFormatException e) {
+            String errorMsg = "Failed to parse VG statistics for " + vgName + ": " + e.getMessage();
+            logger.error(errorMsg);
+            throw new CloudRuntimeException(errorMsg, e);
+        }
+    }
+
+    private KVMStoragePool createVirtualClvmPool(String uuid, String host, String path, StoragePoolType type, Map<String, String> details) {
+        String volgroupName = path.replaceFirst("^/", "");
+        String volgroupPath = "/dev/" + volgroupName;
+
+        logger.info("Creating virtual CLVM/CLVM_NG pool {} without libvirt using direct LVM access", volgroupName);
+
+        long[] vgStats = getVgStats(volgroupName);
+
+        LibvirtStoragePool pool = new LibvirtStoragePool(uuid, volgroupName, type, this, null);
+        pool.setLocalPath(volgroupPath);
+        setPoolCapacityFromVgStats(pool, vgStats, volgroupName);
+
+        if (details != null) {
+            pool.setDetails(details);
+        }
+
+        return pool;
+    }
+
+    /**
+     * CLVM fallback: First tries to refresh libvirt pool to make volume visible,
+     * if that fails, accesses volume directly via block device path.
+     */
+    private KVMPhysicalDisk getPhysicalDiskWithClvmFallback(String volumeUuid, KVMStoragePool pool, LibvirtStoragePool libvirtPool) {
+        logger.info("CLVM volume not visible to libvirt, attempting pool refresh for volume: {}", volumeUuid);
+
+        try {
+            logger.debug("Refreshing libvirt storage pool: {}", pool.getUuid());
+            libvirtPool.getPool().refresh(0);
+
+            StorageVol vol = getVolume(libvirtPool.getPool(), volumeUuid);
+            if (vol != null) {
+                logger.info("Volume found after pool refresh: {}", volumeUuid);
+                boolean isQcow2 = StoragePoolType.CLVM_NG.equals(pool.getType());
+                KVMPhysicalDisk disk = new KVMPhysicalDisk(vol.getPath(), vol.getName(), pool);
+                disk.setSize(vol.getInfo().allocation);
+                disk.setVirtualSize(isQcow2 ? getQcow2VirtualSize(vol.getPath()) : vol.getInfo().capacity);
+                disk.setFormat(isQcow2 ? PhysicalDiskFormat.QCOW2 : PhysicalDiskFormat.RAW);
+                return disk;
+            }
+        } catch (LibvirtException refreshEx) {
+            logger.debug("Pool refresh failed or volume still not found: {}", refreshEx.getMessage());
+        }
+
+        logger.info("Falling back to direct block device access for volume: {}", volumeUuid);
+        return getPhysicalDiskViaDirectBlockDevice(volumeUuid, pool);
+    }
+
+    private String getVgName(String sourceDir) {
+        String vgName = sourceDir;
+        if (vgName.startsWith("/")) {
+            String[] parts = vgName.split("/");
+            List<String> tokens = Arrays.stream(parts)
+                    .filter(s -> !s.isEmpty()).collect(Collectors.toList());
+
+            vgName = tokens.size() > 1 ? tokens.get(1)
+                    : tokens.size() == 1 ? tokens.get(0)
+                      : "";
+        }
+        return vgName;
+    }
+
+    private String extractVgNameFromPool(KVMStoragePool pool) {
+        String sourceDir = pool.getLocalPath();
+        if (sourceDir == null || sourceDir.isEmpty()) {
+            throw new CloudRuntimeException("CLVM pool sourceDir is not set, cannot determine VG name");
+        }
+        String vgName = getVgName(sourceDir);
+        logger.debug("Using VG name: {} (from sourceDir: {})", vgName, sourceDir);
+        return vgName;
+    }
+
+    /**
+     * For CLVM volumes that exist in LVM but are not visible to libvirt,
+     * access them directly via block device path.
+     */
+    private KVMPhysicalDisk getPhysicalDiskViaDirectBlockDevice(String volumeUuid, KVMStoragePool pool) {
+        try {
+            String vgName = extractVgNameFromPool(pool);
+
+            verifyLvExistsInVg(volumeUuid, vgName);
+
+            logger.info("Volume {} exists in LVM but not visible to libvirt, accessing directly", volumeUuid);
+
+            String lvPath = findAccessibleDeviceNode(volumeUuid, vgName, pool);
+            long size = getClvmVolumeSize(lvPath);
+
+            KVMPhysicalDisk disk = createPhysicalDiskFromClvmLv(lvPath, volumeUuid, pool, size);
+            ensureTemplateAccessibility(volumeUuid, lvPath, pool);
+
+            return disk;
+        } catch (CloudRuntimeException ex) {
+            throw ex;
+        } catch (Exception ex) {
+            logger.error("Failed to access CLVM volume via direct block device: {}", volumeUuid, ex);
+            throw new CloudRuntimeException(String.format("Could not find volume %s: %s", volumeUuid, ex.getMessage()));
+        }
+    }
+
+    private void verifyLvExistsInVg(String volumeUuid, String vgName) {
+        logger.debug("Checking if volume {} exists in VG {}", volumeUuid, vgName);
+        Script checkLvCmd = new Script("/usr/sbin/lvs", 30000, logger);
+        checkLvCmd.add("--noheadings");
+        checkLvCmd.add("--unbuffered");
+        checkLvCmd.add(vgName + "/" + volumeUuid);
+        String checkResult = checkLvCmd.execute();
+        if (checkResult != null) {
+            throw new CloudRuntimeException(String.format("Storage volume not found: no storage vol with matching name '%s'", volumeUuid));
+        }
+    }
+
+    private String findAccessibleDeviceNode(String volumeUuid, String vgName, KVMStoragePool pool) {
+        String lvPath = "/dev/" + vgName + "/" + volumeUuid;
+        File lvDevice = new File(lvPath);
+
+        if (!lvDevice.exists()) {
+            lvPath = tryDeviceMapperPath(volumeUuid, vgName);
+            if (!new File(lvPath).exists()) {
+                lvPath = handleMissingDeviceNode(volumeUuid, vgName, pool);
+            }
+        }
+
+        return lvPath;
+    }
+
+    private String tryDeviceMapperPath(String volumeUuid, String vgName) {
+        String vgNameEscaped = vgName.replace("-", "--");
+        String volumeUuidEscaped = volumeUuid.replace("-", "--");
+        return "/dev/mapper/" + vgNameEscaped + "-" + volumeUuidEscaped;
+    }
+
+    private String handleMissingDeviceNode(String volumeUuid, String vgName, KVMStoragePool pool) {
+        if (StoragePoolType.CLVM_NG.equals(pool.getType()) && volumeUuid.startsWith("template-")) {
+            return activateTemplateAndGetPath(volumeUuid, vgName);
+        }
+        throw new CloudRuntimeException(String.format("Could not find volume %s in VG %s - volume exists in LVM but device node not accessible", volumeUuid, vgName));
+    }
+
+    private String activateTemplateAndGetPath(String volumeUuid, String vgName) {
+        logger.info("Template volume {} device node not found. Attempting to activate in shared mode.", volumeUuid);
+        String templateLvPath = "/dev/" + vgName + "/" + volumeUuid;
+
+        try {
+            ensureTemplateLvInSharedMode(templateLvPath, false);
+
+            String lvPath = findDeviceNodeAfterActivation(templateLvPath, volumeUuid, vgName);
+
+            logger.info("Successfully activated template volume {} at {}", volumeUuid, lvPath);
+            return lvPath;
+        } catch (CloudRuntimeException e) {
+            throw new CloudRuntimeException(String.format("Failed to activate template volume %s in VG %s: %s", volumeUuid, vgName, e.getMessage()), e);
+        }
+    }
+
+    private String findDeviceNodeAfterActivation(String templateLvPath, String volumeUuid, String vgName) {
+        File lvDevice = new File(templateLvPath);
+        String lvPath = templateLvPath;
+
+        if (!lvDevice.exists()) {
+            String vgNameEscaped = vgName.replace("-", "--");
+            String volumeUuidEscaped = volumeUuid.replace("-", "--");
+            lvPath = "/dev/mapper/" + vgNameEscaped + "-" + volumeUuidEscaped;
+            lvDevice = new File(lvPath);
+        }
+
+        if (!lvDevice.exists()) {
+            logger.error("Template volume {} still not accessible after activation attempt", volumeUuid);
+            throw new CloudRuntimeException(String.format("Could not activate template volume %s in VG %s - device node not accessible after activation", volumeUuid, vgName));
+        }
+
+        return lvPath;
+    }
+
+    private void ensureTemplateAccessibility(String volumeUuid, String lvPath, KVMStoragePool pool) {
+        if (StoragePoolType.CLVM_NG.equals(pool.getType()) && volumeUuid.startsWith("template-")) {
+            logger.info("Detected template volume {}. Ensuring it's activated in shared mode.", volumeUuid);
+            ensureTemplateLvInSharedMode(lvPath, false);
+        }
+    }
+
+    private long getClvmVolumeSize(String lvPath) {
+        try {
+            Script lvsCmd = new Script("/usr/sbin/lvs", 30000, logger);
+            lvsCmd.add("--noheadings");
+            lvsCmd.add("--units");
+            lvsCmd.add("b");
+            lvsCmd.add("-o");
+            lvsCmd.add("lv_size");
+            lvsCmd.add(lvPath);
+
+            OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+            String result = lvsCmd.execute(parser);
+
+            String output = (result == null) ? parser.getLines() : result;
+
+            if (output != null && !output.isEmpty()) {
+                String sizeStr = output.trim().replaceAll("[^0-9]", "");
+                if (!sizeStr.isEmpty()) {
+                    return Long.parseLong(sizeStr);
+                }
+            }
+        } catch (Exception sizeEx) {
+            logger.warn("Failed to get size for CLVM volume via lvs: {}", sizeEx.getMessage());
+            File lvDevice = new File(lvPath);
+            if (lvDevice.isFile()) {
+                return lvDevice.length();
+            }
+        }
+        return 0;
+    }
+
+    private KVMPhysicalDisk createPhysicalDiskFromClvmLv(String lvPath, String volumeUuid, KVMStoragePool pool, long size) {
+        PhysicalDiskFormat diskFormat = StoragePoolType.CLVM_NG.equals(pool.getType())
+                ? PhysicalDiskFormat.QCOW2 : PhysicalDiskFormat.RAW;
+
+        logger.debug("{} pool detected, setting disk format to {} for volume {}", pool.getType(), diskFormat, volumeUuid);
+
+        KVMPhysicalDisk disk = new KVMPhysicalDisk(lvPath, volumeUuid, pool);
+        disk.setFormat(diskFormat);
+        disk.setSize(size);
+        disk.setVirtualSize(diskFormat == PhysicalDiskFormat.QCOW2 ? getQcow2VirtualSize(lvPath) : size);
+
+        logger.info("Successfully accessed CLVM/CLVM_NG volume via direct block device: {} with format: {} and size: {} bytes",
+                lvPath, diskFormat, size);
+        return disk;
+    }
+
+    /**
+     * Checks if a CLVM_NG QCOW2 volume has a backing file (template) and ensures it's activated in shared mode.
+     */
+    private void ensureClvmNgBackingFileAccessible(String volumeName, KVMStoragePool pool) {
+        try {
+            String vgName = getVgName(pool.getLocalPath());
+            String volumePath = "/dev/" + vgName + "/" + volumeName;
+
+            logger.debug("Checking if CLVM_NG volume {} has a backing file that needs activation", volumePath);
+
+            Script qemuImgInfo = new Script("qemu-img", Duration.millis(10000), logger);
+            qemuImgInfo.add("info");
+            qemuImgInfo.add("--output=json");
+            qemuImgInfo.add(volumePath);
+
+            OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+            String result = qemuImgInfo.execute(parser);
+
+            if (result == null && parser.getLines() != null && !parser.getLines().isEmpty()) {
+                String jsonOutput = parser.getLines();
+
+                if (jsonOutput.contains("\"backing-filename\"")) {
+                    int backingStart = jsonOutput.indexOf("\"backing-filename\"");
+                    if (backingStart > 0) {
+                        int valueStart = jsonOutput.indexOf(":", backingStart);
+                        if (valueStart > 0) {
+                            valueStart = jsonOutput.indexOf("\"", valueStart) + 1;
+                            int valueEnd = jsonOutput.indexOf("\"", valueStart);
+
+                            if (valueEnd > valueStart) {
+                                String backingFile = jsonOutput.substring(valueStart, valueEnd).trim();
+                                if (!backingFile.isEmpty() && backingFile.startsWith("/dev/")) {
+                                    logger.info("Volume {} has backing file: {}. Ensuring backing file is in shared mode.", volumePath, backingFile);
+                                    ensureTemplateLvInSharedMode(backingFile, false);
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    logger.debug("Volume {} does not have a backing file (full clone)", volumePath);
+                }
+            }
+        } catch (Exception e) {
+            logger.warn("Failed to check/activate backing file for volume {}: {}. VM deployment may fail if template is not accessible.",
+                    volumeName, e.getMessage());
+        }
+    }
+
+    private String getClvmBackingFile(KVMPhysicalDisk template, KVMStoragePool destPool) {
+        String templateLvName = template.getName();
+        KVMPhysicalDisk templateOnPrimary = null;
+
+        try {
+            templateOnPrimary = destPool.getPhysicalDisk(templateLvName);
+        } catch (CloudRuntimeException e) {
+            logger.warn("Template {} not found on CLVM_NG pool {}.", templateLvName, destPool.getUuid());
+        }
+
+        if (templateOnPrimary != null) {
+            String backingFile = templateOnPrimary.getPath();
+            logger.info("Using template on primary storage as backing file: {}", backingFile);
+            ensureTemplateLvInSharedMode(backingFile);
+            return backingFile;
+        }
+
+        logger.error("Template {} should be on primary storage before creating volumes from it", templateLvName);
+        throw new CloudRuntimeException(String.format("Template not found on CLVM_NG primary storage: %s. Template must be copied to primary storage first.", templateLvName));
+    }
+
+    /**
+     * Ensures a template LV is activated in shared mode so multiple VMs can use it as a backing file.
+     */
+    private void ensureTemplateLvInSharedMode(String templatePath, boolean throwOnFailure) {
+        try {
+            Script checkLvs = new Script("lvs", Duration.millis(30000), logger);
+            checkLvs.add("--noheadings");
+            checkLvs.add("-o", "lv_attr");
+            checkLvs.add(templatePath);
+
+            OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+            String result = checkLvs.execute(parser);
+
+            if (result == null && parser.getLines() != null && !parser.getLines().isEmpty()) {
+                String lvAttr = parser.getLines().trim();
+                if (lvAttr.length() >= 6) {
+                    boolean isActive = (lvAttr.indexOf('a') >= 0);
+                    boolean isShared = (lvAttr.indexOf('s') >= 0);
+
+                    if (!isShared || !isActive) {
+                        logger.info("Template LV {} is not in shared mode (attr: {}). Activating in shared mode.", templatePath, lvAttr);
+                        LibvirtComputingResource.setClvmVolumeToSharedMode(templatePath);
+                    } else {
+                        logger.debug("Template LV {} is already in shared mode (attr: {})", templatePath, lvAttr);
+                    }
+                }
+            }
+        } catch (CloudRuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            String errorMsg = "Failed to check/ensure template LV shared mode for " + templatePath + ": " + e.getMessage();
+            if (throwOnFailure) {
+                throw new CloudRuntimeException(errorMsg, e);
+            } else {
+                logger.warn(errorMsg, e);
+            }
+        }
+    }
+
+    private void ensureTemplateLvInSharedMode(String templatePath) {
+        ensureTemplateLvInSharedMode(templatePath, false);
+    }
+
+    private long getVgPhysicalExtentSize(String vgName) {
+        final long DEFAULT_PE_SIZE = 4 * 1024 * 1024L;
+        String warningMessage = String.format("Failed to get PE size for VG %s, defaulting to 4MiB", vgName);
+
+        try {
+            Script vgDisplay = new Script("vgdisplay", 300000, logger);
+            vgDisplay.add("--units", "b");
+            vgDisplay.add("-C");
+            vgDisplay.add("--noheadings");
+            vgDisplay.add("-o", "vg_extent_size");
+            vgDisplay.add(vgName);
+
+            OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+            String result = vgDisplay.execute(parser);
+
+            if (result != null) {
+                logger.warn("{}: {}", warningMessage, result);
+                return DEFAULT_PE_SIZE;
+            }
+
+            String output = parser.getLines();
+            if (output == null || output.trim().isEmpty()) {
+                logger.warn("{}: empty output", warningMessage);
+                return DEFAULT_PE_SIZE;
+            }
+
+            output = output.trim();
+            if (output.endsWith("B")) {
+                output = output.substring(0, output.length() - 1).trim();
+            }
+
+            long peSize = Long.parseLong(output);
+            logger.debug("Physical Extent size for VG {} is {} bytes", vgName, peSize);
+            return peSize;
+        } catch (NumberFormatException e) {
+            logger.warn("{}: failed to parse PE size", warningMessage, e);
+        } catch (Exception e) {
+            logger.warn("{}: {}", warningMessage, e.getMessage());
+        }
+
+        logger.info("Using default PE size for VG {}: {} bytes (4 MiB)", vgName, DEFAULT_PE_SIZE);
+        return DEFAULT_PE_SIZE;
+    }
+
+    /**
+     * Calculate LVM LV size for CLVM_NG volume allocation.
+     * {@code peSize} must be the Physical Extent size of the VG (from {@link #getVgPhysicalExtentSize}).
+     */
+    private long calculateClvmNgLvSize(long virtualSize, long peSize) {
+        long clusterSize = 64 * 1024L;
+        long l2Multiplier = 4096L;
+
+        long numDataClusters = (virtualSize + clusterSize - 1) / clusterSize;
+        long numL2Clusters = (numDataClusters + l2Multiplier - 1) / l2Multiplier;
+        long l2TableSize = numL2Clusters * clusterSize;
+        long refcountTableSize = l2TableSize;
+
+        long headerOverhead = 2 * 1024 * 1024L;
+        long metadataOverhead = l2TableSize + refcountTableSize + headerOverhead;
+        long targetSize = virtualSize + metadataOverhead;
+        long roundedSize = ((targetSize + peSize - 1) / peSize) * peSize;
+        long virtualSizeGiB = virtualSize / (1024 * 1024 * 1024L);
+        long overheadMiB = metadataOverhead / (1024 * 1024L);
+
+        logger.info("Calculated volume LV size: {} bytes (virtual: {} GiB, QCOW2 metadata overhead: {} MiB, rounded to {} PEs, PE size = {} bytes)",
+                roundedSize, virtualSizeGiB, overheadMiB, roundedSize / peSize, peSize);
+
+        return roundedSize;
+    }
+
+    private long getQcow2VirtualSize(String imagePath) {
+        Script qemuImg = new Script("qemu-img", 300000, logger);
+        qemuImg.add("info");
+        qemuImg.add("--output=json");
+        qemuImg.add("-U");
+        qemuImg.add(imagePath);
+
+        OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+        String result = qemuImg.execute(parser);
+
+        if (result != null) {
+            throw new CloudRuntimeException("Failed to get QCOW2 virtual size for " + imagePath + ": " + result);
+        }
+
+        String output = parser.getLines();
+        if (output == null || output.trim().isEmpty()) {
+            throw new CloudRuntimeException("qemu-img info returned empty output for " + imagePath);
+        }
+
+        JsonObject info = JsonParser.parseString(output).getAsJsonObject();
+        return info.get("virtual-size").getAsLong();
+    }
+
+    private long getQcow2PhysicalSize(String imagePath) {
+        Script qemuImg = new Script("qemu-img", Duration.millis(300000), logger);
+        qemuImg.add("info");
+        qemuImg.add("--output=json");
+        qemuImg.add(imagePath);
+
+        OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+        String result = qemuImg.execute(parser);
+
+        if (result != null) {
+            throw new CloudRuntimeException("Failed to get QCOW2 physical size for " + imagePath + ": " + result);
+        }
+
+        String output = parser.getLines();
+        if (output == null || output.trim().isEmpty()) {
+            throw new CloudRuntimeException("qemu-img info returned empty output for " + imagePath);
+        }
+
+        JsonObject info = JsonParser.parseString(output).getAsJsonObject();
+        return info.get("actual-size").getAsLong();
+    }
+
+    private KVMPhysicalDisk createClvmNgDiskWithBacking(String volumeUuid, int timeout, long virtualSize, String backingFile,
+                                                         KVMStoragePool pool, Storage.ProvisioningType provisioningType) {
+        String vgName = getVgName(pool.getLocalPath());
+        // Query PE size once and reuse for both the QCOW2 virtual-size alignment and the
+        long peSize = getVgPhysicalExtentSize(vgName);
+        long peAlignedVirtualSize = ((virtualSize + peSize - 1) / peSize) * peSize;
+        long lvSize = calculateClvmNgLvSize(peAlignedVirtualSize, peSize);
+        String volumePath = "/dev/" + vgName + "/" + volumeUuid;
+
+        logger.debug("Creating CLVM_NG volume {} with LV size {} bytes (requested virtual: {} bytes, PE-aligned virtual: {} bytes, provisioning: {})",
+                volumeUuid, lvSize, virtualSize, peAlignedVirtualSize, provisioningType);
+
+        Script lvcreate = new Script("lvcreate", Duration.millis(timeout), logger);
+        lvcreate.add("-n", volumeUuid);
+        lvcreate.add("-L", lvSize + "B");
+        lvcreate.add("--yes");
+        lvcreate.add(vgName);
+
+        String result = lvcreate.execute();
+        if (result != null) {
+            throw new CloudRuntimeException("Failed to create LV for CLVM_NG volume: " + result);
+        }
+
+        Script qemuImg = new Script("qemu-img", Duration.millis(timeout), logger);
+        qemuImg.add("create");
+        qemuImg.add("-f", "qcow2");
+
+        StringBuilder qcow2Options = new StringBuilder();
+        String preallocation = (provisioningType == Storage.ProvisioningType.THIN) ? "off" : "metadata";
+        qcow2Options.append("preallocation=").append(preallocation);
+        qcow2Options.append(",extended_l2=on");
+        qcow2Options.append(",cluster_size=64k");
+
+        if (backingFile != null && !backingFile.isEmpty()) {
+            qcow2Options.append(",backing_file=").append(backingFile);
+            qcow2Options.append(",backing_fmt=qcow2");
+            logger.debug("Creating CLVM_NG volume with backing file: {}", backingFile);
+        }
+
+        qemuImg.add("-o", qcow2Options.toString());
+        qemuImg.add(volumePath);
+        qemuImg.add(peAlignedVirtualSize + "");
+
+        result = qemuImg.execute();
+        if (result != null) {
+            removeLvOnFailure(volumePath, timeout);
+            throw new CloudRuntimeException("Failed to create QCOW2 on CLVM_NG volume: " + result);
+        }
+
+        long actualSize = getClvmVolumeSize(volumePath);
+        KVMPhysicalDisk disk = new KVMPhysicalDisk(volumePath, volumeUuid, pool);
+        disk.setFormat(PhysicalDiskFormat.QCOW2);
+        disk.setSize(actualSize);
+        disk.setVirtualSize(peAlignedVirtualSize);
+
+        logger.info("Successfully created CLVM_NG volume {} (LV size: {}, PE-aligned virtual size: {}, provisioning: {}, preallocation: {})",
+                volumeUuid, lvSize, peAlignedVirtualSize, provisioningType, preallocation);
+
+        return disk;
+    }
+
+    private boolean lvExists(String lvPath) {
+        Script checkLv = new Script("lvs", Duration.millis(30000), logger);
+        checkLv.add("--noheadings");
+        checkLv.add("--unbuffered");
+        checkLv.add(lvPath);
+        return checkLv.execute() == null;
+    }
+
+    private void removeLvOnFailure(String lvPath, int timeout) {
+        Script lvremove = new Script("lvremove", Duration.millis(timeout), logger);
+        lvremove.add("-f");
+        lvremove.add(lvPath);
+        lvremove.execute();
+    }
+
+    private KVMPhysicalDisk createClvmVolume(String volumeName, long size, KVMStoragePool pool) {
+        String vgName = getVgName(pool.getLocalPath());
+        String volumePath = "/dev/" + vgName + "/" + volumeName;
+        int timeout = 30000;
+
+        logger.info("Creating CLVM volume {} in VG {} with size {} bytes", volumeName, vgName, size);
+
+        Script lvcreate = new Script("lvcreate", Duration.millis(timeout), logger);
+        lvcreate.add("-n", volumeName);
+        lvcreate.add("-L", size + "B");
+        lvcreate.add("--yes");
+        lvcreate.add(vgName);
+
+        String result = lvcreate.execute();
+        if (result != null) {
+            throw new CloudRuntimeException("Failed to create CLVM volume: " + result);
+        }
+
+        logger.info("Successfully created CLVM volume {} at {} with size {}", volumeName, volumePath, toHumanReadableSize(size));
+
+        long actualSize = getClvmVolumeSize(volumePath);
+        KVMPhysicalDisk disk = new KVMPhysicalDisk(volumePath, volumeName, pool);
+        disk.setFormat(PhysicalDiskFormat.RAW);
+        disk.setSize(actualSize);
+        disk.setVirtualSize(actualSize);
+
+        return disk;
+    }
+
+    @Override
+    public boolean deletePhysicalDisk(String uuid, KVMStoragePool pool, Storage.ImageFormat format) {
+        logger.info("CLVM/CLVM_NG pool detected - using direct LVM cleanup with secure zero-fill for volume {}", uuid);
+        return cleanupCLVMVolume(uuid, pool);
+    }
+
+    /**
+     * Clean up CLVM volume and its snapshots directly using LVM commands.
+     */
+    private boolean cleanupCLVMVolume(String uuid, KVMStoragePool pool) {
+        logger.info("Starting direct LVM cleanup for CLVM volume: {} in pool: {}", uuid, pool.getUuid());
+
+        try {
+            String sourceDir = pool.getLocalPath();
+            if (sourceDir == null || sourceDir.isEmpty()) {
+                logger.debug("Source directory is null or empty, cannot determine VG name for CLVM pool {}, skipping direct cleanup", pool.getUuid());
+                return true;
+            }
+            String vgName = getVgName(sourceDir);
+            logger.info("Determined VG name: {} for pool: {}", vgName, pool.getUuid());
+
+            if (vgName == null || vgName.isEmpty()) {
+                logger.warn("Cannot determine VG name for CLVM pool {}, skipping direct cleanup", pool.getUuid());
+                return true;
+            }
+
+            String lvPath = "/dev/" + vgName + "/" + uuid;
+            logger.debug("Volume path: {}", lvPath);
+
+            Script checkLvs = new Script("lvs", 30000, logger);
+            checkLvs.add("--noheadings");
+            checkLvs.add("--unbuffered");
+            checkLvs.add(lvPath);
+
+            logger.info("Checking if volume exists: lvs --noheadings --unbuffered {}", lvPath);
+            String checkResult = checkLvs.execute();
+
+            if (checkResult != null) {
+                logger.info("CLVM volume {} does not exist in LVM (check returned: {}), considering it as already deleted", uuid, checkResult);
+                return true;
+            }
+
+            logger.info("Volume {} exists, proceeding with cleanup", uuid);
+
+            boolean secureZeroFillEnabled = shouldSecureZeroFill(pool);
+
+            if (secureZeroFillEnabled) {
+                logger.info("Step 1: Zero-filling volume {} for security", uuid);
+                secureZeroFillVolume(lvPath, uuid);
+            } else {
+                logger.info("Secure zero-fill is disabled, skipping zero-filling for volume {}", uuid);
+            }
+
+            logger.info("Step 2: Removing volume {}", uuid);
+            Script removeLv = new Script("lvremove", 30000, logger);
+            removeLv.add("-f");
+            removeLv.add(lvPath);
+
+            logger.info("Executing command: lvremove -f {}", lvPath);
+            String removeResult = removeLv.execute();
+
+            if (removeResult == null) {
+                logger.info("Successfully removed CLVM volume {} using direct LVM cleanup", uuid);
+                return true;
+            } else {
+                logger.warn("Command 'lvremove -f {}' returned error: {}", lvPath, removeResult);
+                if (removeResult.contains("not found") || removeResult.contains("Failed to find")) {
+                    logger.info("CLVM volume {} not found during cleanup, considering it as already deleted", uuid);
+                    return true;
+                }
+                return false;
+            }
+        } catch (Exception ex) {
+            logger.error("Exception during CLVM volume cleanup for {}: {}", uuid, ex.getMessage(), ex);
+            return true;
+        }
+    }
+
+    private boolean shouldSecureZeroFill(KVMStoragePool pool) {
+        Map<String, String> details = pool.getDetails();
+        String secureZeroFillStr = (details != null) ? details.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL) : null;
+        return Boolean.parseBoolean(secureZeroFillStr);
+    }
+
+    /**
+     * Securely zero-fill a volume before deletion to prevent data leakage.
+     * Uses blkdiscard (fast TRIM) as primary method, with dd zero-fill as fallback.
+     */
+    private void secureZeroFillVolume(String lvPath, String volumeUuid) {
+        logger.info("Starting secure zero-fill for CLVM volume: {} at path: {}", volumeUuid, lvPath);
+
+        boolean blkdiscardSuccess = false;
+
+        try {
+            Script blkdiscard = new Script("blkdiscard", 300000, logger);
+            blkdiscard.add("-f");
+            blkdiscard.add(lvPath);
+
+            String result = blkdiscard.execute();
+            if (result == null) {
+                logger.info("Successfully zero-filled CLVM volume {} using blkdiscard (TRIM)", volumeUuid);
+                blkdiscardSuccess = true;
+            } else {
+                if (result.contains("Operation not supported") || result.contains("BLKDISCARD ioctl failed")) {
+                    logger.info("blkdiscard not supported for volume {} (device doesn't support TRIM/DISCARD), using dd fallback", volumeUuid);
+                } else {
+                    logger.warn("blkdiscard failed for volume {}: {}, will try dd fallback", volumeUuid, result);
+                }
+            }
+        } catch (Exception e) {
+            logger.warn("Exception during blkdiscard for volume {}: {}, will try dd fallback", volumeUuid, e.getMessage());
+        }
+
+        if (!blkdiscardSuccess) {
+            logger.info("Attempting zero-fill using dd for CLVM volume: {}", volumeUuid);
+            try {
+                String command = String.format(
+                    "nice -n 19 ionice -c 2 -n 7 dd if=/dev/zero of=%s bs=1M oflag=direct 2>&1 || true",
+                    lvPath
+                );
+
+                Script ddZeroFill = new Script("/bin/bash", 3600000, logger);
+                ddZeroFill.add("-c");
+                ddZeroFill.add(command);
+
+                OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+                String ddResult = ddZeroFill.execute(parser);
+                String output = parser.getLines();
+
+                if (output != null && (output.contains("copied") || output.contains("records in") ||
+                    output.contains("No space left on device"))) {
+                    logger.info("Successfully zero-filled CLVM volume {} using dd", volumeUuid);
+                } else if (ddResult == null) {
+                    logger.info("Zero-fill completed for CLVM volume {}", volumeUuid);
+                } else {
+                    logger.warn("dd zero-fill for volume {} completed with output: {}", volumeUuid,
+                        output != null ? output : ddResult);
+                }
+            } catch (Exception e) {
+                logger.warn("Failed to zero-fill CLVM volume {} before deletion: {}. Proceeding with deletion anyway.",
+                        volumeUuid, e.getMessage());
+            }
+        }
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java
index 3e35ed9476b..a8207cec3fa 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePool.java
@@ -33,6 +33,7 @@ import com.cloud.storage.Storage.StoragePoolType;
 
 public interface KVMStoragePool {
 
+    public static final String CLVM_SECURE_ZERO_FILL = "clvmsecurezerofill";
     long HeartBeatUpdateTimeoutInMs = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.HEARTBEAT_UPDATE_TIMEOUT);
     long HeartBeatUpdateFreqInMs = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.KVM_HEARTBEAT_UPDATE_FREQUENCY);
     long HeartBeatCheckerTimeoutInMs = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.KVM_HEARTBEAT_CHECKER_TIMEOUT);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index 35cc864268c..996398a286f 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -72,7 +72,9 @@ public class KVMStoragePoolManager {
 
     private void addStoragePool(String uuid, StoragePoolInformation pool) {
         synchronized (_storagePools) {
-            if (!_storagePools.containsKey(uuid)) {
+            // Insert on first registration; on subsequent calls (e.g. ModifyStoragePoolCommand)
+            // overwrite when new details are present so config changes are reflected
+            if (!_storagePools.containsKey(uuid) || MapUtils.isNotEmpty(pool.getDetails())) {
                 _storagePools.put(uuid, pool);
             }
         }
@@ -81,6 +83,10 @@ public class KVMStoragePoolManager {
     public KVMStoragePoolManager(StorageLayer storagelayer, KVMHAMonitor monitor) {
         this._haMonitor = monitor;
         this._storageMapper.put("libvirt", new LibvirtStorageAdaptor(storagelayer));
+        // Register CLVM/CLVM_NG adaptor explicitly for both types (one shared instance)
+        ClvmStorageAdaptor clvmAdaptor = new ClvmStorageAdaptor(storagelayer);
+        this._storageMapper.put(StoragePoolType.CLVM.toString(), clvmAdaptor);
+        this._storageMapper.put(StoragePoolType.CLVM_NG.toString(), clvmAdaptor);
         // add other storage adaptors manually here
 
         // add any adaptors that wish to register themselves via call to adaptor.getStoragePoolType()
@@ -92,8 +98,8 @@ public class KVMStoragePoolManager {
                 logger.debug("Skipping registration of abstract class / interface " + storageAdaptorClass.getName());
                 continue;
             }
-            if (storageAdaptorClass.isAssignableFrom(LibvirtStorageAdaptor.class)) {
-                logger.debug("Skipping re-registration of LibvirtStorageAdaptor");
+            if (storageAdaptorClass == LibvirtStorageAdaptor.class || storageAdaptorClass == ClvmStorageAdaptor.class) {
+                logger.debug("Skipping re-registration of explicitly registered adaptor: {}", storageAdaptorClass.getSimpleName());
                 continue;
             }
             try {
@@ -288,19 +294,45 @@ public class KVMStoragePoolManager {
         }
 
         if (pool instanceof LibvirtStoragePool) {
-            addPoolDetails(uuid, (LibvirtStoragePool) pool);
+            LibvirtStoragePool libvirtPool = (LibvirtStoragePool) pool;
+            addPoolDetails(uuid, libvirtPool);
+
             ((LibvirtStoragePool) pool).setType(type);
+            updatePoolTypeIfApplicable(libvirtPool, pool, type, uuid);
         }
 
         return pool;
     }
 
+    private void updatePoolTypeIfApplicable(LibvirtStoragePool libvirtPool, KVMStoragePool pool,
+                                            StoragePoolType type, String uuid) {
+        StoragePoolType correctType = type;
+        if (correctType == null || correctType == StoragePoolType.CLVM) {
+            StoragePoolInformation info = _storagePools.get(uuid);
+            if (info != null && info.getPoolType() != null) {
+                correctType = info.getPoolType();
+            }
+        }
+
+        if (correctType != null && correctType != pool.getType() &&
+                (correctType == StoragePoolType.CLVM || correctType == StoragePoolType.CLVM_NG) &&
+                (pool.getType() == StoragePoolType.CLVM || pool.getType() == StoragePoolType.CLVM_NG)) {
+            logger.debug("Correcting pool type from {} to {} for pool {} based on caller/cached information",
+                    pool.getType(), correctType, uuid);
+            libvirtPool.setType(correctType);
+        }
+    }
+
     /**
      * As the class {@link LibvirtStoragePool} is constrained to the {@link org.libvirt.StoragePool} class, there is no way of saving a generic parameter such as the details, hence,
      * this method was created to always make available the details of libvirt primary storages for when they are needed.
      */
     private void addPoolDetails(String uuid, LibvirtStoragePool pool) {
         StoragePoolInformation storagePoolInformation = _storagePools.get(uuid);
+        if (storagePoolInformation == null) {
+            logger.warn("No cached StoragePoolInformation found for pool UUID {}, pool details will not be set.", uuid);
+            return;
+        }
         Map<String, String> details = storagePoolInformation.getDetails();
 
         if (MapUtils.isNotEmpty(details)) {
@@ -454,6 +486,10 @@ public class KVMStoragePoolManager {
             return adaptor.createDiskFromTemplate(template, name,
                     PhysicalDiskFormat.RAW, provisioningType,
                     size, destPool, timeout, passphrase);
+        } else if (destPool.getType() == StoragePoolType.CLVM_NG) {
+            return adaptor.createDiskFromTemplate(template, name,
+                    PhysicalDiskFormat.QCOW2, provisioningType,
+                    size, destPool, timeout, passphrase);
         } else if (template.getFormat() == PhysicalDiskFormat.DIR) {
             return adaptor.createDiskFromTemplate(template, name,
                     PhysicalDiskFormat.DIR, provisioningType,
@@ -495,6 +531,11 @@ public class KVMStoragePoolManager {
         return adaptor.createTemplateFromDirectDownloadFile(templateFilePath, destTemplatePath, destPool, format, timeout);
     }
 
+    public void createTemplateOnClvmNg(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) {
+        StorageAdaptor adaptor = getStorageAdaptor(pool.getType());
+        adaptor.createTemplate(templatePath, templateUuid, timeout, pool);
+    }
+
     public Ternary<Boolean, Map<String, String>, String> prepareStorageClient(StoragePoolType type, String uuid, Map<String, String> details) {
         StorageAdaptor adaptor = getStorageAdaptor(type);
         return adaptor.prepareStorageClient(uuid, details);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index f95ebff5326..009e1decee2 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -21,6 +21,8 @@ package com.cloud.hypervisor.kvm.storage;
 import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
 import static com.cloud.utils.storage.S3.S3Utils.putFile;
 
+import com.cloud.template.TemplateManager;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -55,6 +57,7 @@ import javax.xml.xpath.XPathFactory;
 
 import com.cloud.agent.api.Command;
 import com.cloud.hypervisor.kvm.resource.LibvirtXMLParser;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -225,6 +228,26 @@ public class KVMStorageProcessor implements StorageProcessor {
             "  </devices>\n" +
             "</domain>";
 
+    private static final String DUMMY_VM_XML_BLOCK = "<domain type='qemu'>\n" +
+            "  <name>%s</name>\n" +
+            "  <memory unit='MiB'>256</memory>\n" +
+            "  <currentMemory unit='MiB'>256</currentMemory>\n" +
+            "  <vcpu>1</vcpu>\n" +
+            "  <os>\n" +
+            "    <type arch='%s' machine='%s'>hvm</type>\n" +
+            "    <boot dev='hd'/>\n" +
+            "  </os>\n" +
+            "  <devices>\n" +
+            "    <emulator>%s</emulator>\n" +
+            "    <disk type='block' device='disk'>\n" +
+            "      <driver name='qemu' type='qcow2' cache='none'/>\n"+
+            "      <source dev='%s'/>\n" +
+            "      <target dev='sda'/>\n" +
+            "    </disk>\n" +
+            "    <graphics type='vnc' port='-1'/>\n" +
+            "  </devices>\n" +
+            "</domain>";
+
 
     public KVMStorageProcessor(final KVMStoragePoolManager storagePoolMgr, final LibvirtComputingResource resource) {
         this.storagePoolMgr = storagePoolMgr;
@@ -347,15 +370,28 @@ public class KVMStorageProcessor implements StorageProcessor {
                     path = destTempl.getUuid();
                 }
 
-                if (path != null && !storagePoolMgr.connectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path, details)) {
-                    logger.warn("Failed to connect physical disk at path: {}, in storage pool [id: {}, name: {}]", path, primaryStore.getUuid(), primaryStore.getName());
-                    return new PrimaryStorageDownloadAnswer("Failed to spool template disk at path: " + path + ", in storage pool id: " + primaryStore.getUuid());
-                }
+                if (primaryPool.getType() == StoragePoolType.CLVM_NG) {
+                    logger.info("Copying template {} to CLVM_NG pool {}",
+                                destTempl.getUuid(), primaryPool.getUuid());
 
-                primaryVol = storagePoolMgr.copyPhysicalDisk(tmplVol, path != null ? path : destTempl.getUuid(), primaryPool, cmd.getWaitInMillSeconds());
+                    try {
+                        storagePoolMgr.createTemplateOnClvmNg(tmplVol.getPath(), path, cmd.getWaitInMillSeconds(), primaryPool);
+                        primaryVol = primaryPool.getPhysicalDisk("template-" + path);
+                    } catch (Exception e) {
+                        logger.error("Failed to create CLVM_NG template: {}", e.getMessage(), e);
+                        return new PrimaryStorageDownloadAnswer("Failed to create CLVM_NG template: " + e.getMessage());
+                    }
+                } else {
+                    if (path != null && !storagePoolMgr.connectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path, details)) {
+                        logger.warn("Failed to connect physical disk at path: {}, in storage pool [id: {}, name: {}]", path, primaryStore.getUuid(), primaryStore.getName());
+                        return new PrimaryStorageDownloadAnswer("Failed to spool template disk at path: " + path + ", in storage pool id: " + primaryStore.getUuid());
+                    }
 
-                if (!storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path)) {
-                    logger.warn("Failed to disconnect physical disk at path: {}, in storage pool [id: {}, name: {}]", path, primaryStore.getUuid(), primaryStore.getName());
+                    primaryVol = storagePoolMgr.copyPhysicalDisk(tmplVol, path != null ? path : destTempl.getUuid(), primaryPool, cmd.getWaitInMillSeconds());
+
+                    if (!storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path)) {
+                        logger.warn("Failed to disconnect physical disk at path: {}, in storage pool [id: {}, name: {}]", path, primaryStore.getUuid(), primaryStore.getName());
+                    }
                 }
             } else {
                 primaryVol = storagePoolMgr.copyPhysicalDisk(tmplVol, UUID.randomUUID().toString(), primaryPool, cmd.getWaitInMillSeconds());
@@ -376,7 +412,8 @@ public class KVMStorageProcessor implements StorageProcessor {
                     StoragePoolType.RBD,
                     StoragePoolType.PowerFlex,
                     StoragePoolType.Linstor,
-                    StoragePoolType.FiberChannel).contains(primaryPool.getType())) {
+                    StoragePoolType.FiberChannel,
+                    StoragePoolType.CLVM).contains(primaryPool.getType())) {
                     newTemplate.setFormat(ImageFormat.RAW);
                 } else {
                     newTemplate.setFormat(ImageFormat.QCOW2);
@@ -589,7 +626,9 @@ public class KVMStorageProcessor implements StorageProcessor {
 
             String path = details != null ? details.get(DiskTO.IQN) : null;
 
-            storagePoolMgr.connectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path, details);
+            if (!ClvmPoolManager.isClvmPoolType(primaryStore.getPoolType())) {
+                storagePoolMgr.connectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path, details);
+            }
 
             final String volumeName = UUID.randomUUID().toString();
 
@@ -618,7 +657,9 @@ public class KVMStorageProcessor implements StorageProcessor {
             final KVMPhysicalDisk newDisk = storagePoolMgr.copyPhysicalDisk(volume, path != null ? path : volumeName, primaryPool, cmd.getWaitInMillSeconds());
             resource.createOrUpdateLogFileForCommand(cmd, Command.State.COMPLETED);
 
-            storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path);
+            if (!ClvmPoolManager.isClvmPoolType(primaryStore.getPoolType())) {
+                storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), path);
+            }
 
             final VolumeObjectTO newVol = new VolumeObjectTO();
 
@@ -1118,7 +1159,14 @@ public class KVMStorageProcessor implements StorageProcessor {
                 }
             } else {
                 final Script command = new Script(_manageSnapshotPath, cmd.getWaitInMillSeconds(), logger);
-                command.add("-b", isCreatedFromVmSnapshot ? snapshotDisk.getPath() : snapshot.getPath());
+                String backupPath;
+                if (primaryPool.getType() == StoragePoolType.CLVM || primaryPool.getType() == StoragePoolType.CLVM_NG) {
+                    backupPath = snapshotDisk.getPath();
+                    logger.debug("Using snapshotDisk path for CLVM/CLVM_NG backup: " + backupPath);
+                } else {
+                    backupPath = isCreatedFromVmSnapshot ? snapshotDisk.getPath() : snapshot.getPath();
+                }
+                command.add("-b", backupPath);
                 command.add(NAME_OPTION, snapshotName);
                 command.add("-p", snapshotDestPath);
 
@@ -1163,6 +1211,90 @@ public class KVMStorageProcessor implements StorageProcessor {
         }
     }
 
+    /**
+     * Parse CLVM/CLVM_NG snapshot path and compute MD5 hash.
+     * Snapshot path format: /dev/vgname/volumeuuid/snapshotuuid
+     *
+     * @param snapshotPath The snapshot path from database
+     * @param poolType Storage pool type (for logging)
+     * @return Array of [vgName, volumeUuid, snapshotUuid, md5Hash] or null if invalid
+     */
+    private String[] parseClvmSnapshotPath(String snapshotPath, StoragePoolType poolType) {
+        String[] pathParts = snapshotPath.split("/");
+        if (pathParts.length < 5) {
+            logger.warn("Invalid {} snapshot path format: {}, expected format: /dev/vgname/volume-uuid/snapshot-uuid",
+                        poolType, snapshotPath);
+            return null;
+        }
+
+        String vgName = pathParts[2];
+        String volumeUuid = pathParts[3];
+        String snapshotUuid = pathParts[4];
+
+        logger.info("Parsed {} snapshot path - VG: {}, Volume: {}, Snapshot: {}",
+                    poolType, vgName, volumeUuid, snapshotUuid);
+
+        String md5Hash = computeMd5Hash(snapshotUuid);
+        logger.debug("Computed MD5 hash for snapshot UUID {}: {}", snapshotUuid, md5Hash);
+
+        return new String[]{vgName, volumeUuid, snapshotUuid, md5Hash};
+    }
+
+    /**
+     * Delete a CLVM or CLVM_NG snapshot using managesnapshot.sh script.
+     * For both CLVM and CLVM_NG, the snapshot path stored in DB is: /dev/vgname/volumeuuid/snapshotuuid
+     * The script handles MD5 transformation and pool-specific deletion commands internally:
+     * - CLVM: Uses lvremove to delete LVM snapshot
+     * - CLVM_NG: Uses qemu-img snapshot -d to delete QCOW2 internal snapshot
+     * This approach is consistent with snapshot creation and backup which also use the script.
+     *
+     * @param snapshotPath The snapshot path from database
+     * @param poolType Storage pool type (CLVM or CLVM_NG)
+     * @param checkExistence If true, checks if snapshot exists before cleanup (for explicit deletion)
+     *                       If false, always performs cleanup (for post-backup cleanup)
+     * @return true if cleanup was performed, false if snapshot didn't exist (when checkExistence=true)
+     */
+    private boolean deleteClvmSnapshot(String snapshotPath, StoragePoolType poolType, boolean checkExistence) {
+        logger.info("Starting {} snapshot deletion for path: {}, checkExistence: {}", poolType, snapshotPath, checkExistence);
+
+        try {
+            String[] parsed = parseClvmSnapshotPath(snapshotPath, poolType);
+            if (parsed == null) {
+                return false;
+            }
+
+            String vgName = parsed[0];
+            String volumeUuid = parsed[1];
+            String snapshotUuid = parsed[2];
+            String volumePath = "/dev/" + vgName + "/" + volumeUuid;
+
+            // Use managesnapshot.sh script for deletion (consistent with create/backup)
+            // Script handles MD5 transformation and pool-specific commands internally
+            Script deleteCommand = new Script(_manageSnapshotPath, 30000, logger);
+            deleteCommand.add("-d", volumePath);
+            deleteCommand.add("-n", snapshotUuid);
+
+            logger.info("Executing: managesnapshot.sh -d {} -n {}", volumePath, snapshotUuid);
+            String result = deleteCommand.execute();
+
+            if (result == null) {
+                logger.info("Successfully deleted {} snapshot: {}", poolType, snapshotPath);
+                return true;
+            } else {
+                if (checkExistence && result.contains("does not exist")) {
+                    logger.info("{} snapshot {} already deleted, no cleanup needed", poolType, snapshotPath);
+                    return true;
+                }
+                logger.warn("Failed to delete {} snapshot {}: {}", poolType, snapshotPath, result);
+                return false;
+            }
+
+        } catch (Exception ex) {
+            logger.error("Exception while deleting {} snapshot {}", poolType, snapshotPath, ex);
+            return false;
+        }
+    }
+
     private void deleteSnapshotOnPrimary(final CopyCommand cmd, final SnapshotObjectTO snapshot,
             KVMStoragePool primaryPool) {
         String snapshotPath = snapshot.getPath();
@@ -1175,7 +1307,19 @@ public class KVMStorageProcessor implements StorageProcessor {
 
         if ((backupSnapshotAfterTakingSnapshot == null || BooleanUtils.toBoolean(backupSnapshotAfterTakingSnapshot)) && deleteSnapshotOnPrimary) {
             try {
-                Files.deleteIfExists(Paths.get(snapshotPath));
+                if (primaryPool.getType() == StoragePoolType.CLVM || primaryPool.getType() == StoragePoolType.CLVM_NG) {
+                    // Both CLVM and CLVM_NG use the same deletion method via managesnapshot.sh script
+                    boolean cleanedUp = deleteClvmSnapshot(snapshotPath, primaryPool.getType(), false);
+                    if (!cleanedUp) {
+                        String[] parsedPath = parseClvmSnapshotPath(snapshotPath, primaryPool.getType());
+                        String snapMd5 = (parsedPath != null) ? computeMd5Hash(parsedPath[2]) : computeMd5Hash(snapshotPath);
+                        logger.warn("Deletion of Snapshot: {} on primary store may have failed as it doesn't exist: {} " +
+                                "(MD5 of snapshot UUID: {} - admins can use this to manually locate and delete the LV via managesnapshot.sh or lvremove)",
+                                primaryPool.getType(), snapshotPath, snapMd5);
+                    }
+                } else {
+                    Files.deleteIfExists(Paths.get(snapshotPath));
+                }
             } catch (IOException ex) {
                 logger.error("Failed to delete snapshot [{}] on primary storage [{}].", snapshot.getId(), snapshot.getName(), ex);
             }
@@ -1184,10 +1328,31 @@ public class KVMStorageProcessor implements StorageProcessor {
         }
     }
 
-    protected synchronized void attachOrDetachISO(final Connect conn, final String vmName, String isoPath, final boolean isAttach, Map<String, String> params, DataStoreTO store) throws
+
+    /**
+     * Compute MD5 hash of a string, matching what managesnapshot.sh does:
+     * echo "${snapshot}" | md5sum -t | awk '{ print $1 }'
+     */
+    private String computeMd5Hash(String input) {
+        try {
+            java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5");
+            byte[] array = md.digest((input + "\n").getBytes("UTF-8"));
+            StringBuilder sb = new StringBuilder();
+            for (byte b : array) {
+                sb.append(String.format("%02x", b));
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            logger.error("Failed to compute MD5 hash for: {}", input, e);
+            return input;
+        }
+    }
+
+    protected synchronized void attachOrDetachISO(final Connect conn, final String vmName, String isoPath, final boolean isAttach, Map<String, String> params, DataStoreTO store, Integer deviceSeq) throws
             LibvirtException, InternalErrorException {
         DiskDef iso = new DiskDef();
         boolean isUefiEnabled = MapUtils.isNotEmpty(params) && params.containsKey("UEFI");
+        Integer devId = (deviceSeq != null) ? deviceSeq : TemplateManager.CDROM_PRIMARY_DEVICE_SEQ;
         if (isoPath != null && isAttach) {
             final int index = isoPath.lastIndexOf("/");
             final String path = isoPath.substring(0, index);
@@ -1203,9 +1368,9 @@ public class KVMStorageProcessor implements StorageProcessor {
             final DiskDef.DiskType isoDiskType = LibvirtComputingResource.getDiskType(isoVol);
             isoPath = isoVol.getPath();
 
-            iso.defISODisk(isoPath, isUefiEnabled, isoDiskType);
+            iso.defISODisk(isoPath, devId, isUefiEnabled, isoDiskType);
         } else {
-            iso.defISODisk(null, isUefiEnabled, DiskDef.DiskType.FILE);
+            iso.defISODisk(null, devId, isUefiEnabled, DiskDef.DiskType.FILE);
         }
 
         final List<DiskDef> disks = resource.getDisks(conn, vmName);
@@ -1225,11 +1390,12 @@ public class KVMStorageProcessor implements StorageProcessor {
         final DiskTO disk = cmd.getDisk();
         final TemplateObjectTO isoTO = (TemplateObjectTO)disk.getData();
         final DataStoreTO store = isoTO.getDataStore();
+        final Integer deviceSeq = (disk.getDiskSeq() != null) ? disk.getDiskSeq().intValue() : null;
 
         try {
             String dataStoreUrl = getDataStoreUrlFromStore(store);
             final Connect conn = LibvirtConnection.getConnectionByVmName(cmd.getVmName());
-            attachOrDetachISO(conn, cmd.getVmName(), dataStoreUrl + File.separator + isoTO.getPath(), true, cmd.getControllerInfo(), store);
+            attachOrDetachISO(conn, cmd.getVmName(), dataStoreUrl + File.separator + isoTO.getPath(), true, cmd.getControllerInfo(), store, deviceSeq);
         } catch (final LibvirtException e) {
             return new Answer(cmd, false, e.toString());
         } catch (final InternalErrorException e) {
@@ -1246,11 +1412,12 @@ public class KVMStorageProcessor implements StorageProcessor {
         final DiskTO disk = cmd.getDisk();
         final TemplateObjectTO isoTO = (TemplateObjectTO)disk.getData();
         final DataStoreTO store = isoTO.getDataStore();
+        final Integer deviceSeq = (disk.getDiskSeq() != null) ? disk.getDiskSeq().intValue() : null;
 
         try {
             String dataStoreUrl = getDataStoreUrlFromStore(store);
             final Connect conn = LibvirtConnection.getConnectionByVmName(cmd.getVmName());
-            attachOrDetachISO(conn, cmd.getVmName(), dataStoreUrl + File.separator + isoTO.getPath(), false, cmd.getParams(), store);
+            attachOrDetachISO(conn, cmd.getVmName(), dataStoreUrl + File.separator + isoTO.getPath(), false, cmd.getParams(), store, deviceSeq);
         } catch (final LibvirtException e) {
             return new Answer(cmd, false, e.toString());
         } catch (final InternalErrorException e) {
@@ -1523,6 +1690,10 @@ public class KVMStorageProcessor implements StorageProcessor {
                     if (attachingDisk.getFormat() == PhysicalDiskFormat.QCOW2) {
                         diskdef.setDiskFormatType(DiskDef.DiskFmtType.QCOW2);
                     }
+                } else if (attachingPool.getType() == StoragePoolType.CLVM_NG) {
+                    // CLVM_NG uses QCOW2 format on block devices
+                    diskdef.defBlockBasedDisk(attachingDisk.getPath(), devId, busT);
+                    diskdef.setDiskFormatType(DiskDef.DiskFmtType.QCOW2);
                 } else if (attachingDisk.getFormat() == PhysicalDiskFormat.QCOW2) {
                     diskdef.defFileBasedDisk(attachingDisk.getPath(), devId, busT, DiskDef.DiskFmtType.QCOW2);
                 } else if (attachingDisk.getFormat() == PhysicalDiskFormat.RAW) {
@@ -1738,13 +1909,22 @@ public class KVMStorageProcessor implements StorageProcessor {
             primaryPool = storagePoolMgr.getStoragePool(primaryStore.getPoolType(), primaryStore.getUuid());
             disksize = volume.getSize();
             PhysicalDiskFormat format;
-            if (volume.getFormat() == null || StoragePoolType.RBD.equals(primaryStore.getPoolType())) {
+
+            MigrationOptions migrationOptions = volume.getMigrationOptions();
+            boolean useDstPoolFormat = useDestPoolFormat(migrationOptions, primaryStore);
+
+            if (volume.getFormat() == null || StoragePoolType.RBD.equals(primaryStore.getPoolType()) || useDstPoolFormat) {
                 format = primaryPool.getDefaultFormat();
+                if (useDstPoolFormat) {
+                    logger.debug("Using destination pool default format {} for volume {} due to CLVM migration (src: {}, dst: {})",
+                               format, volume.getUuid(),
+                               migrationOptions != null ? migrationOptions.getSrcPoolType() : "unknown",
+                               primaryStore.getPoolType());
+                }
             } else {
                 format = PhysicalDiskFormat.valueOf(volume.getFormat().toString().toUpperCase());
             }
 
-            MigrationOptions migrationOptions = volume.getMigrationOptions();
             if (migrationOptions != null) {
                 int timeout = migrationOptions.getTimeout();
 
@@ -1769,7 +1949,11 @@ public class KVMStorageProcessor implements StorageProcessor {
                     format = vol.getFormat();
                 }
             }
-            newVol.setSize(volume.getSize());
+            if (StoragePoolType.CLVM_NG.equals(primaryStore.getPoolType()) && vol != null && vol.getVirtualSize() > 0) {
+                newVol.setSize(vol.getVirtualSize());
+            } else {
+                newVol.setSize(volume.getSize());
+            }
             newVol.setFormat(ImageFormat.valueOf(format.toString().toUpperCase()));
 
             return new CreateObjectAnswer(newVol);
@@ -1781,6 +1965,29 @@ public class KVMStorageProcessor implements StorageProcessor {
         }
     }
 
+    /**
+     * For migration involving CLVM (RAW format), use destination pool's default format
+     * CLVM uses RAW format which may not match destination pool's format (e.g., NFS uses QCOW2)
+     * This specifically handles:
+     *   - CLVM (RAW) -> NFS/Local/CLVM_NG (QCOW2)
+     *   - NFS/Local/CLVM_NG (QCOW2) -> CLVM (RAW)
+     * @param migrationOptions
+     * @param primaryStore
+     * @return
+     */
+    private boolean useDestPoolFormat(MigrationOptions migrationOptions, PrimaryDataStoreTO primaryStore) {
+        boolean useDstPoolFormat = false;
+        if (migrationOptions != null && migrationOptions.getSrcPoolType() != null) {
+            StoragePoolType srcPoolType = migrationOptions.getSrcPoolType();
+            StoragePoolType dstPoolType = primaryStore.getPoolType();
+
+            if (srcPoolType != dstPoolType) {
+                useDstPoolFormat = (srcPoolType == StoragePoolType.CLVM || dstPoolType == StoragePoolType.CLVM);
+            }
+        }
+        return useDstPoolFormat;
+    }
+
     /**
      * XML to take disk-only snapshot of the VM.<br><br>
      * 1st parameter: snapshot's name;<br>
@@ -1870,10 +2077,22 @@ public class KVMStorageProcessor implements StorageProcessor {
                     if (snapshotSize != null) {
                         newSnapshot.setPhysicalSize(snapshotSize);
                     }
-                } else if (primaryPool.getType() == StoragePoolType.CLVM) {
-                    CreateObjectAnswer result = takeClvmVolumeSnapshotOfStoppedVm(disk, snapshotName);
-                    if (result != null) return result;
-                    newSnapshot.setPath(snapshotPath);
+                } else if (primaryPool.getType() == StoragePoolType.CLVM || primaryPool.getType() == StoragePoolType.CLVM_NG) {
+                    if (primaryPool.getType() == StoragePoolType.CLVM_NG && snapshotTO.isKvmIncrementalSnapshot()) {
+                        if (secondaryPool == null) {
+                            String errorMsg = String.format("Incremental snapshots for CLVM_NG require secondary storage. " +
+                                    "Please configure secondary storage or disable incremental snapshots for volume [%s].", volume.getName());
+                            logger.error(errorMsg);
+                            return new CreateObjectAnswer(errorMsg);
+                        }
+                        logger.info("Taking incremental snapshot of CLVM_NG volume [{}] using QCOW2 backup to secondary storage.", volume.getName());
+                        newSnapshot = takeIncrementalVolumeSnapshotOfStoppedVm(snapshotTO, primaryPool, secondaryPool,
+                                imageStoreTo.getUrl(), snapshotName, volume, conn, cmd.getWait());
+                    } else {
+                        CreateObjectAnswer result = takeClvmVolumeSnapshotOfStoppedVm(disk, snapshotName);
+                        if (result != null) return result;
+                        newSnapshot.setPath(snapshotPath);
+                    }
                 } else {
                     if (snapshotTO.isKvmIncrementalSnapshot()) {
                         newSnapshot = takeIncrementalVolumeSnapshotOfStoppedVm(snapshotTO, primaryPool, secondaryPool, imageStoreTo != null ? imageStoreTo.getUrl() : null, snapshotName, volume, conn, cmd.getWait());
@@ -1946,7 +2165,11 @@ public class KVMStorageProcessor implements StorageProcessor {
         String machine = resource.isGuestAarch64() ? LibvirtComputingResource.VIRT : LibvirtComputingResource.PC;
         String cpuArch = resource.getGuestCpuArch() != null ? resource.getGuestCpuArch() : "x86_64";
 
-        return String.format(DUMMY_VM_XML, vmName, cpuArch, machine, resource.getHypervisorPath(), primaryPool.getLocalPathFor(volumeObjectTo.getPath()));
+        String volumePath = primaryPool.getLocalPathFor(volumeObjectTo.getPath());
+        boolean isClvmNg = StoragePoolType.CLVM_NG == primaryPool.getType();
+
+        String xmlTemplate = isClvmNg ? DUMMY_VM_XML_BLOCK : DUMMY_VM_XML;
+        return String.format(xmlTemplate, vmName, cpuArch, machine, resource.getHypervisorPath(), volumePath);
     }
 
     private SnapshotObjectTO takeIncrementalVolumeSnapshotOfRunningVm(SnapshotObjectTO snapshotObjectTO, KVMStoragePool primaryPool, KVMStoragePool secondaryPool,
@@ -2667,11 +2890,13 @@ public class KVMStorageProcessor implements StorageProcessor {
         final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)vol.getDataStore();
         try {
             final KVMStoragePool pool = storagePoolMgr.getStoragePool(primaryStore.getPoolType(), primaryStore.getUuid());
-            try {
-                pool.getPhysicalDisk(vol.getPath());
-            } catch (final Exception e) {
-                logger.debug(String.format("can't find volume: %s, return true", vol));
-                return new Answer(null);
+            if (pool.getType() != StoragePoolType.CLVM && pool.getType() != StoragePoolType.CLVM_NG) {
+                try {
+                    pool.getPhysicalDisk(vol.getPath());
+                } catch (final Exception e) {
+                    logger.debug(String.format("can't find volume: %s, return true", vol));
+                    return new Answer(null);
+                }
             }
             pool.deletePhysicalDisk(vol.getPath(), vol.getFormat());
             return new Answer(null);
@@ -2900,6 +3125,25 @@ public class KVMStorageProcessor implements StorageProcessor {
                 if (snapshotTO.isKvmIncrementalSnapshot()) {
                     deleteCheckpoint(snapshotTO);
                 }
+            } else if (primaryPool.getType() == StoragePoolType.CLVM || primaryPool.getType() == StoragePoolType.CLVM_NG) {
+                // For CLVM/CLVM_NG, snapshots are typically already deleted from primary storage during backup
+                // via deleteSnapshotOnPrimary in the backupSnapshot finally block.
+                // This is called when the user explicitly deletes the snapshot via UI/API.
+                // We check if the snapshot still exists and clean it up if needed.
+                logger.info("Processing CLVM/CLVM_NG snapshot deletion (id={}, name={}, path={}) on primary storage",
+                        snapshotTO.getId(), snapshotTO.getName(), snapshotTO.getPath());
+
+                String snapshotPath = snapshotTO.getPath();
+                if (snapshotPath != null && !snapshotPath.isEmpty()) {
+                    boolean wasDeleted = deleteClvmSnapshot(snapshotPath, primaryPool.getType(), true);
+                    if (wasDeleted) {
+                        logger.info("Successfully cleaned up {} snapshot {} from primary storage", primaryPool.getType(), snapshotName);
+                    } else {
+                        logger.info("{} snapshot {} was already deleted from primary storage during backup, no cleanup needed", primaryPool.getType(), snapshotName);
+                    }
+                } else {
+                    logger.debug("{} snapshot path is null or empty, assuming already cleaned up", primaryPool.getType());
+                }
             } else {
                 logger.warn("Operation not implemented for storage pool type of " + primaryPool.getType().toString());
                 throw new InternalErrorException("Operation not implemented for storage pool type of " + primaryPool.getType().toString());
@@ -3175,7 +3419,8 @@ public class KVMStorageProcessor implements StorageProcessor {
                 StoragePoolType.RBD,
                 StoragePoolType.PowerFlex,
                 StoragePoolType.Linstor,
-                StoragePoolType.FiberChannel).contains(poolType)) {
+                StoragePoolType.FiberChannel,
+                StoragePoolType.CLVM).contains(poolType)) {
             return ImageFormat.RAW;
         } else {
             return ImageFormat.QCOW2;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index a03daeb197b..ed159c92790 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -231,6 +231,11 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
     }
 
     public StorageVol getVolume(StoragePool pool, String volName) {
+        if (pool == null) {
+            logger.debug("LibVirt StoragePool is null (likely CLVM/CLVM_NG virtual pool), cannot lookup volume {} via libvirt", volName);
+            return null;
+        }
+
         StorageVol vol = null;
 
         try {
@@ -254,9 +259,12 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
 
             try {
                 vol = pool.storageVolLookupByName(volName);
-                logger.debug("Found volume " + volName + " in storage pool " + pool.getName() + " after refreshing the pool");
+                if (vol != null) {
+                    logger.debug("Found volume " + volName + " in storage pool " + pool.getName() + " after refreshing the pool");
+                }
             } catch (LibvirtException e) {
-                throw new CloudRuntimeException("Could not find volume " + volName + ": " + e.getMessage());
+                logger.debug("Volume " + volName + " still not found after pool refresh: " + e.getMessage());
+                return null;
             }
         }
 
@@ -349,38 +357,6 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
         }
     }
 
-    private StoragePool createCLVMStoragePool(Connect conn, String uuid, String host, String path) {
-
-        String volgroupPath = "/dev/" + path;
-        String volgroupName = path;
-        volgroupName = volgroupName.replaceFirst("/", "");
-
-        LibvirtStoragePoolDef spd = new LibvirtStoragePoolDef(PoolType.LOGICAL, volgroupName, uuid, host, volgroupPath, volgroupPath);
-        StoragePool sp = null;
-        try {
-            logger.debug(spd.toString());
-            sp = conn.storagePoolCreateXML(spd.toString(), 0);
-            return sp;
-        } catch (LibvirtException e) {
-            logger.error(e.toString());
-            if (sp != null) {
-                try {
-                    if (sp.isPersistent() == 1) {
-                        sp.destroy();
-                        sp.undefine();
-                    } else {
-                        sp.destroy();
-                    }
-                    sp.free();
-                } catch (LibvirtException l) {
-                    logger.debug("Failed to define clvm storage pool with: " + l.toString());
-                }
-            }
-            return null;
-        }
-
-    }
-
     private List<String> getNFSMountOptsFromDetails(StoragePoolType type, Map<String, String> details) {
         List<String> nfsMountOpts = null;
         if (!type.equals(StoragePoolType.NetworkFilesystem) || details == null) {
@@ -580,14 +556,11 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
             Connect conn = LibvirtConnection.getConnection();
             storage = conn.storagePoolLookupByUUIDString(uuid);
 
-            if (storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) {
-                logger.warn("Storage pool " + uuid + " is not in running state. Attempting to start it.");
-                storage.create(0);
-            }
             LibvirtStoragePoolDef spd = getStoragePoolDef(conn, storage);
             if (spd == null) {
                 throw new CloudRuntimeException("Unable to parse the storage pool definition for storage pool " + uuid);
             }
+
             StoragePoolType type = null;
             if (spd.getPoolType() == LibvirtStoragePoolDef.PoolType.NETFS) {
                 type = StoragePoolType.NetworkFilesystem;
@@ -603,6 +576,12 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 type = StoragePoolType.PowerFlex;
             }
 
+            // Activate pool if not running
+            if (storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) {
+                logger.warn("Storage pool " + uuid + " is not in running state. Attempting to start it.");
+                storage.create(0);
+            }
+
             LibvirtStoragePool pool = new LibvirtStoragePool(uuid, storage.getName(), type, this, storage);
 
             if (pool.getType() != StoragePoolType.RBD && pool.getType() != StoragePoolType.PowerFlex)
@@ -640,15 +619,17 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 logger.info("Asking libvirt to refresh storage pool " + uuid);
                 pool.refresh();
             }
+
             pool.setCapacity(storage.getInfo().capacity);
             pool.setUsed(storage.getInfo().allocation);
-            updateLocalPoolIops(pool);
             pool.setAvailable(storage.getInfo().available);
 
-            logger.debug("Successfully refreshed pool " + uuid +
-                           " Capacity: " + toHumanReadableSize(storage.getInfo().capacity) +
-                           " Used: " + toHumanReadableSize(storage.getInfo().allocation) +
-                           " Available: " + toHumanReadableSize(storage.getInfo().available));
+            logger.debug("Successfully refreshed pool {} Capacity: {} Used: {} Available: {}",
+                    uuid, toHumanReadableSize(storage.getInfo().capacity),
+                    toHumanReadableSize(storage.getInfo().allocation),
+                    toHumanReadableSize(storage.getInfo().available));
+
+            updateLocalPoolIops(pool);
 
             return pool;
         } catch (LibvirtException e) {
@@ -663,6 +644,10 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
 
         try {
             StorageVol vol = getVolume(libvirtPool.getPool(), volumeUuid);
+            if (vol == null) {
+                throw new CloudRuntimeException("Volume " + volumeUuid + " not found in libvirt pool");
+            }
+
             KVMPhysicalDisk disk;
             LibvirtStorageVolumeDef voldef = getStorageVolumeDef(libvirtPool.getPool().getConnect(), vol);
             disk = new KVMPhysicalDisk(vol.getPath(), vol.getName(), pool);
@@ -693,7 +678,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
             }
             return disk;
         } catch (LibvirtException e) {
-            logger.debug("Failed to get physical disk:", e);
+            logger.debug("Failed to get volume from libvirt: " + e.getMessage());
             throw new CloudRuntimeException(e.toString());
         }
     }
@@ -722,7 +707,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
      * Thread-safe increment storage pool usage refcount
      * @param uuid UUID of the storage pool to increment the count
      */
-    private void incStoragePoolRefCount(String uuid) {
+    protected void incStoragePoolRefCount(String uuid) {
         adjustStoragePoolRefCount(uuid, 1);
     }
     /**
@@ -730,7 +715,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
      * @param uuid UUID of the storage pool to decrement the count
      * @return true if the storage pool is still used, else false.
      */
-    private boolean decStoragePoolRefCount(String uuid) {
+    protected boolean decStoragePoolRefCount(String uuid) {
         return adjustStoragePoolRefCount(uuid, -1) > 0;
     }
 
@@ -814,7 +799,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 try {
                     sp = createNetfsStoragePool(PoolType.NETFS, conn, name, host, path, nfsMountOpts);
                 } catch (LibvirtException e) {
-                    logger.error("Failed to create netfs mount: " + host + ":" + path , e);
+                    logger.error("Failed to create netfs mount: " + host + ":" + path, e);
                     logger.error(e.getStackTrace());
                     throw new CloudRuntimeException(e.toString());
                 }
@@ -822,7 +807,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 try {
                     sp = createNetfsStoragePool(PoolType.GLUSTERFS, conn, name, host, path, null);
                 } catch (LibvirtException e) {
-                    logger.error("Failed to create glusterfs mount: " + host + ":" + path , e);
+                    logger.error("Failed to create glusterlvm_fs mount: " + host + ":" + path, e);
                     logger.error(e.getStackTrace());
                     throw new CloudRuntimeException(e.toString());
                 }
@@ -830,8 +815,6 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 sp = createSharedStoragePool(conn, name, host, path);
             } else if (type == StoragePoolType.RBD) {
                 sp = createRBDStoragePool(conn, name, host, port, userInfo, path);
-            } else if (type == StoragePoolType.CLVM) {
-                sp = createCLVMStoragePool(conn, name, host, path);
             }
         }
 
@@ -845,7 +828,6 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                 // to be always mounted, as long the primary storage isn't fully deleted.
                 incStoragePoolRefCount(name);
             }
-
             if (sp.isActive() == 0) {
                 logger.debug("Attempting to activate pool " + name);
                 sp.create(0);
@@ -1116,6 +1098,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
     @Override
     public boolean connectPhysicalDisk(String name, KVMStoragePool pool, Map<String, String> details, boolean isVMMigrate) {
         // this is for managed storage that needs to prep disks prior to use
+
         return true;
     }
 
@@ -1227,7 +1210,11 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
         LibvirtStoragePool libvirtPool = (LibvirtStoragePool)pool;
         try {
             StorageVol vol = getVolume(libvirtPool.getPool(), uuid);
-            logger.debug("Instructing libvirt to remove volume " + uuid + " from pool " + pool.getUuid());
+            if (vol == null) {
+                logger.warn("Volume {} not found in libvirt pool {}, it may have been already deleted", uuid, pool.getUuid());
+                return true;
+            }
+            logger.debug("Instructing libvirt to remove volume {} from pool {}", uuid, pool.getUuid());
             if(Storage.ImageFormat.DIR.equals(format)){
                 deleteDirVol(libvirtPool, vol);
             } else {
@@ -1420,9 +1407,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                         rbd.close(destImage);
                     } else {
                         logger.debug("The source image " + srcPool.getSourceDir() + "/" + template.getName()
-                                + " is RBD format 2. We will perform a RBD clone using snapshot "
-                                + rbdTemplateSnapName);
-                        /* The source image is format 2, we can do a RBD snapshot+clone (layering) */
+                                + " is RBD format 2. We will perform a RBD snapshot+clone (layering)");
 
 
                         logger.debug("Checking if RBD snapshot " + srcPool.getSourceDir() + "/" + template.getName()
@@ -1618,9 +1603,12 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
                     } else {
                         destFile = new QemuImgFile(destPath, destFormat);
                         try {
-                            boolean isQCOW2 = PhysicalDiskFormat.QCOW2.equals(sourceFormat);
+                            boolean keepBitmaps = PhysicalDiskFormat.QCOW2.equals(sourceFormat);
+                            if (destPool.getType() == StoragePoolType.CLVM) {
+                                keepBitmaps = false;
+                            }
                             qemu.convert(srcFile, destFile, null, null, new QemuImageOptions(srcFile.getFormat(), srcFile.getFileName(), null),
-                                    null, false, isQCOW2);
+                                    null, false, keepBitmaps);
                             Map<String, String> destInfo = qemu.info(destFile);
                             Long virtualSize = Long.parseLong(destInfo.get(QemuImg.VIRTUAL_SIZE));
                             newDisk.setVirtualSize(virtualSize);
@@ -1684,8 +1672,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
             }
         } else {
             /**
-                We let Qemu-Img do the work here. Although we could work with librbd and have that do the cloning
-                it doesn't benefit us. It's better to keep the current code in place which works
+             We let Qemu-Img do the work here. Although we could work with librbd and have that do the cloning
+             it doesn't benefit us. It's better to keep the current code in place which works
              */
             srcFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(srcPool, sourcePath));
             srcFile.setFormat(sourceFormat);
@@ -1737,6 +1725,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
         vol.delete(0);
     }
 
+
     private void deleteDirVol(LibvirtStoragePool pool, StorageVol vol) throws LibvirtException {
         Script.runSimpleBashScript("rm -r --interactive=never " + vol.getPath());
     }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
index 910f0eb15e0..a8c32baa6ef 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -213,7 +213,7 @@ public class LibvirtStoragePool implements KVMStoragePool {
 
     @Override
     public boolean isExternalSnapshot() {
-        if (this.type == StoragePoolType.CLVM || type == StoragePoolType.RBD) {
+        if (this.type == StoragePoolType.CLVM || this.type == StoragePoolType.CLVM_NG || type == StoragePoolType.RBD) {
             return true;
         }
         return false;
@@ -278,6 +278,10 @@ public class LibvirtStoragePool implements KVMStoragePool {
         return this.type;
     }
 
+    public void setType(StoragePoolType type) {
+        this.type = type;
+    }
+
     public StoragePool getPool() {
         return this._pool;
     }
@@ -420,8 +424,4 @@ public class LibvirtStoragePool implements KVMStoragePool {
             return true;
         }
     }
-
-    public void setType(StoragePoolType type) {
-        this.type = type;
-    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
index 76b5a413e70..fb474a6bc7d 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
@@ -148,4 +148,8 @@ public interface StorageAdaptor {
     default Pair<Boolean, String> unprepareStorageClient(String uuid, Map<String, String> details) {
         return new Pair<>(true, "");
     }
+
+    default void createTemplate(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) {
+        // no-op
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index b3bdafb7375..ce431d9bab2 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -2728,8 +2728,11 @@ public class LibvirtComputingResourceTest {
 
     @Test
     public void testModifyStoragePoolCommand() {
-        final StoragePool pool = Mockito.mock(StoragePool.class);;
+        final StoragePool pool = Mockito.mock(StoragePool.class);
         final ModifyStoragePoolCommand command = new ModifyStoragePoolCommand(true, pool);
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "false");
+        command.setDetails(details);
 
         final KVMStoragePoolManager storagePoolMgr = Mockito.mock(KVMStoragePoolManager.class);
         final KVMStoragePool kvmStoragePool = Mockito.mock(KVMStoragePool.class);
@@ -2753,8 +2756,11 @@ public class LibvirtComputingResourceTest {
 
     @Test
     public void testModifyStoragePoolCommandFailure() {
-        final StoragePool pool = Mockito.mock(StoragePool.class);;
+        final StoragePool pool = Mockito.mock(StoragePool.class);
         final ModifyStoragePoolCommand command = new ModifyStoragePoolCommand(true, pool);
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "false");
+        command.setDetails(details);
 
         final KVMStoragePoolManager storagePoolMgr = Mockito.mock(KVMStoragePoolManager.class);
 
@@ -7245,6 +7251,307 @@ public class LibvirtComputingResourceTest {
         libvirtComputingResourceSpy.getInterface(connMock, vmName, invalidMacAddress);
     }
 
+    @Test
+    public void testExtractVolumeGroupFromPath_ValidPath() {
+        String devicePath = "/dev/vg1/volume-123";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("vg1", vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_ComplexVGName() {
+        String devicePath = "/dev/cloudstack-vg-primary/volume-456";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("cloudstack-vg-primary", vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_MultiLevelPath() {
+        String devicePath = "/dev/vg-cluster-01/lv-data-001";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("vg-cluster-01", vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_NullPath() {
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(null);
+        assertNull(vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_EmptyPath() {
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath("");
+        assertNull(vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_NonDevPath() {
+        String devicePath = "/var/lib/libvirt/images/disk.qcow2";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertNull(vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_InvalidFormat() {
+        String devicePath = "/dev/";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertNull(vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_OnlyVG() {
+        String devicePath = "/dev/vg1";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        // Implementation extracts parts[2] regardless of whether there's an LV name
+        assertEquals("vg1", vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_MapperPath() {
+        String devicePath = "/dev/mapper/vg1-volume";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("mapper", vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_WithDashes() {
+        String devicePath = "/dev/vg-name-with-dashes/lv-name";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("vg-name-with-dashes", vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_WithUnderscores() {
+        String devicePath = "/dev/vg_name_with_underscores/lv_name";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("vg_name_with_underscores", vgName);
+    }
+
+    @Test
+    public void testCheckIfVolumeGroupIsClustered_NullVGName() {
+        boolean result = LibvirtComputingResource.checkIfVolumeGroupIsClustered(null);
+        assertFalse(result);
+    }
+
+    @Test
+    public void testCheckIfVolumeGroupIsClustered_EmptyVGName() {
+        boolean result = LibvirtComputingResource.checkIfVolumeGroupIsClustered("");
+        assertFalse(result);
+    }
+
+    @Test
+    public void testActivateClvmVolumeExclusive_ValidPath() {
+        try {
+            String volumePath = "/dev/test-vg/test-lv";
+            LibvirtComputingResource.activateClvmVolumeExclusive(volumePath);
+        } catch (Exception e) {
+            String message = e.getMessage().toLowerCase();
+            assertTrue("Should be LVM-related error",
+                message.contains("lvm") ||
+                message.contains("lvchange") ||
+                message.contains("volume") ||
+                message.contains("not found") ||
+                message.contains("failed"));
+        }
+    }
+
+    @Test
+    public void testDeactivateClvmVolume_ValidPath() {
+        String volumePath = "/dev/test-vg/test-lv";
+
+        LibvirtComputingResource.deactivateClvmVolume(volumePath);
+
+        assertTrue(true);
+    }
+
+    @Test
+    public void testSetClvmVolumeToSharedMode_ValidPath() {
+        String volumePath = "/dev/test-vg/test-lv";
+
+        LibvirtComputingResource.setClvmVolumeToSharedMode(volumePath);
+
+        assertTrue(true);
+    }
+
+    @Test
+    public void testDeactivateClvmVolume_NullPath() {
+        LibvirtComputingResource.deactivateClvmVolume(null);
+        assertTrue(true);
+    }
+
+    @Test
+    public void testSetClvmVolumeToSharedMode_NullPath() {
+        LibvirtComputingResource.setClvmVolumeToSharedMode(null);
+        assertTrue(true); // Passes if no exception
+    }
+
+    @Test
+    public void testDeactivateClvmVolume_EmptyPath() {
+        LibvirtComputingResource.deactivateClvmVolume("");
+        assertTrue(true);
+    }
+
+    @Test
+    public void testSetClvmVolumeToSharedMode_EmptyPath() {
+        LibvirtComputingResource.setClvmVolumeToSharedMode("");
+        assertTrue(true);
+    }
+
+    @Test
+    public void testDeactivateClvmVolume_InvalidPath() {
+        String invalidPath = "/invalid/path/that/does/not/exist";
+        LibvirtComputingResource.deactivateClvmVolume(invalidPath);
+        assertTrue(true);
+    }
+
+    @Test
+    public void testSetClvmVolumeToSharedMode_InvalidPath() {
+        // Should handle invalid path gracefully without throwing
+        String invalidPath = "/invalid/path/that/does/not/exist";
+        LibvirtComputingResource.setClvmVolumeToSharedMode(invalidPath);
+        assertTrue(true); // Passes if no exception
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_RealWorldPaths() {
+        assertEquals("acsvg", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/acsvg/volume-123"));
+        assertEquals("cloudstack-primary", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/cloudstack-primary/vm-disk-1"));
+        assertEquals("ceph-vg", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/ceph-vg/snapshot-456"));
+        assertEquals("vg01", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/vg01/data"));
+    }
+
+    @Test
+    public void testCheckIfVolumeGroupIsClustered_NonExistentVG() {
+        String nonExistentVG = "non-existent-vg-" + System.currentTimeMillis();
+        boolean result = LibvirtComputingResource.checkIfVolumeGroupIsClustered(nonExistentVG);
+        assertFalse(result);
+    }
+
+    @Test
+    public void testActivateClvmVolumeExclusive_ComplexPath() {
+        try {
+            String complexPath = "/dev/cloudstack-vg-primary-cluster-01/volume-123-456-789-abc";
+            LibvirtComputingResource.activateClvmVolumeExclusive(complexPath);
+        } catch (Exception e) {
+            String message = e.getMessage().toLowerCase();
+            assertTrue("Should be LVM-related error",
+                message.contains("lvm") ||
+                message.contains("lvchange") ||
+                message.contains("volume") ||
+                message.contains("not found") ||
+                message.contains("failed"));
+        }
+    }
+
+    @Test
+    public void testDeactivateClvmVolume_ComplexPath() {
+        String complexPath = "/dev/cloudstack-vg-primary-cluster-01/volume-123-456-789-abc";
+        LibvirtComputingResource.deactivateClvmVolume(complexPath);
+        assertTrue(true);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_SpecialCharacters() {
+        assertEquals("vg.name", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/vg.name/lv"));
+        assertEquals("vg_name", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/vg_name/lv"));
+        assertEquals("vg-name", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/vg-name/lv"));
+        assertEquals("vg123", LibvirtComputingResource.extractVolumeGroupFromPath("/dev/vg123/lv456"));
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_TrailingSlash() {
+        String devicePath = "/dev/vg1/volume-123/";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("vg1", vgName);
+    }
+
+    @Test
+    public void testCheckIfVolumeGroupIsClustered_WhitespaceVGName() {
+        boolean result = LibvirtComputingResource.checkIfVolumeGroupIsClustered("   ");
+        assertFalse(result);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_DevMapperExcluded() {
+        String mapperPath1 = "/dev/mapper/vg1-lv1";
+        String mapperPath2 = "/dev/mapper/cloudstack--vg-volume--1";
+
+        assertEquals("mapper", LibvirtComputingResource.extractVolumeGroupFromPath(mapperPath1));
+        assertEquals("mapper", LibvirtComputingResource.extractVolumeGroupFromPath(mapperPath2));
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_EdgeCases() {
+        assertNull(LibvirtComputingResource.extractVolumeGroupFromPath("/dev"));
+        assertNull(LibvirtComputingResource.extractVolumeGroupFromPath("/dev/"));
+        assertNull(LibvirtComputingResource.extractVolumeGroupFromPath("dev/vg/lv"));
+        assertNull(LibvirtComputingResource.extractVolumeGroupFromPath("//dev//vg//lv"));
+    }
+
+    @Test
+    public void testClvmVolumeActivationSequence() {
+        // Test a typical sequence: deactivate -> activate exclusive -> deactivate -> shared
+        String volumePath = "/dev/test-vg/test-volume";
+
+        LibvirtComputingResource.deactivateClvmVolume(volumePath);
+
+        try {
+            LibvirtComputingResource.activateClvmVolumeExclusive(volumePath);
+        } catch (Exception e) {
+            // Expected in test environment
+        }
+
+        LibvirtComputingResource.deactivateClvmVolume(volumePath);
+        LibvirtComputingResource.setClvmVolumeToSharedMode(volumePath);
+
+        assertTrue(true); // Test passes if sequence completes
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_LongVGName() {
+        String longVGName = "a".repeat(100);
+        String devicePath = "/dev/" + longVGName + "/volume";
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals(longVGName, vgName);
+    }
+
+    @Test
+    public void testExtractVolumeGroupFromPath_LongLVName() {
+        String longLVName = "volume-" + "b".repeat(100);
+        String devicePath = "/dev/vg1/" + longLVName;
+        String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(devicePath);
+        assertEquals("vg1", vgName);
+    }
+
+    @Test
+    public void testCheckIfVolumeGroupIsClustered_SpecialCharactersInName() {
+        assertFalse(LibvirtComputingResource.checkIfVolumeGroupIsClustered("vg.test.name"));
+        assertFalse(LibvirtComputingResource.checkIfVolumeGroupIsClustered("vg_test_name"));
+        assertFalse(LibvirtComputingResource.checkIfVolumeGroupIsClustered("vg-test-name"));
+    }
+
+    @Test
+    public void testClvmMethodsWithMultiplePaths() {
+        String[] paths = {
+                "/dev/vg1/vol1",
+                "/dev/vg2/vol2",
+                "/dev/cloudstack-primary/vol3",
+                "/dev/test-vg/test-vol"
+        };
+
+        for (String path : paths) {
+            LibvirtComputingResource.deactivateClvmVolume(path);
+            LibvirtComputingResource.setClvmVolumeToSharedMode(path);
+
+            String vgName = LibvirtComputingResource.extractVolumeGroupFromPath(path);
+            assertNotNull("Should extract VG from: " + path, vgName);
+
+            boolean clustered = LibvirtComputingResource.checkIfVolumeGroupIsClustered(vgName);
+        }
+
+        assertTrue(true); // Passes if all paths processed
+    }
+
     @Test
     public void updateCpuQuotaAndPeriodTestAssertPeriodAndQuotaAreNotUpdatedWhenLibvirtVersionIsLessThanTheMinimum() throws LibvirtException {
         libvirtComputingResourceSpy.hypervisorLibvirtVersion = 8999;
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtClvmLockTransferCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtClvmLockTransferCommandWrapperTest.java
new file mode 100644
index 00000000000..5d11cf209a4
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtClvmLockTransferCommandWrapperTest.java
@@ -0,0 +1,462 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferCommand;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockedConstruction;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.utils.script.Script;
+
+/**
+ * Tests for LibvirtClvmLockTransferCommandWrapper
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class LibvirtClvmLockTransferCommandWrapperTest {
+
+    @Mock
+    private LibvirtComputingResource libvirtComputingResource;
+
+    private LibvirtClvmLockTransferCommandWrapper wrapper;
+
+    private static final String TEST_LV_PATH = "/dev/vg1/volume-123";
+    private static final String TEST_VOLUME_UUID = "test-volume-uuid-456";
+
+    @Before
+    public void setUp() {
+        wrapper = new LibvirtClvmLockTransferCommandWrapper();
+    }
+
+    @Test
+    public void testExecute_DeactivateSuccess() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null); // Success
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertTrue(answer.getResult());
+            assertTrue(answer.getDetails().contains("deactivated"));
+            assertTrue(answer.getDetails().contains(TEST_VOLUME_UUID));
+
+            // Verify script was constructed with correct parameters
+            assertEquals(1, scriptMock.constructed().size());
+            Script script = scriptMock.constructed().get(0);
+            verify(script).add("-an");
+            verify(script).add(TEST_LV_PATH);
+        }
+    }
+
+    @Test
+    public void testExecute_ActivateExclusiveSuccess() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null); // Success
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertTrue(answer.getResult());
+            assertTrue(answer.getDetails().contains("activated exclusively"));
+            assertTrue(answer.getDetails().contains(TEST_VOLUME_UUID));
+
+            // Verify script was constructed with correct parameters
+            assertEquals(1, scriptMock.constructed().size());
+            Script script = scriptMock.constructed().get(0);
+            verify(script).add("-aey");
+            verify(script).add(TEST_LV_PATH);
+        }
+    }
+
+    @Test
+    public void testExecute_ActivateSharedSuccess() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_SHARED,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null); // Success
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertTrue(answer.getResult());
+            assertTrue(answer.getDetails().contains("activated in shared mode"));
+            assertTrue(answer.getDetails().contains(TEST_VOLUME_UUID));
+
+            // Verify script was constructed with correct parameters
+            assertEquals(1, scriptMock.constructed().size());
+            Script script = scriptMock.constructed().get(0);
+            verify(script).add("-asy");
+            verify(script).add(TEST_LV_PATH);
+        }
+    }
+
+    @Test
+    public void testExecute_LvchangeFailure() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        String errorMessage = "lvchange: Volume is in use";
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(errorMessage);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertFalse(answer.getResult());
+            assertTrue(answer.getDetails().contains("lvchange -an"));
+            assertTrue(answer.getDetails().contains(TEST_LV_PATH));
+            assertTrue(answer.getDetails().contains(errorMessage));
+        }
+    }
+
+    @Test
+    public void testExecute_ScriptTimeout() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        String timeoutMessage = "Script timed out after 30000ms";
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(timeoutMessage);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertFalse(answer.getResult());
+            assertTrue(answer.getDetails().contains("failed"));
+            assertTrue(answer.getDetails().contains(timeoutMessage));
+        }
+    }
+
+    @Test
+    public void testExecute_NullLvPath() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                null,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            // Should still execute, but may fail or succeed depending on lvchange behavior
+            // At minimum, it should handle null gracefully
+            assertEquals(1, scriptMock.constructed().size());
+        }
+    }
+
+    @Test
+    public void testExecute_EmptyLvPath() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                "",
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn("lvchange: Please specify a logical volume path");
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertFalse(answer.getResult());
+            assertTrue(answer.getDetails().contains("failed"));
+        }
+    }
+
+    @Test
+    public void testExecute_InvalidLvPath() {
+        String invalidPath = "/invalid/path/that/does/not/exist";
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE,
+                invalidPath,
+                TEST_VOLUME_UUID
+        );
+
+        String errorMessage = "Failed to find logical volume \"" + invalidPath + "\"";
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(errorMessage);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertFalse(answer.getResult());
+            assertTrue(answer.getDetails().contains("failed"));
+            assertTrue(answer.getDetails().contains(errorMessage));
+        }
+    }
+
+    @Test
+    public void testExecute_ExceptionDuringExecution() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        RuntimeException testException = new RuntimeException("Test exception");
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenThrow(testException);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertFalse(answer.getResult());
+            assertTrue(answer.getDetails().contains("Exception"));
+            assertTrue(answer.getDetails().contains("Test exception"));
+        }
+    }
+
+    @Test
+    public void testExecute_VerifyScriptConstruction() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    // Just set up the mock behavior - don't assert here as it can interfere
+                    when(mock.execute()).thenReturn(null);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            // Verify the answer is successful
+            assertNotNull("Answer should not be null", answer);
+            assertTrue("Answer should indicate success. Details: " + answer.getDetails(),
+                      answer.getResult());
+
+            // Verify that Script was constructed exactly once
+            assertEquals("Script should be constructed once", 1, scriptMock.constructed().size());
+        }
+    }
+
+    @Test
+    public void testExecute_AllOperationsUseDifferentFlags() {
+        // Test that each operation uses the correct lvchange flag
+
+        // DEACTIVATE -> -an
+        ClvmLockTransferCommand deactivateCmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null);
+                })) {
+
+            wrapper.execute(deactivateCmd, libvirtComputingResource);
+            verify(scriptMock.constructed().get(0)).add("-an");
+        }
+
+        // ACTIVATE_EXCLUSIVE -> -aey
+        ClvmLockTransferCommand exclusiveCmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null);
+                })) {
+
+            wrapper.execute(exclusiveCmd, libvirtComputingResource);
+            verify(scriptMock.constructed().get(0)).add("-aey");
+        }
+
+        // ACTIVATE_SHARED -> -asy
+        ClvmLockTransferCommand sharedCmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_SHARED,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null);
+                })) {
+
+            wrapper.execute(sharedCmd, libvirtComputingResource);
+            verify(scriptMock.constructed().get(0)).add("-asy");
+        }
+    }
+
+    @Test
+    public void testExecute_LvchangeVolumeInUseError() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.DEACTIVATE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        String errorMessage = "Can't deactivate volume group with active logical volumes";
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(errorMessage);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertFalse(answer.getResult());
+            assertTrue(answer.getDetails().contains(errorMessage));
+        }
+    }
+
+    @Test
+    public void testExecute_LvchangePermissionDenied() {
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE,
+                TEST_LV_PATH,
+                TEST_VOLUME_UUID
+        );
+
+        String errorMessage = "Permission denied";
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(errorMessage);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertFalse(answer.getResult());
+            assertTrue(answer.getDetails().contains(errorMessage));
+        }
+    }
+
+    @Test
+    public void testExecute_ComplexLvPath() {
+        String complexPath = "/dev/cloudstack-vg-primary/volume-123-456-789-abc-def";
+        ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE,
+                complexPath,
+                TEST_VOLUME_UUID
+        );
+
+        try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                (mock, context) -> {
+                    when(mock.execute()).thenReturn(null);
+                })) {
+
+            Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+            assertNotNull(answer);
+            assertTrue(answer.getResult());
+
+            // Verify the complex path was passed correctly
+            Script script = scriptMock.constructed().get(0);
+            verify(script).add(complexPath);
+        }
+    }
+
+    @Test
+    public void testExecute_SequentialOperations() {
+        // Test that multiple operations can be executed sequentially
+        String[] paths = {
+            "/dev/vg1/vol1",
+            "/dev/vg1/vol2",
+            "/dev/vg2/vol3"
+        };
+
+        for (String path : paths) {
+            ClvmLockTransferCommand cmd = new ClvmLockTransferCommand(
+                    ClvmLockTransferCommand.Operation.DEACTIVATE,
+                    path,
+                    "uuid-" + path.hashCode()
+            );
+
+            try (MockedConstruction<Script> scriptMock = Mockito.mockConstruction(Script.class,
+                    (mock, context) -> {
+                        when(mock.execute()).thenReturn(null);
+                    })) {
+
+                Answer answer = wrapper.execute(cmd, libvirtComputingResource);
+
+                assertNotNull(answer);
+                assertTrue(answer.getResult());
+            }
+        }
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapperTest.java
new file mode 100644
index 00000000000..8acc8cf20dd
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtModifyStoragePoolCommandWrapperTest.java
@@ -0,0 +1,341 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.ModifyStoragePoolAnswer;
+import com.cloud.agent.api.ModifyStoragePoolCommand;
+import com.cloud.agent.api.to.StorageFilerTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.storage.Storage.StoragePoolType;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LibvirtModifyStoragePoolCommandWrapperTest {
+
+    @Mock
+    private LibvirtComputingResource libvirtComputingResource;
+
+    @Mock
+    private KVMStoragePoolManager storagePoolManager;
+
+    @Mock
+    private ModifyStoragePoolCommand command;
+
+    @Mock
+    private StorageFilerTO storageFilerTO;
+
+    @Mock
+    private KVMStoragePool storagePool;
+
+    private LibvirtModifyStoragePoolCommandWrapper wrapper;
+
+    @Before
+    public void setUp() {
+        wrapper = new LibvirtModifyStoragePoolCommandWrapper();
+        when(libvirtComputingResource.getStoragePoolMgr()).thenReturn(storagePoolManager);
+    }
+
+    @Test
+    public void testAddClvmStoragePoolWithoutDetails() {
+        when(command.getAdd()).thenReturn(true);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(null);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getHost()).thenReturn("192.168.1.100");
+        when(storageFilerTO.getPort()).thenReturn(0);
+        when(storageFilerTO.getPath()).thenReturn("/vg0");
+        when(storageFilerTO.getUserInfo()).thenReturn(null);
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM);
+
+        when(storagePool.getCapacity()).thenReturn(1000000L);
+        when(storagePool.getAvailable()).thenReturn(500000L);
+        when(storagePool.getDetails()).thenReturn(new HashMap<>());
+
+        when(storagePoolManager.createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM), anyMap()))
+            .thenReturn(storagePool);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertTrue("Answer should indicate success. Details: " + answer.getDetails(), answer.getResult());
+        assertTrue("Answer should be ModifyStoragePoolAnswer", answer instanceof ModifyStoragePoolAnswer);
+
+        // Verify the details were passed correctly
+        ArgumentCaptor<Map<String, String>> detailsCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(storagePoolManager).createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM), detailsCaptor.capture());
+
+        Map<String, String> capturedDetails = detailsCaptor.getValue();
+        assertNotNull("Details should not be null", capturedDetails);
+        assertEquals("CLVM_SECURE_ZERO_FILL should default to false",
+                "false", capturedDetails.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL));
+    }
+
+    @Test
+    public void testAddClvmNgStoragePoolWithEmptyDetails() {
+        when(command.getAdd()).thenReturn(true);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(new HashMap<>());
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getHost()).thenReturn("192.168.1.100");
+        when(storageFilerTO.getPort()).thenReturn(0);
+        when(storageFilerTO.getPath()).thenReturn("/vg0");
+        when(storageFilerTO.getUserInfo()).thenReturn(null);
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM_NG);
+
+        when(storagePool.getCapacity()).thenReturn(2000000L);
+        when(storagePool.getAvailable()).thenReturn(1000000L);
+        when(storagePool.getDetails()).thenReturn(new HashMap<>());
+
+        when(storagePoolManager.createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM_NG), anyMap()))
+            .thenReturn(storagePool);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertTrue("Answer should indicate success", answer.getResult());
+
+        ArgumentCaptor<Map<String, String>> detailsCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(storagePoolManager).createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM_NG), detailsCaptor.capture());
+
+        Map<String, String> capturedDetails = detailsCaptor.getValue();
+        assertNotNull("Details should not be null", capturedDetails);
+        assertEquals("CLVM_SECURE_ZERO_FILL should default to false",
+                "false", capturedDetails.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL));
+    }
+
+    @Test
+    public void testAddClvmStoragePoolWithExistingSecureZeroFillSetting() {
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "true");
+        details.put("someOtherKey", "someValue");
+
+        when(command.getAdd()).thenReturn(true);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(details);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getHost()).thenReturn("192.168.1.100");
+        when(storageFilerTO.getPort()).thenReturn(0);
+        when(storageFilerTO.getPath()).thenReturn("/vg0");
+        when(storageFilerTO.getUserInfo()).thenReturn(null);
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM);
+
+        when(storagePool.getCapacity()).thenReturn(1000000L);
+        when(storagePool.getAvailable()).thenReturn(500000L);
+        when(storagePool.getDetails()).thenReturn(new HashMap<>());
+
+        when(storagePoolManager.createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM), anyMap()))
+            .thenReturn(storagePool);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertTrue("Answer should indicate success", answer.getResult());
+
+        ArgumentCaptor<Map<String, String>> detailsCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(storagePoolManager).createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM), detailsCaptor.capture());
+
+        Map<String, String> capturedDetails = detailsCaptor.getValue();
+        assertNotNull("Details should not be null", capturedDetails);
+        assertEquals("CLVM_SECURE_ZERO_FILL should preserve existing value",
+                "true", capturedDetails.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL));
+        assertEquals("Other details should be preserved",
+                "someValue", capturedDetails.get("someOtherKey"));
+    }
+
+    @Test
+    public void testAddClvmStoragePoolPreservesOtherDetailsWhenAddingDefault() {
+        Map<String, String> details = new HashMap<>();
+        details.put("customKey1", "value1");
+        details.put("customKey2", "value2");
+
+        when(command.getAdd()).thenReturn(true);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(details);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getHost()).thenReturn("192.168.1.100");
+        when(storageFilerTO.getPort()).thenReturn(0);
+        when(storageFilerTO.getPath()).thenReturn("/vg0");
+        when(storageFilerTO.getUserInfo()).thenReturn(null);
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM_NG);
+
+        when(storagePool.getCapacity()).thenReturn(1000000L);
+        when(storagePool.getAvailable()).thenReturn(500000L);
+        when(storagePool.getDetails()).thenReturn(new HashMap<>());
+
+        when(storagePoolManager.createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM_NG), anyMap()))
+            .thenReturn(storagePool);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertTrue("Answer should indicate success", answer.getResult());
+
+        ArgumentCaptor<Map<String, String>> detailsCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(storagePoolManager).createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM_NG), detailsCaptor.capture());
+
+        Map<String, String> capturedDetails = detailsCaptor.getValue();
+        assertNotNull("Details should not be null", capturedDetails);
+        assertEquals("CLVM_SECURE_ZERO_FILL should default to false",
+                "false", capturedDetails.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL));
+        assertEquals("Custom details should be preserved",
+                "value1", capturedDetails.get("customKey1"));
+        assertEquals("Custom details should be preserved",
+                "value2", capturedDetails.get("customKey2"));
+    }
+
+    @Test
+    public void testDeleteClvmStoragePoolSuccess() {
+        when(command.getAdd()).thenReturn(false);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(null);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM);
+
+        when(storagePoolManager.deleteStoragePool(StoragePoolType.CLVM, "pool-uuid", null))
+            .thenReturn(true);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertTrue("Answer should indicate success", answer.getResult());
+        verify(storagePoolManager).deleteStoragePool(StoragePoolType.CLVM, "pool-uuid", null);
+    }
+
+    @Test
+    public void testDeleteClvmNgStoragePoolSuccess() {
+        when(command.getAdd()).thenReturn(false);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(null);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM_NG);
+
+        when(storagePoolManager.deleteStoragePool(StoragePoolType.CLVM_NG, "pool-uuid", null))
+            .thenReturn(true);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertTrue("Answer should indicate success", answer.getResult());
+        verify(storagePoolManager).deleteStoragePool(StoragePoolType.CLVM_NG, "pool-uuid", null);
+    }
+
+    @Test
+    public void testDeleteClvmStoragePoolFailure() {
+        when(command.getAdd()).thenReturn(false);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(null);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM);
+
+        when(storagePoolManager.deleteStoragePool(StoragePoolType.CLVM, "pool-uuid", null))
+            .thenReturn(false);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertFalse("Answer should indicate failure", answer.getResult());
+        assertEquals("Failed to delete storage pool", answer.getDetails());
+    }
+
+    @Test
+    public void testAddClvmStoragePoolCreationFailure() {
+        when(command.getAdd()).thenReturn(true);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(null);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getHost()).thenReturn("192.168.1.100");
+        when(storageFilerTO.getPort()).thenReturn(0);
+        when(storageFilerTO.getPath()).thenReturn("/vg0");
+        when(storageFilerTO.getUserInfo()).thenReturn(null);
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.CLVM);
+
+        when(storagePoolManager.createStoragePool(eq("pool-uuid"), eq("192.168.1.100"), eq(0),
+                eq("/vg0"), eq(null), eq(StoragePoolType.CLVM), anyMap()))
+            .thenReturn(null);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertFalse("Answer should indicate failure", answer.getResult());
+        assertEquals(" Failed to create storage pool", answer.getDetails());
+    }
+
+    @Test
+    public void testAddNfsStoragePoolDoesNotSetClvmSecureZeroFill() {
+        when(command.getAdd()).thenReturn(true);
+        when(command.getPool()).thenReturn(storageFilerTO);
+        when(command.getDetails()).thenReturn(null);
+
+        when(storageFilerTO.getUuid()).thenReturn("pool-uuid");
+        when(storageFilerTO.getHost()).thenReturn("nfs.server.com");
+        when(storageFilerTO.getPort()).thenReturn(0);
+        when(storageFilerTO.getPath()).thenReturn("/export/nfs");
+        when(storageFilerTO.getUserInfo()).thenReturn(null);
+        when(storageFilerTO.getType()).thenReturn(StoragePoolType.NetworkFilesystem);
+
+        when(storagePool.getCapacity()).thenReturn(1000000L);
+        when(storagePool.getAvailable()).thenReturn(500000L);
+        when(storagePool.getDetails()).thenReturn(new HashMap<>());
+
+        when(storagePoolManager.createStoragePool(eq("pool-uuid"), eq("nfs.server.com"), eq(0),
+                eq("/export/nfs"), eq(null), eq(StoragePoolType.NetworkFilesystem), anyMap()))
+            .thenReturn(storagePool);
+
+        Answer answer = wrapper.execute(command, libvirtComputingResource);
+
+        assertTrue("Answer should indicate success", answer.getResult());
+
+        ArgumentCaptor<Map<String, String>> detailsCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(storagePoolManager).createStoragePool(eq("pool-uuid"), eq("nfs.server.com"), eq(0),
+                eq("/export/nfs"), eq(null), eq(StoragePoolType.NetworkFilesystem), detailsCaptor.capture());
+
+        Map<String, String> capturedDetails = detailsCaptor.getValue();
+        assertNotNull("Details should not be null", capturedDetails);
+        assertEquals("CLVM_SECURE_ZERO_FILL gets added for all pools",
+                "false", capturedDetails.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL));
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapperTest.java
new file mode 100644
index 00000000000..f844711399f
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPostMigrationCommandWrapperTest.java
@@ -0,0 +1,363 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.PostMigrationAnswer;
+import com.cloud.agent.api.PostMigrationCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.libvirt.Connect;
+import org.libvirt.LibvirtException;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
+public class LibvirtPostMigrationCommandWrapperTest {
+
+    @Mock
+    private LibvirtComputingResource libvirtComputingResource;
+
+    @Mock
+    private PostMigrationCommand postMigrationCommand;
+
+    @Mock
+    private VirtualMachineTO virtualMachineTO;
+
+    @Mock
+    private Connect connect;
+
+    private LibvirtPostMigrationCommandWrapper wrapper;
+
+    private static final String VM_NAME = "test-vm";
+
+    @Before
+    public void setUp() {
+        wrapper = new LibvirtPostMigrationCommandWrapper();
+        when(postMigrationCommand.getVmName()).thenReturn(VM_NAME);
+        when(postMigrationCommand.getVirtualMachine()).thenReturn(virtualMachineTO);
+    }
+
+    @Test
+    public void testExecute_NoClvmVolumes_Success() throws LibvirtException {
+        List<DiskDef> disks = createNonClvmDisks();
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class)) {
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            Assert.assertTrue(answer instanceof PostMigrationAnswer);
+        }
+    }
+
+    @Test
+    public void testExecute_ClvmVolumes_ConvertedToExclusiveMode() throws LibvirtException {
+        List<DiskDef> disks = createClvmDisks();
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class);
+             MockedStatic<LibvirtComputingResource> mockedResource = Mockito.mockStatic(LibvirtComputingResource.class)) {
+
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+            mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
+            ), times(1));
+        }
+    }
+
+    @Test
+    public void testExecute_ClvmNgVolumes_ConvertedToExclusiveMode() throws LibvirtException {
+        List<DiskDef> disks = createClvmNgDisks();
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class);
+             MockedStatic<LibvirtComputingResource> mockedResource = Mockito.mockStatic(LibvirtComputingResource.class)) {
+
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+            mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    any(),
+                    any(),
+                    any()
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
+            ), times(1));
+        }
+    }
+
+    @Test
+    public void testExecute_MixedVolumes_OnlyClvmConverted() throws LibvirtException {
+        List<DiskDef> disks = createMixedDisks();
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class);
+             MockedStatic<LibvirtComputingResource> mockedResource = Mockito.mockStatic(LibvirtComputingResource.class)) {
+
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+            mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    any(),
+                    any(),
+                    any()
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
+            ), times(1));
+        }
+    }
+
+    @Test
+    public void testExecute_LibvirtException_ReturnsFailure() throws LibvirtException {
+        LibvirtException libvirtException = Mockito.mock(LibvirtException.class);
+        when(libvirtException.getMessage()).thenReturn("Connection failed");
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class)) {
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME))
+                    .thenThrow(libvirtException);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertFalse(answer.getResult());
+            Assert.assertTrue(answer.getDetails().contains("Connection failed"));
+        }
+    }
+
+    @Test
+    public void testExecute_RuntimeException_ReturnsFailure() throws LibvirtException {
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class)) {
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME))
+                    .thenThrow(new RuntimeException("Unexpected error"));
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertFalse(answer.getResult());
+            Assert.assertTrue(answer.getDetails().contains("Unexpected error"));
+        }
+    }
+
+    @Test
+    public void testExecute_NullVmName_ReturnsFailure() {
+        when(postMigrationCommand.getVmName()).thenReturn(null);
+
+        Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+        Assert.assertFalse(answer.getResult());
+        Assert.assertTrue(answer.getDetails().contains("VM or VM name is null"));
+    }
+
+    @Test
+    public void testExecute_NullVirtualMachine_ReturnsFailure() {
+        when(postMigrationCommand.getVirtualMachine()).thenReturn(null);
+
+        Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+        Assert.assertFalse(answer.getResult());
+        Assert.assertTrue(answer.getDetails().contains("VM or VM name is null"));
+    }
+
+    @Test
+    public void testExecute_EmptyDiskList_Success() throws LibvirtException {
+        List<DiskDef> disks = new ArrayList<>();
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class)) {
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+        }
+    }
+
+    @Test
+    public void testExecute_MultipleClvmVolumes_AllConverted() throws LibvirtException {
+        List<DiskDef> disks = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            DiskDef disk = Mockito.mock(DiskDef.class);
+            Mockito.lenient().when(disk.getDiskPath()).thenReturn("/dev/clvm-vg/volume" + i);
+            disks.add(disk);
+        }
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class);
+             MockedStatic<LibvirtComputingResource> mockedResource = Mockito.mockStatic(LibvirtComputingResource.class)) {
+
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+            mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    any(),
+                    any(),
+                    any()
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
+            ), times(1));
+        }
+    }
+
+    @Test
+    public void testExecute_ClvmAndClvmNgMixed_BothConverted() throws LibvirtException {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef clvmDisk1 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(clvmDisk1.getDiskPath()).thenReturn("/dev/clvm-vg/volume1");
+        disks.add(clvmDisk1);
+
+        DiskDef clvmNgDisk = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(clvmNgDisk.getDiskPath()).thenReturn("/dev/clvmng-vg/volume2");
+        disks.add(clvmNgDisk);
+
+        DiskDef clvmDisk2 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(clvmDisk2.getDiskPath()).thenReturn("/dev/clvm-vg/volume3");
+        disks.add(clvmDisk2);
+
+        try (MockedStatic<LibvirtConnection> mockedConnection = Mockito.mockStatic(LibvirtConnection.class);
+             MockedStatic<LibvirtComputingResource> mockedResource = Mockito.mockStatic(LibvirtComputingResource.class)) {
+
+            mockedConnection.when(() -> LibvirtConnection.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+            when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+            mockedResource.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    any(),
+                    any(),
+                    any()
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(postMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedResource.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.EXCLUSIVE)
+            ), times(1));
+        }
+    }
+
+    private List<DiskDef> createNonClvmDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef disk1 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk1.getDiskPath()).thenReturn("/mnt/nfs/volume1.qcow2");
+        disks.add(disk1);
+
+        DiskDef disk2 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk2.getDiskPath()).thenReturn("/mnt/nfs/volume2.qcow2");
+        disks.add(disk2);
+
+        return disks;
+    }
+
+    private List<DiskDef> createClvmDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef disk1 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk1.getDiskPath()).thenReturn("/dev/clvm-vg/volume1");
+        disks.add(disk1);
+
+        DiskDef disk2 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk2.getDiskPath()).thenReturn("/dev/clvm-vg/volume2");
+        disks.add(disk2);
+
+        return disks;
+    }
+
+    private List<DiskDef> createClvmNgDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef disk1 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk1.getDiskPath()).thenReturn("/dev/clvmng-vg/volume1");
+        disks.add(disk1);
+
+        DiskDef disk2 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk2.getDiskPath()).thenReturn("/dev/clvmng-vg/volume2");
+        disks.add(disk2);
+
+        return disks;
+    }
+
+    private List<DiskDef> createMixedDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef clvmDisk = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(clvmDisk.getDiskPath()).thenReturn("/dev/clvm-vg/volume1");
+        disks.add(clvmDisk);
+
+        DiskDef nfsDisk = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(nfsDisk.getDiskPath()).thenReturn("/mnt/nfs/volume2.qcow2");
+        disks.add(nfsDisk);
+
+        DiskDef clvmNgDisk = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(clvmNgDisk.getDiskPath()).thenReturn("/dev/clvmng-vg/volume3");
+        disks.add(clvmNgDisk);
+
+        return disks;
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapperTest.java
new file mode 100644
index 00000000000..39eaeb71a6c
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPreMigrationCommandWrapperTest.java
@@ -0,0 +1,282 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.PreMigrationCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.LibvirtException;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LibvirtPreMigrationCommandWrapperTest {
+
+    @Mock
+    private LibvirtComputingResource libvirtComputingResource;
+
+    @Mock
+    private PreMigrationCommand preMigrationCommand;
+
+    @Mock
+    private VirtualMachineTO virtualMachineTO;
+
+    @Mock
+    private Connect connect;
+
+    @Mock
+    private Domain domain;
+
+    @Mock
+    private LibvirtUtilitiesHelper libvirtUtilitiesHelper;
+
+    private LibvirtPreMigrationCommandWrapper wrapper;
+
+    private static final String VM_NAME = "test-vm";
+
+    @Before
+    public void setUp() {
+        wrapper = new LibvirtPreMigrationCommandWrapper();
+        when(preMigrationCommand.getVmName()).thenReturn(VM_NAME);
+        when(preMigrationCommand.getVirtualMachine()).thenReturn(virtualMachineTO);
+        when(libvirtComputingResource.getLibvirtUtilitiesHelper()).thenReturn(libvirtUtilitiesHelper);
+    }
+
+    @Test
+    public void testExecute_NoClvmVolumes_Success() throws LibvirtException {
+        List<DiskDef> disks = createNonClvmDisks();
+        when(libvirtUtilitiesHelper.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+        when(connect.domainLookupByName(VM_NAME)).thenReturn(domain);
+        when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+        Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+        Assert.assertTrue(answer.getResult());
+        Assert.assertEquals("Source host prepared for migration", answer.getDetails());
+        verify(domain, times(1)).free();
+    }
+
+    @Test
+    public void testExecute_ClvmVolumes_ConvertedToSharedMode() throws LibvirtException {
+        List<DiskDef> disks = createClvmDisks();
+        when(libvirtUtilitiesHelper.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+        when(connect.domainLookupByName(VM_NAME)).thenReturn(domain);
+        when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+        try (MockedStatic<LibvirtComputingResource> mockedStatic = Mockito.mockStatic(LibvirtComputingResource.class)) {
+            mockedStatic.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedStatic.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
+            ), times(1));
+            verify(domain, times(1)).free();
+        }
+    }
+
+    @Test
+    public void testExecute_ClvmNgVolumes_ConvertedToSharedMode() throws LibvirtException {
+        List<DiskDef> disks = createClvmNgDisks();
+        when(libvirtUtilitiesHelper.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+        when(connect.domainLookupByName(VM_NAME)).thenReturn(domain);
+        when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+        try (MockedStatic<LibvirtComputingResource> mockedStatic = Mockito.mockStatic(LibvirtComputingResource.class)) {
+            mockedStatic.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    any(),
+                    any(),
+                    any()
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedStatic.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
+            ), times(1));
+        }
+    }
+
+    @Test
+    public void testExecute_MixedVolumes_OnlyClvmConverted() throws LibvirtException {
+        List<DiskDef> disks = createMixedDisks();
+        when(libvirtUtilitiesHelper.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+        when(connect.domainLookupByName(VM_NAME)).thenReturn(domain);
+        when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+        try (MockedStatic<LibvirtComputingResource> mockedStatic = Mockito.mockStatic(LibvirtComputingResource.class)) {
+            mockedStatic.when(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    any(),
+                    any(),
+                    any()
+            )).then(invocation -> null);
+
+            Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+            Assert.assertTrue(answer.getResult());
+            mockedStatic.verify(() -> LibvirtComputingResource.modifyClvmVolumesStateForMigration(
+                    eq(disks),
+                    eq(virtualMachineTO),
+                    eq(LibvirtComputingResource.ClvmVolumeState.SHARED)
+            ), times(1));
+        }
+    }
+
+    @Test
+    public void testExecute_LibvirtException_ReturnsFailure() throws LibvirtException {
+        LibvirtException libvirtException = Mockito.mock(LibvirtException.class);
+        when(libvirtException.getMessage()).thenReturn("Connection failed");
+        when(libvirtUtilitiesHelper.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+        when(connect.domainLookupByName(VM_NAME)).thenThrow(libvirtException);
+
+        Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+        Assert.assertFalse(answer.getResult());
+        Assert.assertTrue(answer.getDetails().contains("Failed to prepare source host"));
+        Assert.assertTrue(answer.getDetails().contains("Connection failed"));
+    }
+
+    @Test
+    public void testExecute_DomainFreeFails_StillReturnsSuccess() throws LibvirtException {
+        List<DiskDef> disks = createNonClvmDisks();
+        LibvirtException libvirtException = Mockito.mock(LibvirtException.class);
+        when(libvirtUtilitiesHelper.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+        when(connect.domainLookupByName(VM_NAME)).thenReturn(domain);
+        when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+        Mockito.doThrow(libvirtException).when(domain).free();
+
+        Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+        Assert.assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testExecute_NullVmName_ReturnsFailure() throws LibvirtException {
+        LibvirtException libvirtException = Mockito.mock(LibvirtException.class);
+        when(preMigrationCommand.getVmName()).thenReturn(null);
+        when(libvirtUtilitiesHelper.getConnectionByVmName(null)).thenThrow(libvirtException);
+
+        Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+        Assert.assertFalse(answer.getResult());
+    }
+
+    @Test
+    public void testExecute_EmptyDiskList_Success() throws LibvirtException {
+        List<DiskDef> disks = new ArrayList<>();
+        when(libvirtUtilitiesHelper.getConnectionByVmName(VM_NAME)).thenReturn(connect);
+        when(connect.domainLookupByName(VM_NAME)).thenReturn(domain);
+        when(libvirtComputingResource.getDisks(connect, VM_NAME)).thenReturn(disks);
+
+        Answer answer = wrapper.execute(preMigrationCommand, libvirtComputingResource);
+
+        Assert.assertTrue(answer.getResult());
+        verify(domain, times(1)).free();
+    }
+
+    private List<DiskDef> createNonClvmDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef disk1 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk1.getDiskPath()).thenReturn("/mnt/nfs/volume1.qcow2");
+        disks.add(disk1);
+
+        DiskDef disk2 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk2.getDiskPath()).thenReturn("/mnt/nfs/volume2.qcow2");
+        disks.add(disk2);
+
+        return disks;
+    }
+
+    private List<DiskDef> createClvmDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef disk1 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk1.getDiskPath()).thenReturn("/dev/clvm-vg/volume1");
+        disks.add(disk1);
+
+        DiskDef disk2 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk2.getDiskPath()).thenReturn("/dev/clvm-vg/volume2");
+        disks.add(disk2);
+
+        return disks;
+    }
+
+    private List<DiskDef> createClvmNgDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef disk1 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk1.getDiskPath()).thenReturn("/dev/clvmng-vg/volume1");
+        disks.add(disk1);
+
+        DiskDef disk2 = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(disk2.getDiskPath()).thenReturn("/dev/clvmng-vg/volume2");
+        disks.add(disk2);
+
+        return disks;
+    }
+
+    private List<DiskDef> createMixedDisks() {
+        List<DiskDef> disks = new ArrayList<>();
+
+        DiskDef clvmDisk = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(clvmDisk.getDiskPath()).thenReturn("/dev/clvm-vg/volume1");
+        disks.add(clvmDisk);
+
+        DiskDef nfsDisk = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(nfsDisk.getDiskPath()).thenReturn("/mnt/nfs/volume2.qcow2");
+        disks.add(nfsDisk);
+
+        DiskDef clvmNgDisk = Mockito.mock(DiskDef.class);
+        Mockito.lenient().when(clvmNgDisk.getDiskPath()).thenReturn("/dev/clvmng-vg/volume3");
+        disks.add(clvmNgDisk);
+
+        return disks;
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptorTest.java
new file mode 100644
index 00000000000..1736c1d3f98
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptorTest.java
@@ -0,0 +1,1104 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.hypervisor.kvm.storage;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.when;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.libvirt.Connect;
+import org.libvirt.StoragePool;
+import org.mockito.Mock;
+import org.mockito.MockedConstruction;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
+import com.cloud.storage.Storage;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ClvmStorageAdaptorTest {
+
+    private MockedStatic<LibvirtConnection> libvirtConnectionMockedStatic;
+    private AutoCloseable closeable;
+    @Mock
+    KVMStoragePool mockPool;
+    MockedStatic<Script> mockScript;
+    private MockedConstruction<Script> mockScriptConstruction;
+    @Spy
+    static ClvmStorageAdaptor clvmStorageAdaptor = new ClvmStorageAdaptor(null);
+    @Before
+    public void initMocks() {
+        closeable = MockitoAnnotations.openMocks(this);
+        libvirtConnectionMockedStatic = Mockito.mockStatic(LibvirtConnection.class);
+        Mockito.reset(mockPool);
+        mockScript = Mockito.mockStatic(Script.class);
+    }
+    @After
+    public void tearDown() throws Exception {
+        libvirtConnectionMockedStatic.close();
+        mockScript.close();
+        if (mockScriptConstruction != null) {
+            mockScriptConstruction.close();
+        }
+        closeable.close();
+    }
+    @Test
+    public void testCreateCLVMStoragePool_Success() throws Exception {
+        String uuid = UUID.randomUUID().toString();
+        String vgName = "testvg";
+        String host = "localhost";
+
+        Connect mockConn = Mockito.mock(Connect.class);
+        StoragePool mockStoragePool = Mockito.mock(StoragePool.class);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn(null);
+            });
+
+        Mockito.when(mockConn.storagePoolDefineXML(anyString(), eq(0)))
+               .thenReturn(mockStoragePool);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createCLVMStoragePool", Connect.class, String.class, String.class, String.class);
+        method.setAccessible(true);
+
+        StoragePool result = (StoragePool) method.invoke(
+            clvmStorageAdaptor, mockConn, uuid, host, vgName);
+
+        assertNotNull("Storage pool should be created", result);
+        Mockito.verify(mockStoragePool).setAutostart(1);
+        Mockito.verify(mockConn).storagePoolDefineXML(anyString(), eq(0));
+    }
+
+    @Test
+    public void testCreateCLVMStoragePool_VGNotFound() throws Exception {
+        String uuid = UUID.randomUUID().toString();
+        String vgName = "nonexistentvg";
+        String host = "localhost";
+
+        Connect mockConn = Mockito.mock(Connect.class);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn("Volume group \"" + vgName + "\" not found");
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createCLVMStoragePool", Connect.class, String.class, String.class, String.class);
+        method.setAccessible(true);
+
+        StoragePool result = (StoragePool) method.invoke(
+            clvmStorageAdaptor, mockConn, uuid, host, vgName);
+
+        assert result == null : "Should return null when VG doesn't exist";
+        Mockito.verify(mockConn, never()).storagePoolDefineXML(anyString(), anyInt());
+    }
+
+    @Test
+    public void testCreateClvmVolume_Success() throws Exception {
+        String volumeName = UUID.randomUUID().toString();
+        long size = 10737418240L;
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn(null);
+            });
+
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createClvmVolume", String.class, long.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        KVMPhysicalDisk result = (KVMPhysicalDisk) method.invoke(
+            clvmStorageAdaptor, volumeName, size, mockPool);
+
+        assertNotNull("Physical disk should be created", result);
+        assertEquals("Volume name should match", volumeName, result.getName());
+        assertEquals("Format should be RAW", PhysicalDiskFormat.RAW, result.getFormat());
+        assert result.getPath().contains(vgName) : "Path should contain VG name";
+        assert result.getPath().contains(volumeName) : "Path should contain volume name";
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testCreateClvmVolume_LvcreateFailure() throws Throwable {
+        String volumeName = UUID.randomUUID().toString();
+        long size = 10737418240L;
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn("lvcreate failed: insufficient space");
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createClvmVolume", String.class, long.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, volumeName, size, mockPool);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test
+    public void testCreateClvmNgDiskWithBacking_NoBackingFile() throws Exception {
+        String volumeUuid = UUID.randomUUID().toString();
+        int timeout = 30000;
+        long virtualSize = 10737418240L;
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn(null);
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createClvmNgDiskWithBacking",
+            String.class, int.class, long.class, String.class,
+            KVMStoragePool.class, Storage.ProvisioningType.class);
+        method.setAccessible(true);
+
+        KVMPhysicalDisk result = (KVMPhysicalDisk) method.invoke(
+            clvmStorageAdaptor, volumeUuid, timeout, virtualSize, null,
+            mockPool, Storage.ProvisioningType.THIN);
+
+        assertNotNull("Physical disk should be created", result);
+        assertEquals("Volume UUID should match", volumeUuid, result.getName());
+        assertEquals("Format should be QCOW2", PhysicalDiskFormat.QCOW2, result.getFormat());
+        assert result.getPath().contains(vgName) : "Path should contain VG name";
+        assert result.getPath().contains(volumeUuid) : "Path should contain volume UUID";
+    }
+
+    @Test
+    public void testCreateClvmNgDiskWithBacking_WithBackingFile() throws Exception {
+        String volumeUuid = UUID.randomUUID().toString();
+        String backingFile = "/dev/testvg/parent-volume";
+        int timeout = 30000;
+        long virtualSize = 10737418240L;
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn(null);
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createClvmNgDiskWithBacking",
+            String.class, int.class, long.class, String.class,
+            KVMStoragePool.class, Storage.ProvisioningType.class);
+        method.setAccessible(true);
+
+        KVMPhysicalDisk result = (KVMPhysicalDisk) method.invoke(
+            clvmStorageAdaptor, volumeUuid, timeout, virtualSize, backingFile,
+            mockPool, Storage.ProvisioningType.SPARSE);
+
+        assertNotNull("Physical disk should be created", result);
+        assertEquals("Format should be QCOW2", PhysicalDiskFormat.QCOW2, result.getFormat());
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testCreateClvmNgDiskWithBacking_LvcreateFailure() throws Throwable {
+        String volumeUuid = UUID.randomUUID().toString();
+        int timeout = 30000;
+        long virtualSize = 10737418240L;
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn("Insufficient free extents");
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createClvmNgDiskWithBacking",
+            String.class, int.class, long.class, String.class,
+            KVMStoragePool.class, Storage.ProvisioningType.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, volumeUuid, timeout, virtualSize,
+                         null, mockPool, Storage.ProvisioningType.THIN);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testCreateClvmNgDiskWithBacking_QemuImgFailure() throws Throwable {
+        String volumeUuid = UUID.randomUUID().toString();
+        int timeout = 30000;
+        long virtualSize = 10737418240L;
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        final int[] callCount = {0};
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenAnswer(invocation -> {
+                    callCount[0]++;
+                    if (callCount[0] == 1) {
+                        return null;
+                    } else {
+                        return "qemu-img: error creating QCOW2";
+                    }
+                });
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createClvmNgDiskWithBacking",
+            String.class, int.class, long.class, String.class,
+            KVMStoragePool.class, Storage.ProvisioningType.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, volumeUuid, timeout, virtualSize,
+                         null, mockPool, Storage.ProvisioningType.THIN);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testGetPhysicalDiskViaDirectBlockDevice_VolumeNotFound() throws Throwable {
+        String volumeUuid = UUID.randomUUID().toString();
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn("  Volume not found");
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getPhysicalDiskViaDirectBlockDevice",
+            String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, volumeUuid, mockPool);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testGetPhysicalDiskViaDirectBlockDevice_NullPoolPath() throws Throwable {
+        String volumeUuid = UUID.randomUUID().toString();
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(null);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getPhysicalDiskViaDirectBlockDevice",
+            String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, volumeUuid, mockPool);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testGetPhysicalDiskViaDirectBlockDevice_EmptyPoolPath() throws Throwable {
+        String volumeUuid = UUID.randomUUID().toString();
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn("");
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getPhysicalDiskViaDirectBlockDevice",
+            String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, volumeUuid, mockPool);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test
+    public void testShouldSecureZeroFill_EnabledInDetails() throws Exception {
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "true");
+
+        Mockito.when(mockPool.getDetails()).thenReturn(details);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "shouldSecureZeroFill", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, mockPool);
+
+        assert result : "Should return true when CLVM_SECURE_ZERO_FILL is 'true'";
+    }
+
+    @Test
+    public void testShouldSecureZeroFill_DisabledInDetails() throws Exception {
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "false");
+
+        Mockito.when(mockPool.getDetails()).thenReturn(details);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "shouldSecureZeroFill", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, mockPool);
+
+        assert !result : "Should return false when CLVM_SECURE_ZERO_FILL is 'false'";
+    }
+
+    @Test
+    public void testShouldSecureZeroFill_NotSetInDetails() throws Exception {
+        Map<String, String> details = new HashMap<>();
+
+        Mockito.when(mockPool.getDetails()).thenReturn(details);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "shouldSecureZeroFill", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, mockPool);
+
+        assert !result : "Should return false when CLVM_SECURE_ZERO_FILL is not set";
+    }
+
+    @Test
+    public void testShouldSecureZeroFill_NullDetails() throws Exception {
+        Mockito.when(mockPool.getDetails()).thenReturn(null);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "shouldSecureZeroFill", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, mockPool);
+
+        assert !result : "Should return false when details are null";
+    }
+
+    @Test
+    public void testExtractVgNameFromPool_SimplePath() throws Exception {
+        String vgName = "testvg";
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "extractVgNameFromPool", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        String result = (String) method.invoke(clvmStorageAdaptor, mockPool);
+
+        assertEquals("Should extract VG name correctly", vgName, result);
+    }
+
+    @Test
+    public void testExtractVgNameFromPool_PathWithSlash() throws Exception {
+        String vgName = "testvg";
+        String path = "/" + vgName;
+        Mockito.when(mockPool.getLocalPath()).thenReturn(path);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "extractVgNameFromPool", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        String result = (String) method.invoke(clvmStorageAdaptor, mockPool);
+
+        assertEquals("Should extract VG name from path with leading slash", vgName, result);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testExtractVgNameFromPool_NullPath() throws Throwable {
+        Mockito.when(mockPool.getLocalPath()).thenReturn(null);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "extractVgNameFromPool", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, mockPool);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test
+    public void testLvExists_VolumeExists() throws Exception {
+        String lvPath = "/dev/testvg/test-volume";
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn(null);
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "lvExists", String.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, lvPath);
+
+        assert result : "Should return true when LV exists (lvs returns null)";
+    }
+
+    @Test
+    public void testLvExists_VolumeDoesNotExist() throws Exception {
+        String lvPath = "/dev/testvg/nonexistent-volume";
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn("Volume not found");
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "lvExists", String.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, lvPath);
+
+        assert !result : "Should return false when LV does not exist";
+    }
+
+    @Test
+    public void testGetVgName_SimpleName() throws Exception {
+        String vgName = "acsvg";
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getVgName", String.class);
+        method.setAccessible(true);
+
+        String result = (String) method.invoke(clvmStorageAdaptor, vgName);
+
+        assertEquals("Should return VG name as-is for simple name", vgName, result);
+    }
+
+    @Test
+    public void testGetVgName_PathWithSlash() throws Exception {
+        String vgName = "acsvg";
+        String path = "/" + vgName;
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getVgName", String.class);
+        method.setAccessible(true);
+
+        String result = (String) method.invoke(clvmStorageAdaptor, path);
+
+        assertEquals("Should extract VG name from path with leading slash", vgName, result);
+    }
+
+    @Test
+    public void testGetVgName_DevPath() throws Exception {
+        String vgName = "acsvg";
+        String path = "/dev/" + vgName;
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getVgName", String.class);
+        method.setAccessible(true);
+
+        String result = (String) method.invoke(clvmStorageAdaptor, path);
+
+        assertEquals("Should extract VG name from /dev/ path", vgName, result);
+    }
+
+    @Test
+    public void testCreatePhysicalDiskFromClvmLv_CLVM() throws Exception {
+        String lvPath = "/dev/testvg/test-volume";
+        String volumeUuid = "test-volume";
+        long size = 10737418240L;
+
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createPhysicalDiskFromClvmLv",
+            String.class, String.class, KVMStoragePool.class, long.class);
+        method.setAccessible(true);
+
+        KVMPhysicalDisk result = (KVMPhysicalDisk) method.invoke(
+            clvmStorageAdaptor, lvPath, volumeUuid, mockPool, size);
+
+        assertNotNull("Physical disk should be created", result);
+        assertEquals("Format should be RAW for CLVM", PhysicalDiskFormat.RAW, result.getFormat());
+        assertEquals("Size should match", size, result.getSize());
+        assertEquals("Path should match", lvPath, result.getPath());
+    }
+
+    @Test
+    public void testCreatePhysicalDiskFromClvmLv_CLVM_NG() throws Exception {
+        String lvPath = "/dev/testvg-ng/test-volume";
+        String volumeUuid = "test-volume";
+        long size = 10737418240L;
+
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn(null);
+                Mockito.doAnswer(invocation -> {
+                    OutputInterpreter.AllLinesParser parser = invocation.getArgument(0);
+                    Field allLinesField = OutputInterpreter.AllLinesParser.class.getDeclaredField("allLines");
+                    allLinesField.setAccessible(true);
+                    allLinesField.set(parser, "{\"virtual-size\": " + size + "}");
+                    return null;
+                }).when(mock).execute(Mockito.any(OutputInterpreter.AllLinesParser.class));
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createPhysicalDiskFromClvmLv",
+            String.class, String.class, KVMStoragePool.class, long.class);
+        method.setAccessible(true);
+
+        KVMPhysicalDisk result = (KVMPhysicalDisk) method.invoke(
+            clvmStorageAdaptor, lvPath, volumeUuid, mockPool, size);
+
+        assertNotNull("Physical disk should be created", result);
+        assertEquals("Format should be QCOW2 for CLVM_NG", PhysicalDiskFormat.QCOW2, result.getFormat());
+        assertEquals("Size should match", size, result.getSize());
+        assertEquals("Path should match", lvPath, result.getPath());
+    }
+
+    @Test
+    public void testCLVMPoolSecureZeroFill_TrueValue() {
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "true");
+
+        Mockito.when(mockPool.getDetails()).thenReturn(details);
+
+        String value = mockPool.getDetails().get(KVMStoragePool.CLVM_SECURE_ZERO_FILL);
+        assert "true".equals(value) : "CLVM_SECURE_ZERO_FILL should be 'true'";
+    }
+
+    @Test
+    public void testCLVMPoolSecureZeroFill_FalseValue() {
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "false");
+
+        Mockito.when(mockPool.getDetails()).thenReturn(details);
+
+        String value = mockPool.getDetails().get(KVMStoragePool.CLVM_SECURE_ZERO_FILL);
+        assert "false".equals(value) : "CLVM_SECURE_ZERO_FILL should be 'false'";
+    }
+
+    @Test
+    public void testCLVMVolumePathConstruction() {
+        String vgName = "acsvg";
+        String volumeUuid = "550e8400-e29b-41d4-a716-446655440000";
+        String expectedPath = "/dev/" + vgName + "/" + volumeUuid;
+
+        assertEquals("/dev/acsvg/550e8400-e29b-41d4-a716-446655440000", expectedPath);
+    }
+
+    @Test
+    public void testCLVMNGPoolSupportsQCOW2Format() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        Storage.StoragePoolType type = mockPool.getType();
+        PhysicalDiskFormat expectedFormat = PhysicalDiskFormat.QCOW2;
+
+        assert type == Storage.StoragePoolType.CLVM_NG : "Pool type should be CLVM_NG";
+        assertNotNull("QCOW2 format should be available", expectedFormat);
+    }
+
+    @Test
+    public void testCLVMPoolSupportsRAWFormat() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        Storage.StoragePoolType type = mockPool.getType();
+        PhysicalDiskFormat expectedFormat = PhysicalDiskFormat.RAW;
+
+        assert type == Storage.StoragePoolType.CLVM : "Pool type should be CLVM";
+        assertNotNull("RAW format should be available", expectedFormat);
+    }
+
+    @Test
+    public void testVerifyLvExistsInVg_VolumeExists() throws Exception {
+        String volumeUuid = "test-volume-uuid";
+        String vgName = "testvg";
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> when(mock.execute()).thenReturn(null));
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "verifyLvExistsInVg", String.class, String.class);
+        method.setAccessible(true);
+
+        method.invoke(clvmStorageAdaptor, volumeUuid, vgName);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testVerifyLvExistsInVg_VolumeDoesNotExist() throws Throwable {
+        String volumeUuid = "nonexistent-volume";
+        String vgName = "testvg";
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> when(mock.execute()).thenReturn("  Volume not found"));
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "verifyLvExistsInVg", String.class, String.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, volumeUuid, vgName);
+        } catch (InvocationTargetException e) {
+            throw e.getCause();
+        }
+    }
+
+    @Test
+    public void testGetClvmVolumeSize_MethodExists() throws Exception {
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getClvmVolumeSize", String.class);
+        method.setAccessible(true);
+
+        assertNotNull("getClvmVolumeSize method should exist", method);
+    }
+
+    @Test
+    public void testCLVMPoolIsBlockBased() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        boolean isBlockBased = mockPool.getType() == Storage.StoragePoolType.CLVM ||
+                               mockPool.getType() == Storage.StoragePoolType.CLVM_NG;
+
+        assert isBlockBased : "CLVM should be recognized as block-based storage";
+    }
+
+    @Test
+    public void testCLVMNGPoolIsBlockBased() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        boolean isBlockBased = mockPool.getType() == Storage.StoragePoolType.CLVM ||
+                               mockPool.getType() == Storage.StoragePoolType.CLVM_NG;
+
+        assert isBlockBased : "CLVM_NG should be recognized as block-based storage";
+    }
+
+    @Test
+    public void testGetVgName_ComplexPath() throws Exception {
+        String vgName = "acsvg-ng";
+        String path = "/dev/mapper/" + vgName;
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "getVgName", String.class);
+        method.setAccessible(true);
+
+        String result = (String) method.invoke(clvmStorageAdaptor, path);
+
+        assertNotNull("VG name should not be null", result);
+    }
+
+    @Test
+    public void testExtractVgNameFromPool_EmptyPath() throws Exception {
+        Mockito.when(mockPool.getLocalPath()).thenReturn("");
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "extractVgNameFromPool", KVMStoragePool.class);
+        method.setAccessible(true);
+
+        try {
+            method.invoke(clvmStorageAdaptor, mockPool);
+            assert false : "Should throw CloudRuntimeException for empty path";
+        } catch (InvocationTargetException e) {
+            assert e.getCause() instanceof CloudRuntimeException :
+                "Should throw CloudRuntimeException";
+        }
+    }
+
+    @Test
+    public void testCleanupCLVMVolume_VolumeExists_WithSecureZeroFill() throws Exception {
+        String volumeUuid = UUID.randomUUID().toString();
+        String vgName = "testvg";
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "true");
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+        Mockito.when(mockPool.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(mockPool.getDetails()).thenReturn(details);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> when(mock.execute()).thenReturn(null));
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "cleanupCLVMVolume", String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, volumeUuid, mockPool);
+
+        assert result : "Cleanup should succeed";
+    }
+
+    @Test
+    public void testCleanupCLVMVolume_VolumeExists_WithoutSecureZeroFill() throws Exception {
+        String volumeUuid = UUID.randomUUID().toString();
+        String vgName = "testvg";
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "false");
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+        Mockito.when(mockPool.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(mockPool.getDetails()).thenReturn(details);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> when(mock.execute()).thenReturn(null));
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "cleanupCLVMVolume", String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, volumeUuid, mockPool);
+
+        assert result : "Cleanup should succeed without zero-fill";
+    }
+
+    @Test
+    public void testCleanupCLVMVolume_VolumeNotFound() throws Exception {
+        String volumeUuid = "nonexistent-volume";
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+        Mockito.when(mockPool.getUuid()).thenReturn(UUID.randomUUID().toString());
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> when(mock.execute()).thenReturn("Volume not found"));
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "cleanupCLVMVolume", String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, volumeUuid, mockPool);
+
+        assert result : "Should return true when volume not found (already deleted)";
+    }
+
+    @Test
+    public void testCleanupCLVMVolume_NullSourceDir() throws Exception {
+        String volumeUuid = UUID.randomUUID().toString();
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(null);
+        Mockito.when(mockPool.getUuid()).thenReturn(UUID.randomUUID().toString());
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "cleanupCLVMVolume", String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        boolean result = (boolean) method.invoke(clvmStorageAdaptor, volumeUuid, mockPool);
+
+        assert result : "Should return true when source dir is null";
+    }
+
+    @Test
+    public void testRemoveLvOnFailure_Success() throws Exception {
+        String lvPath = "/dev/testvg/test-volume";
+        int timeout = 30000;
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> when(mock.execute()).thenReturn(null));
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "removeLvOnFailure", String.class, int.class);
+        method.setAccessible(true);
+
+        method.invoke(clvmStorageAdaptor, lvPath, timeout);
+    }
+
+    @Test
+    public void testEnsureTemplateAccessibility_CLVM_NG_TemplateVolume() throws Exception {
+        String volumeUuid = "template-550e8400-e29b-41d4-a716-446655440000";
+        String lvPath = "/dev/testvg/template-550e8400-e29b-41d4-a716-446655440000";
+
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> when(mock.execute()).thenReturn(null));
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "ensureTemplateAccessibility", String.class, String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        method.invoke(clvmStorageAdaptor, volumeUuid, lvPath, mockPool);
+    }
+
+    @Test
+    public void testEnsureTemplateAccessibility_CLVM_NonTemplate() throws Exception {
+        String volumeUuid = UUID.randomUUID().toString();
+        String lvPath = "/dev/testvg/" + volumeUuid;
+
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "ensureTemplateAccessibility", String.class, String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        method.invoke(clvmStorageAdaptor, volumeUuid, lvPath, mockPool);
+    }
+
+    @Test
+    public void testCreateVirtualClvmPool_MethodExists() throws Exception {
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createVirtualClvmPool",
+            String.class, String.class, String.class,
+            Storage.StoragePoolType.class, Map.class);
+        method.setAccessible(true);
+
+        assertNotNull("createVirtualClvmPool method should exist", method);
+    }
+
+    @Test
+    public void testFindDeviceNodeAfterActivation_MethodExists() throws Exception {
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "findDeviceNodeAfterActivation",
+            String.class, String.class, String.class);
+        method.setAccessible(true);
+
+        assertNotNull("findDeviceNodeAfterActivation method should exist", method);
+    }
+
+    @Test
+    public void testHandleMissingDeviceNode_MethodExists() throws Exception {
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "handleMissingDeviceNode",
+            String.class, String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        assertNotNull("handleMissingDeviceNode method should exist", method);
+    }
+
+    @Test
+    public void testHandleMissingDeviceNode_NonTemplate_MethodExists() throws Exception {
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "handleMissingDeviceNode",
+            String.class, String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        assertNotNull("handleMissingDeviceNode method should exist", method);
+    }
+
+    @Test
+    public void testFindAccessibleDeviceNode_MethodExists() throws Exception {
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "findAccessibleDeviceNode",
+            String.class, String.class, KVMStoragePool.class);
+        method.setAccessible(true);
+
+        assertNotNull("findAccessibleDeviceNode method should exist", method);
+    }
+
+    @Test
+    public void testCLVMNGDiskFormat_IsQCOW2() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        PhysicalDiskFormat format = (mockPool.getType() == Storage.StoragePoolType.CLVM_NG)
+            ? PhysicalDiskFormat.QCOW2
+            : PhysicalDiskFormat.RAW;
+
+        assertEquals("CLVM_NG should use QCOW2 format", PhysicalDiskFormat.QCOW2, format);
+    }
+
+    @Test
+    public void testCLVMDiskFormat_IsRAW() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        PhysicalDiskFormat format = (mockPool.getType() == Storage.StoragePoolType.CLVM_NG)
+            ? PhysicalDiskFormat.QCOW2
+            : PhysicalDiskFormat.RAW;
+
+        assertEquals("CLVM should use RAW format", PhysicalDiskFormat.RAW, format);
+    }
+
+    @Test
+    public void testCLVMPoolDetails_DefaultSecureZeroFill() {
+        Map<String, String> details = new HashMap<>();
+
+        String value = details.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL);
+
+        assert value == null : "CLVM_SECURE_ZERO_FILL should default to null";
+    }
+
+    @Test
+    public void testCLVMPoolDetails_CustomSecureZeroFill() {
+        Map<String, String> details = new HashMap<>();
+        details.put(KVMStoragePool.CLVM_SECURE_ZERO_FILL, "true");
+
+        String value = details.get(KVMStoragePool.CLVM_SECURE_ZERO_FILL);
+
+        assertEquals("CLVM_SECURE_ZERO_FILL should be 'true'", "true", value);
+    }
+
+    @Test
+    public void testCLVMVolumeDeviceMapperPathEscaping() {
+        String vgName = "acsvg-ng";
+        String volumeUuid = "ea19580e-0882-4ab8-973b-a320637037f4";
+
+        String vgNameEscaped = vgName.replace("-", "--");
+        String volumeUuidEscaped = volumeUuid.replace("-", "--");
+        String mapperPath = "/dev/mapper/" + vgNameEscaped + "-" + volumeUuidEscaped;
+
+        String expectedPath = "/dev/mapper/acsvg--ng-ea19580e--0882--4ab8--973b--a320637037f4";
+        assertEquals("Mapper path should have escaped hyphens", expectedPath, mapperPath);
+    }
+
+    @Test
+    public void testCLVMTemplateNamePrefix() {
+        String templateUuid = UUID.randomUUID().toString();
+        String templateName = "template-" + templateUuid;
+
+        assert templateName.startsWith("template-");
+        assert templateName.length() > 9;
+    }
+
+    @Test
+    public void testCLVMPoolTypeIsNotFileSystem() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        boolean isFileSystem = mockPool.getType() == Storage.StoragePoolType.Filesystem;
+
+        assert !isFileSystem : "CLVM is not a file system pool type";
+    }
+
+    @Test
+    public void testCLVMNGPoolTypeIsNotFileSystem() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        boolean isFileSystem = mockPool.getType() == Storage.StoragePoolType.Filesystem;
+
+        assert !isFileSystem : "CLVM_NG is not a file system pool type";
+    }
+
+    @Test
+    public void testCLVMPoolTypeIsNotNFS() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        boolean isNFS = mockPool.getType() == Storage.StoragePoolType.NetworkFilesystem;
+
+        assert !isNFS : "CLVM is not an NFS pool type";
+    }
+
+    @Test
+    public void testCLVMNGPoolTypeIsNotRBD() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        boolean isRBD = mockPool.getType() == Storage.StoragePoolType.RBD;
+
+        assert !isRBD : "CLVM_NG is not an RBD pool type";
+    }
+
+    @Test
+    public void testCLVMVolumeUUIDFormat() {
+        String volumeUuid = UUID.randomUUID().toString();
+
+        assert volumeUuid.matches("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
+    }
+
+    @Test
+    public void testCLVMNGBackingFileFormat() {
+        String vgName = "testvg";
+        String templateUuid = UUID.randomUUID().toString();
+        String backingFile = "/dev/" + vgName + "/template-" + templateUuid;
+
+        assert backingFile.startsWith("/dev/");
+        assert backingFile.contains("template-");
+        assert backingFile.contains(templateUuid);
+    }
+
+    @Test
+    public void testCLVMPoolLocalPathValidation() {
+        String vgName = "acsvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        String localPath = mockPool.getLocalPath();
+
+        assertNotNull("Local path should not be null", localPath);
+        assert !localPath.isEmpty() : "Local path should not be empty";
+    }
+
+    @Test
+    public void testCreateClvmNgDiskWithBacking_NonPeAlignedSizeIsRoundedUp() throws Exception {
+        String volumeUuid = UUID.randomUUID().toString();
+        int timeout = 30000;
+        // 50 MiB is not a multiple of the default 4 MiB PE, so lvcreate on a CLVM
+        // destination would round it up to 52 MiB.  The QCOW2 must be created with
+        // the same 52 MiB so libvirt does not abort migration with "different sizes".
+        long nonAlignedVirtualSize = 52428800L;   // 50 MiB
+        long peAlignedVirtualSize  = 54525952L;   // 52 MiB = 13 × 4 MiB (default PE)
+        String vgName = "testvg";
+
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        List<String> qemuImgAddArgs = new ArrayList<>();
+
+        mockScriptConstruction = Mockito.mockConstruction(Script.class,
+            (mock, context) -> {
+                when(mock.execute()).thenReturn(null);
+                if (!context.arguments().isEmpty() && "qemu-img".equals(context.arguments().get(0))) {
+                    doAnswer(inv -> { qemuImgAddArgs.add(inv.getArgument(0)); return null; })
+                        .when(mock).add(anyString());
+                }
+            });
+
+        Method method = ClvmStorageAdaptor.class.getDeclaredMethod(
+            "createClvmNgDiskWithBacking",
+            String.class, int.class, long.class, String.class,
+            KVMStoragePool.class, Storage.ProvisioningType.class);
+        method.setAccessible(true);
+
+        method.invoke(clvmStorageAdaptor, volumeUuid, timeout, nonAlignedVirtualSize, null,
+            mockPool, Storage.ProvisioningType.THIN);
+
+        assertTrue("qemu-img create must use PE-aligned virtual size to match CLVM destination LV",
+            qemuImgAddArgs.contains(String.valueOf(peAlignedVirtualSize)));
+        assertFalse("qemu-img create must not use non-PE-aligned virtual size",
+            qemuImgAddArgs.contains(String.valueOf(nonAlignedVirtualSize)));
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
index cc1e38a908b..0a58dfc79b0 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
@@ -22,6 +22,7 @@ import com.cloud.exception.InternalErrorException;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
 import com.cloud.hypervisor.kvm.resource.LibvirtDomainXMLParser;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
+import com.cloud.storage.Storage;
 import com.cloud.storage.template.TemplateConstants;
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -53,6 +54,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import javax.naming.ConfigurationException;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -499,4 +501,169 @@ public class KVMStorageProcessorTest {
 
         Assert.assertEquals("vda", result);
     }
+
+    @Test
+    public void testParseClvmSnapshotPath_ValidPath() {
+        String snapshotPath = "/dev/vg-storage/volume-uuid-123/snapshot-uuid-456";
+        Storage.StoragePoolType poolType = Storage.StoragePoolType.CLVM_NG;
+
+        try {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "parseClvmSnapshotPath", String.class, Storage.StoragePoolType.class);
+            method.setAccessible(true);
+            String[] result = (String[]) method.invoke(storageProcessorSpy, snapshotPath, poolType);
+
+            Assert.assertNotNull("Should return parsed array for valid path", result);
+            Assert.assertEquals("Should return 4 elements", 4, result.length);
+            Assert.assertEquals("VG name should be vg-storage", "vg-storage", result[0]);
+            Assert.assertEquals("Volume UUID should be volume-uuid-123", "volume-uuid-123", result[1]);
+            Assert.assertEquals("Snapshot UUID should be snapshot-uuid-456", "snapshot-uuid-456", result[2]);
+            Assert.assertNotNull("MD5 hash should be computed", result[3]);
+        } catch (Exception e) {
+            Assert.fail("Failed to test parseClvmSnapshotPath: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testParseClvmSnapshotPath_InvalidPathFormat() {
+        String snapshotPath = "/dev/vg-storage/invalid";
+        Storage.StoragePoolType poolType = Storage.StoragePoolType.CLVM;
+
+        try {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "parseClvmSnapshotPath", String.class, Storage.StoragePoolType.class);
+            method.setAccessible(true);
+            String[] result = (String[]) method.invoke(storageProcessorSpy, snapshotPath, poolType);
+
+            Assert.assertNull("Should return null for invalid path format", result);
+        } catch (Exception e) {
+            Assert.fail("Failed to test parseClvmSnapshotPath: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testDeleteClvmSnapshot_SuccessfulDeletion() {
+        String snapshotPath = "/dev/vg-storage/volume-uuid/snapshot-uuid";
+        Storage.StoragePoolType poolType = Storage.StoragePoolType.CLVM_NG;
+
+        try (MockedConstruction<Script> scriptConstruction = Mockito.mockConstruction(Script.class, (mock, context) -> {
+            Mockito.when(mock.execute()).thenReturn(null);
+        })) {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "deleteClvmSnapshot", String.class, Storage.StoragePoolType.class, boolean.class);
+            method.setAccessible(true);
+            boolean result = (boolean) method.invoke(storageProcessorSpy, snapshotPath, poolType, true);
+
+            Assert.assertTrue("Should return true for successful deletion", result);
+        } catch (Exception e) {
+            Assert.fail("Failed to test deleteClvmSnapshot: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testDeleteClvmSnapshot_SnapshotAlreadyDeleted() {
+        String snapshotPath = "/dev/vg-storage/volume-uuid/snapshot-uuid";
+        Storage.StoragePoolType poolType = Storage.StoragePoolType.CLVM;
+
+        try (MockedConstruction<Script> scriptConstruction = Mockito.mockConstruction(Script.class, (mock, context) -> {
+            Mockito.when(mock.execute()).thenReturn("Error: snapshot does not exist");
+        })) {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "deleteClvmSnapshot", String.class, Storage.StoragePoolType.class, boolean.class);
+            method.setAccessible(true);
+            boolean result = (boolean) method.invoke(storageProcessorSpy, snapshotPath, poolType, true);
+
+            Assert.assertTrue("Should return true when snapshot already deleted", result);
+        } catch (Exception e) {
+            Assert.fail("Failed to test deleteClvmSnapshot: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testDeleteClvmSnapshot_DeletionFailedWithoutCheck() {
+        String snapshotPath = "/dev/vg-storage/volume-uuid/snapshot-uuid";
+        Storage.StoragePoolType poolType = Storage.StoragePoolType.CLVM_NG;
+
+        try (MockedConstruction<Script> scriptConstruction = Mockito.mockConstruction(Script.class, (mock, context) -> {
+            Mockito.when(mock.execute()).thenReturn("Error: some other error");
+        })) {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "deleteClvmSnapshot", String.class, Storage.StoragePoolType.class, boolean.class);
+            method.setAccessible(true);
+            boolean result = (boolean) method.invoke(storageProcessorSpy, snapshotPath, poolType, false);
+
+            Assert.assertFalse("Should return false when deletion fails", result);
+        } catch (Exception e) {
+            Assert.fail("Failed to test deleteClvmSnapshot: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testDeleteClvmSnapshot_InvalidPath() {
+        String snapshotPath = "/invalid/path";
+        Storage.StoragePoolType poolType = Storage.StoragePoolType.CLVM;
+
+        try {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "deleteClvmSnapshot", String.class, Storage.StoragePoolType.class, boolean.class);
+            method.setAccessible(true);
+            boolean result = (boolean) method.invoke(storageProcessorSpy, snapshotPath, poolType, true);
+
+            Assert.assertFalse("Should return false for invalid path", result);
+        } catch (Exception e) {
+            Assert.fail("Failed to test deleteClvmSnapshot: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testComputeMd5Hash_ValidInput() {
+        String input = "snapshot-uuid-123";
+
+        try {
+            Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "computeMd5Hash", String.class);
+            method.setAccessible(true);
+            String result = (String) method.invoke(storageProcessorSpy, input);
+
+            Assert.assertNotNull("Should return non-null hash", result);
+            Assert.assertEquals("Hash should be 32 characters long (MD5)", 32, result.length());
+            Assert.assertTrue("Hash should contain only hex characters", result.matches("[0-9a-f]+"));
+        } catch (Exception e) {
+            Assert.fail("Failed to test computeMd5Hash: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testComputeMd5Hash_EmptyInput() {
+        String input = "";
+
+        try {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "computeMd5Hash", String.class);
+            method.setAccessible(true);
+            String result = (String) method.invoke(storageProcessorSpy, input);
+
+            Assert.assertNotNull("Should return non-null hash even for empty input", result);
+            Assert.assertEquals("Hash should be 32 characters long (MD5)", 32, result.length());
+        } catch (Exception e) {
+            Assert.fail("Failed to test computeMd5Hash: " + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testComputeMd5Hash_ConsistentResults() {
+        String input = "snapshot-uuid-456";
+
+        try {
+            java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
+                    "computeMd5Hash", String.class);
+            method.setAccessible(true);
+            String result1 = (String) method.invoke(storageProcessorSpy, input);
+            String result2 = (String) method.invoke(storageProcessorSpy, input);
+
+            Assert.assertEquals("Same input should produce same hash", result1, result2);
+        } catch (Exception e) {
+            Assert.fail("Failed to test computeMd5Hash: " + e.getMessage());
+        }
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptorTest.java
index 88346abd017..9b8e1fd2d74 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptorTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptorTest.java
@@ -33,6 +33,7 @@ import org.junit.runner.RunWith;
 import org.libvirt.Connect;
 import org.libvirt.StoragePool;
 import org.mockito.Mock;
+import org.mockito.MockedConstruction;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -58,6 +59,9 @@ public class LibvirtStorageAdaptorTest {
 
     MockedStatic<Script> mockScript;
 
+    // For mocking Script constructor
+    private MockedConstruction<Script> mockScriptConstruction;
+
     @Spy
     static LibvirtStorageAdaptor libvirtStorageAdaptor = new LibvirtStorageAdaptor(null);
 
@@ -73,6 +77,9 @@ public class LibvirtStorageAdaptorTest {
     public void tearDown() throws Exception {
         libvirtConnectionMockedStatic.close();
         mockScript.close();
+        if (mockScriptConstruction != null) {
+            mockScriptConstruction.close();
+        }
         closeable.close();
     }
 
@@ -176,4 +183,168 @@ public class LibvirtStorageAdaptorTest {
 
         Mockito.verify(mockPool, never()).setUsedIops(anyLong());
     }
+
+    @Test
+    public void testGetVolumeFromCLVMPool_ReturnsNullForNonCLVMPool() {
+        Storage.StoragePoolType type = Storage.StoragePoolType.NetworkFilesystem;
+
+        assert type != Storage.StoragePoolType.CLVM;
+        assert type != Storage.StoragePoolType.CLVM_NG;
+    }
+
+    @Test
+    public void testCLVMPoolTypeDetection_CLVM() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        Storage.StoragePoolType type = mockPool.getType();
+
+        assert type == Storage.StoragePoolType.CLVM;
+        assert type != Storage.StoragePoolType.CLVM_NG;
+    }
+
+    @Test
+    public void testCLVMPoolTypeDetection_CLVM_NG() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        Storage.StoragePoolType type = mockPool.getType();
+
+        assert type == Storage.StoragePoolType.CLVM_NG;
+        assert type != Storage.StoragePoolType.CLVM;
+    }
+
+    @Test
+    public void testCLVMPoolLocalPathFormat() {
+        String vgName = "acsvg";
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        String localPath = mockPool.getLocalPath();
+
+        assert localPath.equals(vgName);
+        assert !localPath.startsWith("/");
+    }
+
+    @Test
+    public void testCLVMNGPoolLocalPathFormat() {
+        String vgName = "acsvg";
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        String localPath = mockPool.getLocalPath();
+
+        assert localPath.equals(vgName);
+        assert !localPath.startsWith("/");
+    }
+
+    @Test
+    public void testCLVMVolumePathFormat() {
+        String vgName = "acsvg";
+        String volumeUuid = UUID.randomUUID().toString();
+        String expectedPath = "/dev/" + vgName + "/" + volumeUuid;
+
+        assert expectedPath.startsWith("/dev/");
+        assert expectedPath.contains(vgName);
+        assert expectedPath.endsWith(volumeUuid);
+    }
+
+    @Test
+    public void testCLVMNGVolumePathFormat() {
+        String vgName = "acsvg";
+        String volumeUuid = UUID.randomUUID().toString();
+        String expectedPath = "/dev/" + vgName + "/" + volumeUuid;
+
+        assert expectedPath.startsWith("/dev/");
+        assert expectedPath.contains(vgName);
+        assert expectedPath.endsWith(volumeUuid);
+    }
+
+    @Test
+    public void testCLVMTemplateVolumeNamingConvention() {
+        String templateUuid = "550e8400-e29b-41d4-a716-446655440000";
+        String expectedLvName = "template-" + templateUuid;
+
+        assert expectedLvName.startsWith("template-");
+        assert expectedLvName.contains(templateUuid);
+        assert expectedLvName.equals("template-550e8400-e29b-41d4-a716-446655440000");
+    }
+
+    @Test
+    public void testCLVMTemplatePathFormat() {
+        // CLVM_NG template paths: /dev/vgname/template-{uuid}
+        String vgName = "acsvg";
+        String templateUuid = "550e8400-e29b-41d4-a716-446655440000";
+        String expectedPath = "/dev/" + vgName + "/template-" + templateUuid;
+
+        assert expectedPath.equals("/dev/acsvg/template-550e8400-e29b-41d4-a716-446655440000");
+        assert expectedPath.startsWith("/dev/");
+        assert expectedPath.contains("template-");
+    }
+
+    @Test
+    public void testCLVMPoolIsBlockDeviceStorage() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        Storage.StoragePoolType type = mockPool.getType();
+
+        boolean isBlockBased = (type == Storage.StoragePoolType.CLVM ||
+                               type == Storage.StoragePoolType.CLVM_NG);
+        assert isBlockBased;
+    }
+
+    @Test
+    public void testCLVMNGPoolIsBlockDeviceStorage() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+
+        Storage.StoragePoolType type = mockPool.getType();
+
+        boolean isBlockBased = (type == Storage.StoragePoolType.CLVM ||
+                               type == Storage.StoragePoolType.CLVM_NG);
+        assert isBlockBased;
+    }
+
+    @Test
+    public void testCLVMPoolSupportsSharedStorage() {
+        Mockito.when(mockPool.getType()).thenReturn(Storage.StoragePoolType.CLVM);
+
+        Storage.StoragePoolType type = mockPool.getType();
+        boolean supportsShared = (type == Storage.StoragePoolType.CLVM ||
+                                 type == Storage.StoragePoolType.CLVM_NG);
+        assert supportsShared;
+    }
+
+    @Test
+    public void testVolumeGroupNameExtraction() {
+        String vgName = "acsvg";
+        Mockito.when(mockPool.getLocalPath()).thenReturn(vgName);
+
+        String extractedVgName = mockPool.getLocalPath();
+
+        assert extractedVgName.equals("acsvg");
+        assert extractedVgName.matches("[a-zA-Z0-9_-]+");
+    }
+
+    @Test
+    public void testCLVMPoolDetailsContainSecureZeroFill() {
+        Map<String, String> details = new HashMap<>();
+        details.put("CLVM_SECURE_ZERO_FILL", "true");
+
+        boolean secureZeroEnabled = "true".equals(details.get("CLVM_SECURE_ZERO_FILL"));
+        assert secureZeroEnabled;
+    }
+
+    @Test
+    public void testCLVMPoolDetailsSecureZeroFillDisabled() {
+        Map<String, String> details = new HashMap<>();
+        details.put("CLVM_SECURE_ZERO_FILL", "false");
+
+        boolean secureZeroEnabled = "true".equals(details.get("CLVM_SECURE_ZERO_FILL"));
+        assert !secureZeroEnabled;
+    }
+
+    @Test
+    public void testCLVMPoolDetailsSecureZeroFillDefault() {
+        Map<String, String> details = new HashMap<>();
+
+        boolean secureZeroEnabled = "true".equals(details.get("CLVM_SECURE_ZERO_FILL"));
+        assert !secureZeroEnabled;
+    }
+
 }
diff --git a/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
index 6a7f1d58043..9174aaa3869 100644
--- a/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
+++ b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
@@ -90,6 +90,13 @@ import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.VMInstanceDao;
 
+import com.cloud.agent.AgentManager;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.storage.clvm.ClvmPoolManager;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+
 public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver {
     @Override
     public Map<String, String> getCapabilities() {
@@ -133,6 +140,12 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
     @Inject
     private VolumeOrchestrationService volumeOrchestrationService;
 
+    @Inject
+    private ClvmPoolManager clvmPoolManager;
+
+    @Inject
+    private AgentManager agentMgr;
+
     @Override
     public DataTO getTO(DataObject data) {
         return null;
@@ -423,12 +436,19 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
         CommandResult result = new CommandResult();
         try {
             EndPoint ep = null;
-            if (snapshotOnPrimaryStore != null) {
-                ep = epSelector.select(snapshotOnPrimaryStore);
-            } else {
-                VolumeInfo volumeInfo = volFactory.getVolume(snapshot.getVolumeId(), DataStoreRole.Primary);
+            VolumeInfo volumeInfo = volFactory.getVolume(snapshot.getVolumeId(), DataStoreRole.Primary);
+
+            StoragePoolVO storagePool = primaryStoreDao.findById(volumeInfo.getPoolId());
+            if (storagePool != null && storagePool.getPoolType() == StoragePoolType.CLVM) {
                 ep = epSelector.select(volumeInfo);
+            } else {
+                if (snapshotOnPrimaryStore != null) {
+                    ep = epSelector.select(snapshotOnPrimaryStore);
+                } else {
+                    ep = epSelector.select(volumeInfo);
+                }
             }
+
             if ( ep == null ){
                 String errMsg = "No remote endpoint to send RevertSnapshotCommand, check if host or ssvm is down?";
                 logger.error(errMsg);
@@ -456,6 +476,29 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
 
         CreateCmdResult result = new CreateCmdResult(null, null);
 
+        if (ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            VirtualMachine attachedVm = vol.getAttachedVM();
+            boolean vmIsRunning = attachedVm != null && attachedVm.getHostId() != null;
+            if (!vmIsRunning) {
+                Long lockHostId = clvmPoolManager.getClvmLockHostId(vol.getId(), vol.getUuid(),
+                        vol.getPath(), pool, true);
+                if (lockHostId != null) {
+                    HostVO lockHost = hostDao.findById(lockHostId);
+                    if (lockHost != null && lockHost.getStatus() == Status.Up) {
+                        logger.debug("CLVM resize: routing to lock-holding host {} for volume {}",
+                                lockHostId, vol.getUuid());
+                        endpointsToRunResize = new long[]{lockHostId};
+                    } else {
+                        logger.warn("CLVM resize: lock host {} for volume {} is down or missing, " +
+                                "keeping caller-provided hosts", lockHostId, vol.getUuid());
+                    }
+                } else {
+                    logger.warn("CLVM resize: no lock holder found for volume {}, " +
+                            "keeping caller-provided hosts or epSelector", vol.getUuid());
+                }
+            }
+        }
+
         // if hosts are provided, they are where the VM last ran. We can use that.
         if (endpointsToRunResize == null || endpointsToRunResize.length == 0) {
             EndPoint ep = epSelector.select(data, encryptionRequired);
@@ -474,7 +517,21 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
             resizeCmd.setContextParam(DiskTO.PROTOCOL_TYPE, Storage.StoragePoolType.DatastoreCluster.toString());
         }
         try {
-            ResizeVolumeAnswer answer = (ResizeVolumeAnswer) storageMgr.sendToPool(pool, endpointsToRunResize, resizeCmd);
+            ResizeVolumeAnswer answer;
+            if (ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+                // For CLVM, send only to the determined host, without falling through to other hosts
+                try {
+                    answer = (ResizeVolumeAnswer) agentMgr.send(endpointsToRunResize[0], resizeCmd);
+                } catch (AgentUnavailableException | OperationTimedoutException e) {
+                    logger.error("CLVM resize failed to reach host {} for volume {}: {}",
+                            endpointsToRunResize[0], vol.getUuid(), e.getMessage());
+                    result.setResult(e.getMessage());
+                    callback.complete(result);
+                    return;
+                }
+            } else {
+                answer = (ResizeVolumeAnswer) storageMgr.sendToPool(pool, endpointsToRunResize, resizeCmd);
+            }
             if (answer != null && answer.getResult()) {
                 long finalSize = answer.getNewSize();
                 logger.debug("Resize: volume started at size: " + toHumanReadableSize(vol.getSize()) + " and ended at size: " + toHumanReadableSize(finalSize));
diff --git a/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
index e4eb10f51fb..cad6341d2b8 100644
--- a/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
+++ b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
@@ -233,6 +233,11 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl extends BasePrimaryDataStor
             parameters.setHost(storageHost);
             parameters.setPort(0);
             parameters.setPath(hostPath.replaceFirst("/", ""));
+        } else if (scheme.equalsIgnoreCase("clvm_ng")) {
+            parameters.setType(StoragePoolType.CLVM_NG);
+            parameters.setHost(storageHost);
+            parameters.setPort(0);
+            parameters.setPath(hostPath.replaceFirst("/", ""));
         } else if (scheme.equalsIgnoreCase("rbd")) {
             if (port == -1) {
                 port = 0;
@@ -329,7 +334,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl extends BasePrimaryDataStor
 
         if (existingUuid != null) {
             uuid = (String)existingUuid;
-        } else if (scheme.equalsIgnoreCase("sharedmountpoint") || scheme.equalsIgnoreCase("clvm")) {
+        } else if (scheme.equalsIgnoreCase("sharedmountpoint")) {
             uuid = UUID.randomUUID().toString();
         } else if ("PreSetup".equalsIgnoreCase(scheme) && !HypervisorType.VMware.equals(hypervisorType)) {
             uuid = hostPath.replace("/", "");
diff --git a/plugins/storage/volume/default/src/test/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImplTest.java b/plugins/storage/volume/default/src/test/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImplTest.java
new file mode 100644
index 00000000000..52c56456a52
--- /dev/null
+++ b/plugins/storage/volume/default/src/test/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImplTest.java
@@ -0,0 +1,286 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.storage.datastore.driver;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
+
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
+import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
+import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
+import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
+import org.apache.cloudstack.storage.volume.VolumeObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.storage.ResizeVolumeAnswer;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.storage.ResizeVolumePayload;
+import com.cloud.storage.Storage;
+import com.cloud.storage.StorageManager;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.clvm.ClvmPoolManager;
+import com.cloud.vm.VirtualMachine;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CloudStackPrimaryDataStoreDriverImplTest {
+
+    @InjectMocks
+    private CloudStackPrimaryDataStoreDriverImpl driver;
+
+    @Mock
+    private ClvmPoolManager clvmPoolManager;
+    @Mock
+    private AgentManager agentMgr;
+    @Mock
+    private HostDao hostDao;
+    @Mock
+    private EndPointSelector epSelector;
+    @Mock
+    private StorageManager storageMgr;
+
+    @Mock
+    private VolumeObject vol;
+    private StoragePool pool;
+    @Mock
+    private HostVO lockHost;
+    @Mock
+    private AsyncCompletionCallback<CreateCmdResult> callback;
+
+    private static final long LOCK_HOST_ID = 42L;
+    private static final long OTHER_HOST_ID = 99L;
+    private static final String VOLUME_UUID = "test-vol-uuid";
+    private static final String VOLUME_PATH = "vm-1-disk-0";
+
+    @Before
+    public void setUp() {
+        pool = Mockito.mock(StoragePool.class, withSettings().extraInterfaces(DataStore.class));
+
+        when(vol.getUuid()).thenReturn(VOLUME_UUID);
+        when(vol.getId()).thenReturn(1L);
+        when(vol.getPath()).thenReturn(VOLUME_PATH);
+        when(vol.getSize()).thenReturn(10L * 1024 * 1024 * 1024);
+
+        when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+        when(pool.getParent()).thenReturn(0L);
+        when(pool.getPath()).thenReturn("/vg-test");
+
+        when(vol.getDataStore()).thenReturn((DataStore) pool);
+
+        when(hostDao.findById(LOCK_HOST_ID)).thenReturn(lockHost);
+        when(lockHost.getStatus()).thenReturn(Status.Up);
+    }
+
+    private ResizeVolumeAnswer mockSuccessAnswer(long newSize) throws Exception {
+        ResizeVolumeAnswer answer = Mockito.mock(ResizeVolumeAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+        when(answer.getNewSize()).thenReturn(newSize);
+        return answer;
+    }
+
+    private void stubAgentSend(long hostId, Answer answer) throws Exception {
+        Mockito.doReturn(answer).when(agentMgr).send(eq(hostId), any(Command.class));
+    }
+
+    private void verifyAgentSend(long hostId) throws Exception {
+        verify(agentMgr).send(eq(hostId), any(Command.class));
+    }
+
+    private void verifyAgentSendNever(long hostId) throws Exception {
+        verify(agentMgr, never()).send(eq(hostId), any(Command.class));
+    }
+
+    private ResizeVolumePayload makePayload(long[] hosts) {
+        ResizeVolumePayload p = new ResizeVolumePayload(
+                20L * 1024 * 1024 * 1024, null, null, null, false, "test-vm", hosts, false);
+        when(vol.getpayload()).thenReturn(p);
+        return p;
+    }
+
+    @Test
+    public void testResize_clvmNg_vmRunning_usesCallerHost() throws Exception {
+        VirtualMachine runningVm = Mockito.mock(VirtualMachine.class);
+        when(runningVm.getHostId()).thenReturn(OTHER_HOST_ID);
+        when(vol.getAttachedVM()).thenReturn(runningVm);
+        makePayload(new long[]{OTHER_HOST_ID});
+
+        stubAgentSend(OTHER_HOST_ID, mockSuccessAnswer(20L * 1024 * 1024 * 1024));
+
+        driver.resize(vol, callback);
+
+        verify(clvmPoolManager, never()).getClvmLockHostId(anyLong(), anyString(), anyString(), any(), anyBoolean());
+        verifyAgentSend(OTHER_HOST_ID);
+    }
+
+    @Test
+    public void testResize_clvmNg_vmStopped_routesToLockHost() throws Exception {
+        VirtualMachine stoppedVm = Mockito.mock(VirtualMachine.class);
+        when(stoppedVm.getHostId()).thenReturn(null);
+        when(vol.getAttachedVM()).thenReturn(stoppedVm);
+        makePayload(new long[]{OTHER_HOST_ID}); // stale lastHostId from caller
+
+        when(clvmPoolManager.getClvmLockHostId(anyLong(), anyString(), anyString(), any(), eq(true)))
+                .thenReturn(LOCK_HOST_ID);
+        stubAgentSend(LOCK_HOST_ID, mockSuccessAnswer(20L * 1024 * 1024 * 1024));
+
+        driver.resize(vol, callback);
+
+        // Must override stale lastHostId with actual lock host
+        verifyAgentSend(LOCK_HOST_ID);
+        verifyAgentSendNever(OTHER_HOST_ID);
+    }
+
+    @Test
+    public void testResize_clvmNg_vmStopped_lockHostDown_keepsCallerHosts() throws Exception {
+        VirtualMachine stoppedVm = Mockito.mock(VirtualMachine.class);
+        when(stoppedVm.getHostId()).thenReturn(null);
+        when(vol.getAttachedVM()).thenReturn(stoppedVm);
+        makePayload(new long[]{OTHER_HOST_ID});
+
+        when(clvmPoolManager.getClvmLockHostId(anyLong(), anyString(), anyString(), any(), eq(true)))
+                .thenReturn(LOCK_HOST_ID);
+        when(lockHost.getStatus()).thenReturn(Status.Disconnected);
+        stubAgentSend(OTHER_HOST_ID, mockSuccessAnswer(20L * 1024 * 1024 * 1024));
+
+        driver.resize(vol, callback);
+
+        verifyAgentSend(OTHER_HOST_ID);
+    }
+
+    @Test
+    public void testResize_clvmNg_detached_routesToLockHost() throws Exception {
+        when(vol.getAttachedVM()).thenReturn(null);
+        makePayload(null); // no hosts from caller
+
+        when(clvmPoolManager.getClvmLockHostId(anyLong(), anyString(), anyString(), any(), eq(true)))
+                .thenReturn(LOCK_HOST_ID);
+        stubAgentSend(LOCK_HOST_ID, mockSuccessAnswer(20L * 1024 * 1024 * 1024));
+
+        driver.resize(vol, callback);
+
+        verifyAgentSend(LOCK_HOST_ID);
+    }
+
+    @Test
+    public void testResize_clvmNg_detached_noLockHolder_fallsToEpSelector() throws Exception {
+        when(vol.getAttachedVM()).thenReturn(null);
+        makePayload(null);
+
+        when(clvmPoolManager.getClvmLockHostId(anyLong(), anyString(), anyString(), any(), eq(true)))
+                .thenReturn(null); // no lock holder found
+
+        EndPoint ep = Mockito.mock(EndPoint.class);
+        when(ep.getId()).thenReturn(LOCK_HOST_ID);
+        when(epSelector.select(any(), anyBoolean())).thenReturn(ep);
+        stubAgentSend(LOCK_HOST_ID, mockSuccessAnswer(20L * 1024 * 1024 * 1024));
+
+        driver.resize(vol, callback);
+
+        verify(epSelector).select(any(), anyBoolean());
+        verifyAgentSend(LOCK_HOST_ID);
+    }
+
+    @Test
+    public void testResize_clvmNg_agentUnavailable_failsFast() throws Exception {
+        VirtualMachine runningVm = Mockito.mock(VirtualMachine.class);
+        when(runningVm.getHostId()).thenReturn(OTHER_HOST_ID);
+        when(vol.getAttachedVM()).thenReturn(runningVm);
+        makePayload(new long[]{OTHER_HOST_ID});
+
+        Mockito.doThrow(new AgentUnavailableException("host down", OTHER_HOST_ID))
+                .when(agentMgr).send(eq(OTHER_HOST_ID), any(Command.class));
+
+        driver.resize(vol, callback);
+
+        verify(callback).complete(any());
+        verify(storageMgr, never()).sendToPool(any(StoragePool.class), any(long[].class), any());
+    }
+
+    @Test
+    public void testResize_clvmNg_operationTimedOut_failsFast() throws Exception {
+        VirtualMachine runningVm = Mockito.mock(VirtualMachine.class);
+        when(runningVm.getHostId()).thenReturn(OTHER_HOST_ID);
+        when(vol.getAttachedVM()).thenReturn(runningVm);
+        makePayload(new long[]{OTHER_HOST_ID});
+
+        Mockito.doThrow(new OperationTimedoutException(null, OTHER_HOST_ID, 0, 0, false))
+                .when(agentMgr).send(eq(OTHER_HOST_ID), any(Command.class));
+
+        driver.resize(vol, callback);
+
+        verify(callback).complete(any());
+        verify(storageMgr, never()).sendToPool(any(StoragePool.class), any(long[].class), any());
+    }
+
+    @Test
+    public void testResize_nonClvm_usesSendToPool() throws Exception {
+        when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+        makePayload(null);
+
+        EndPoint ep = Mockito.mock(EndPoint.class);
+        when(ep.getId()).thenReturn(OTHER_HOST_ID);
+        when(epSelector.select(any(), anyBoolean())).thenReturn(ep);
+
+        ResizeVolumeAnswer answer = mockSuccessAnswer(20L * 1024 * 1024 * 1024);
+        when(storageMgr.sendToPool(any(StoragePool.class), any(long[].class), any())).thenReturn(answer);
+
+        driver.resize(vol, callback);
+
+        verify(storageMgr).sendToPool(any(StoragePool.class), any(long[].class), any());
+        verify(agentMgr, never()).send(anyLong(), any(Command.class));
+        verify(clvmPoolManager, never()).getClvmLockHostId(anyLong(), anyString(), anyString(), any(), anyBoolean());
+    }
+
+    @Test
+    public void testResize_clvmLegacy_vmStopped_routesToLockHost() throws Exception {
+        when(pool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        VirtualMachine stoppedVm = Mockito.mock(VirtualMachine.class);
+        when(stoppedVm.getHostId()).thenReturn(null);
+        when(vol.getAttachedVM()).thenReturn(stoppedVm);
+        makePayload(new long[]{OTHER_HOST_ID});
+
+        when(clvmPoolManager.getClvmLockHostId(anyLong(), anyString(), anyString(), any(), eq(true)))
+                .thenReturn(LOCK_HOST_ID);
+        stubAgentSend(LOCK_HOST_ID, mockSuccessAnswer(20L * 1024 * 1024 * 1024));
+
+        driver.resize(vol, callback);
+
+        verifyAgentSend(LOCK_HOST_ID);
+        verifyAgentSendNever(OTHER_HOST_ID);
+    }
+}
diff --git a/plugins/user-authenticators/oauth2/pom.xml b/plugins/user-authenticators/oauth2/pom.xml
index 6ab7b9f5fab..89694440591 100644
--- a/plugins/user-authenticators/oauth2/pom.xml
+++ b/plugins/user-authenticators/oauth2/pom.xml
@@ -38,6 +38,11 @@
             <artifactId>cloud-framework-config</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-security-jose</artifactId>
+            <version>${cs.cxf.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.google.apis</groupId>
             <artifactId>google-api-services-docs</artifactId>
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java
index b65027d6a24..b1bb8292f24 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/OAuth2AuthManagerImpl.java
@@ -18,10 +18,14 @@
 //
 package org.apache.cloudstack.oauth2;
 
-import com.cloud.user.dao.UserDao;
-import com.cloud.utils.component.Manager;
-import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.exception.CloudRuntimeException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
 import org.apache.cloudstack.auth.UserOAuth2Authenticator;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
@@ -35,16 +39,11 @@ import org.apache.cloudstack.oauth2.dao.OauthProviderDao;
 import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.cloud.utils.component.Manager;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.exception.CloudRuntimeException;
 
 public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthManager, Manager, Configurable {
-    @Inject
-    private UserDao _userDao;
 
     @Inject
     protected OauthProviderDao _oauthProviderDao;
@@ -55,7 +54,7 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
 
     @Override
     public List<Class<?>> getAuthCommands() {
-        List<Class<?>> cmdList = new ArrayList<Class<?>>();
+        List<Class<?>> cmdList = new ArrayList<>();
         cmdList.add(OauthLoginAPIAuthenticatorCmd.class);
         cmdList.add(ListOAuthProvidersCmd.class);
         cmdList.add(VerifyOAuthCodeAndGetUserCmd.class);
@@ -84,7 +83,7 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
 
     @Override
     public List<Class<?>> getCommands() {
-        List<Class<?>> cmdList = new ArrayList<Class<?>>();
+        List<Class<?>> cmdList = new ArrayList<>();
         cmdList.add(RegisterOAuthProviderCmd.class);
         cmdList.add(DeleteOAuthProviderCmd.class);
         cmdList.add(UpdateOAuthProviderCmd.class);
@@ -127,9 +126,7 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
     @Override
     public String verifyCodeAndFetchEmail(String code, String provider) {
         UserOAuth2Authenticator authenticator = getUserOAuth2AuthenticationProvider(provider);
-        String email = authenticator.verifyCodeAndFetchEmail(code);
-
-        return email;
+        return authenticator.verifyCodeAndFetchEmail(code);
     }
 
     @Override
@@ -139,6 +136,8 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
         String clientId = StringUtils.trim(cmd.getClientId());
         String redirectUri = StringUtils.trim(cmd.getRedirectUri());
         String secretKey = StringUtils.trim(cmd.getSecretKey());
+        String authorizeUrl = StringUtils.trim(cmd.getAuthorizeUrl());
+        String tokenUrl = StringUtils.trim(cmd.getTokenUrl());
 
         if (!isOAuthPluginEnabled()) {
             throw new CloudRuntimeException("OAuth is not enabled, please enable to register");
@@ -148,7 +147,7 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
             throw new CloudRuntimeException(String.format("Provider with the name %s is already registered", provider));
         }
 
-        return saveOauthProvider(provider, description, clientId, secretKey, redirectUri);
+        return saveOauthProvider(provider, description, clientId, secretKey, redirectUri, authorizeUrl, tokenUrl);
     }
 
     @Override
@@ -171,6 +170,8 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
         String clientId = StringUtils.trim(cmd.getClientId());
         String redirectUri = StringUtils.trim(cmd.getRedirectUri());
         String secretKey = StringUtils.trim(cmd.getSecretKey());
+        String authorizeUrl = StringUtils.trim(cmd.getAuthorizeUrl());
+        String tokenUrl = StringUtils.trim(cmd.getTokenUrl());
         Boolean enabled = cmd.getEnabled();
 
         OauthProviderVO providerVO = _oauthProviderDao.findById(id);
@@ -190,6 +191,12 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
         if (StringUtils.isNotEmpty(secretKey)) {
             providerVO.setSecretKey(secretKey);
         }
+        if (StringUtils.isNotEmpty(authorizeUrl)) {
+            providerVO.setAuthorizeUrl(authorizeUrl);
+        }
+        if (StringUtils.isNotEmpty(tokenUrl)) {
+            providerVO.setTokenUrl(tokenUrl);
+        }
         if (enabled != null) {
             providerVO.setEnabled(enabled);
         }
@@ -199,7 +206,7 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
         return _oauthProviderDao.findById(id);
     }
 
-    private OauthProviderVO saveOauthProvider(String provider, String description, String clientId, String secretKey, String redirectUri) {
+    private OauthProviderVO saveOauthProvider(String provider, String description, String clientId, String secretKey, String redirectUri, String authorizeUrl, String tokenUrl) {
         final OauthProviderVO oauthProviderVO = new OauthProviderVO();
 
         oauthProviderVO.setProvider(provider);
@@ -207,6 +214,8 @@ public class OAuth2AuthManagerImpl extends ManagerBase implements OAuth2AuthMana
         oauthProviderVO.setClientId(clientId);
         oauthProviderVO.setSecretKey(secretKey);
         oauthProviderVO.setRedirectUri(redirectUri);
+        oauthProviderVO.setAuthorizeUrl(authorizeUrl);
+        oauthProviderVO.setTokenUrl(tokenUrl);
         oauthProviderVO.setEnabled(true);
 
         _oauthProviderDao.persist(oauthProviderVO);
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/ListOAuthProvidersCmd.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/ListOAuthProvidersCmd.java
index abdbf65dbb4..9b91a1d879c 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/ListOAuthProvidersCmd.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/ListOAuthProvidersCmd.java
@@ -21,8 +21,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import com.cloud.api.response.ApiResponseSerializer;
-import com.cloud.user.Account;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -40,9 +42,8 @@ import org.apache.cloudstack.oauth2.api.response.OauthProviderResponse;
 import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
 import org.apache.commons.lang.ArrayUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import com.cloud.api.response.ApiResponseSerializer;
+import com.cloud.user.Account;
 
 @APICommand(name = "listOauthProvider", description = "List OAuth providers registered", responseObject = OauthProviderResponse.class, entityType = {},
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
@@ -108,7 +109,7 @@ public class ListOAuthProvidersCmd extends BaseListCmd implements APIAuthenticat
         List<OauthProviderResponse> responses = new ArrayList<>();
         for (OauthProviderVO result : resultList) {
             OauthProviderResponse r = new OauthProviderResponse(result.getUuid(), result.getProvider(),
-                    result.getDescription(), result.getClientId(), result.getSecretKey(), result.getRedirectUri());
+                    result.getDescription(), result.getClientId(), result.getSecretKey(), result.getRedirectUri(), result.getAuthorizeUrl(), result.getTokenUrl());
             if (OAuth2AuthManager.OAuth2IsPluginEnabled.value() && authenticatorPluginNames.contains(result.getProvider()) && result.isEnabled()) {
                 r.setEnabled(true);
             } else {
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java
index b31cbde97c5..8eb4493d76d 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java
@@ -14,26 +14,29 @@
 // limitations under the License.
 package org.apache.cloudstack.oauth2.api.command;
 
+import java.util.Collection;
+import java.util.Map;
+
 import javax.inject.Inject;
 import javax.persistence.EntityExistsException;
 
-import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.cloudstack.oauth2.OAuth2AuthManager;
-import org.apache.cloudstack.oauth2.api.response.OauthProviderResponse;
-import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
-import org.apache.commons.collections.MapUtils;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.oauth2.OAuth2AuthManager;
+import org.apache.cloudstack.oauth2.api.response.OauthProviderResponse;
+import org.apache.cloudstack.oauth2.keycloak.KeycloakOAuth2Provider;
+import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.exception.ConcurrentOperationException;
 
-import java.util.Collection;
-import java.util.Map;
-
 @APICommand(name = "registerOauthProvider", responseObject = SuccessResponse.class, description = "Register the OAuth2 provider in CloudStack", since = "4.19.0")
 public class RegisterOAuthProviderCmd extends BaseCmd {
 
@@ -56,6 +59,12 @@ public class RegisterOAuthProviderCmd extends BaseCmd {
     @Parameter(name = ApiConstants.REDIRECT_URI, type = CommandType.STRING, description = "Redirect URI pre-registered in the specific OAuth provider", required = true)
     private String redirectUri;
 
+    @Parameter(name = ApiConstants.AUTHORIZE_URL, type = CommandType.STRING, description = "Authorize URL for OAuth initialization (only required for keycloak provider)")
+    private String authorizeUrl;
+
+    @Parameter(name = ApiConstants.TOKEN_URL, type = CommandType.STRING, description = "Token URL for OAuth finalization (only required for keycloak provider)")
+    private String tokenUrl;
+
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "Any OAuth provider details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].clientsecret=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")
     protected Map details;
@@ -85,6 +94,14 @@ public class RegisterOAuthProviderCmd extends BaseCmd {
         return redirectUri;
     }
 
+    public String getAuthorizeUrl() {
+        return authorizeUrl;
+    }
+
+    public String getTokenUrl() {
+        return tokenUrl;
+    }
+
     public Map getDetails() {
         if (MapUtils.isEmpty(details)) {
             return null;
@@ -98,10 +115,20 @@ public class RegisterOAuthProviderCmd extends BaseCmd {
 
     @Override
     public void execute() throws ServerApiException, ConcurrentOperationException, EntityExistsException {
+        if (StringUtils.equals(KeycloakOAuth2Provider.KEYCLOAK_PROVIDER, getProvider())) {
+            if (StringUtils.isBlank(getAuthorizeUrl())) {
+                throw new ServerApiException(ApiErrorCode.BAD_REQUEST, "Parameter authorizeurl is mandatory for keycloak OAuth Provider");
+            }
+            if (StringUtils.isBlank(getTokenUrl())) {
+                throw new ServerApiException(ApiErrorCode.BAD_REQUEST, "Parameter tokenurl is mandatory for keycloak OAuth Provider");
+            }
+        }
+
         OauthProviderVO provider = _oauth2mgr.registerOauthProvider(this);
 
         OauthProviderResponse response = new OauthProviderResponse(provider.getUuid(), provider.getProvider(),
-                provider.getDescription(), provider.getClientId(), provider.getSecretKey(), provider.getRedirectUri());
+                provider.getDescription(), provider.getClientId(), provider.getSecretKey(), provider.getRedirectUri(),
+                provider.getAuthorizeUrl(), provider.getTokenUrl());
         response.setResponseName(getCommandName());
         response.setObjectName(ApiConstants.OAUTH_PROVIDER);
         setResponseObject(response);
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/UpdateOAuthProviderCmd.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/UpdateOAuthProviderCmd.java
index 1c79b7b144c..a8b0604a9bb 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/UpdateOAuthProviderCmd.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/UpdateOAuthProviderCmd.java
@@ -16,23 +16,23 @@
 // under the License.
 package org.apache.cloudstack.oauth2.api.command;
 
-import org.apache.cloudstack.api.ApiCommandResourceType;
-import org.apache.cloudstack.auth.UserOAuth2Authenticator;
-import org.apache.cloudstack.oauth2.OAuth2AuthManager;
-import org.apache.cloudstack.oauth2.api.response.OauthProviderResponse;
-import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
 
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.auth.UserOAuth2Authenticator;
 import org.apache.cloudstack.context.CallContext;
-
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.cloudstack.oauth2.OAuth2AuthManager;
+import org.apache.cloudstack.oauth2.api.response.OauthProviderResponse;
+import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
 
 @APICommand(name = "updateOauthProvider", description = "Updates the registered OAuth provider details", responseObject = OauthProviderResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0")
@@ -57,6 +57,12 @@ public final class UpdateOAuthProviderCmd extends BaseCmd {
     @Parameter(name = ApiConstants.REDIRECT_URI, type = CommandType.STRING, description = "Redirect URI pre-registered in the specific OAuth provider")
     private String redirectUri;
 
+    @Parameter(name = ApiConstants.AUTHORIZE_URL, type = CommandType.STRING, description = "Authorize URL pre-registered in the specific OAuth provider")
+    private String authorizeUrl;
+
+    @Parameter(name = ApiConstants.TOKEN_URL, type = CommandType.STRING, description = "Token URL pre-registered in the specific OAuth provider")
+    private String tokenUrl;
+
     @Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, description = "OAuth provider will be enabled or disabled based on this value")
     private Boolean enabled;
 
@@ -87,6 +93,14 @@ public final class UpdateOAuthProviderCmd extends BaseCmd {
         return redirectUri;
     }
 
+    public String getAuthorizeUrl() {
+        return authorizeUrl;
+    }
+
+    public String getTokenUrl() {
+        return tokenUrl;
+    }
+
     public Boolean getEnabled() {
         return enabled;
     }
@@ -115,7 +129,8 @@ public final class UpdateOAuthProviderCmd extends BaseCmd {
         OauthProviderVO result = _oauthMgr.updateOauthProvider(this);
         if (result != null) {
             OauthProviderResponse r = new OauthProviderResponse(result.getUuid(), result.getProvider(),
-                    result.getDescription(), result.getClientId(), result.getSecretKey(), result.getRedirectUri());
+                    result.getDescription(), result.getClientId(), result.getSecretKey(), result.getRedirectUri(),
+                    result.getAuthorizeUrl(), result.getTokenUrl());
 
             List<UserOAuth2Authenticator> userOAuth2AuthenticatorPlugins = _oauthMgr.listUserOAuth2AuthenticationProviders();
             List<String> authenticatorPluginNames = new ArrayList<>();
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/response/OauthProviderResponse.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/response/OauthProviderResponse.java
index e0c40bef9b4..289dc665013 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/response/OauthProviderResponse.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/response/OauthProviderResponse.java
@@ -16,13 +16,14 @@
 // under the License.
 package org.apache.cloudstack.oauth2.api.response;
 
-import com.cloud.serializer.Param;
-import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
 
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
 @EntityReference(value = OauthProviderVO.class)
 public class OauthProviderResponse extends BaseResponse {
 
@@ -54,18 +55,28 @@ public class OauthProviderResponse extends BaseResponse {
     @Param(description = "Redirect URI registered in the OAuth provider")
     private String redirectUri;
 
+    @SerializedName(ApiConstants.AUTHORIZE_URL)
+    @Param(description = "Authorize URL registered in the OAuth provider")
+    private String authorizeUrl;
+
+    @SerializedName(ApiConstants.TOKEN_URL)
+    @Param(description = "Token URL registered in the OAuth provider")
+    private String tokenUrl;
+
     @SerializedName(ApiConstants.ENABLED)
     @Param(description = "Whether the OAuth provider is enabled or not")
     private boolean enabled;
 
-    public OauthProviderResponse(String id, String provider, String description, String clientId, String secretKey, String redirectUri) {
+    public OauthProviderResponse(String id, String provider, String description, String clientId, String secretKey, String redirectUri, String authorizeUrl, String tokenUrl) {
         this.id = id;
         this.provider = provider;
         this.name = provider;
         this.description = description;
         this.clientId = clientId;
         this.secretKey = secretKey;
-        this.redirectUri =  redirectUri;
+        this.redirectUri = redirectUri;
+        this.authorizeUrl = authorizeUrl;
+        this.tokenUrl = tokenUrl;
     }
 
     public String getId() {
@@ -117,6 +128,22 @@ public class OauthProviderResponse extends BaseResponse {
         this.redirectUri = redirectUri;
     }
 
+    public String getAuthorizeUrl() {
+        return authorizeUrl;
+    }
+
+    public void setAuthorizeUrl(String authorizeUrl) {
+        this.authorizeUrl = authorizeUrl;
+    }
+
+    public String getTokenUrl() {
+        return tokenUrl;
+    }
+
+    public void setTokenUrl(String tokenUrl) {
+        this.tokenUrl = tokenUrl;
+    }
+
     public String getSecretKey() {
         return secretKey;
     }
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/github/GithubOAuth2Provider.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/github/GithubOAuth2Provider.java
index e4a7fae101f..4d426181a94 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/github/GithubOAuth2Provider.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/github/GithubOAuth2Provider.java
@@ -16,17 +16,6 @@
 //under the License.
 package org.apache.cloudstack.oauth2.github;
 
-import com.cloud.utils.component.AdapterBase;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.cloudstack.auth.UserOAuth2Authenticator;
-import org.apache.cloudstack.oauth2.dao.OauthProviderDao;
-import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.inject.Inject;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -36,6 +25,18 @@ import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
+import org.apache.cloudstack.auth.UserOAuth2Authenticator;
+import org.apache.cloudstack.oauth2.dao.OauthProviderDao;
+import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
+import org.apache.commons.lang3.StringUtils;
+
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class GithubOAuth2Provider extends AdapterBase implements UserOAuth2Authenticator {
 
     @Inject
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/google/GoogleOAuth2Provider.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/google/GoogleOAuth2Provider.java
index 42ed1451ccd..885930181c9 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/google/GoogleOAuth2Provider.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/google/GoogleOAuth2Provider.java
@@ -16,6 +16,17 @@
 //under the License.
 package org.apache.cloudstack.oauth2.google;
 
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.auth.UserOAuth2Authenticator;
+import org.apache.cloudstack.oauth2.dao.OauthProviderDao;
+import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
+import org.apache.commons.lang3.StringUtils;
+
 import com.cloud.exception.CloudAuthenticationException;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -28,15 +39,6 @@ import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.oauth2.Oauth2;
 import com.google.api.services.oauth2.model.Userinfo;
-import org.apache.cloudstack.auth.UserOAuth2Authenticator;
-import org.apache.cloudstack.oauth2.dao.OauthProviderDao;
-import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
 
 public class GoogleOAuth2Provider extends AdapterBase implements UserOAuth2Authenticator {
 
@@ -78,10 +80,10 @@ public class GoogleOAuth2Provider extends AdapterBase implements UserOAuth2Authe
 
     @Override
     public String verifyCodeAndFetchEmail(String secretCode) {
-        OauthProviderVO githubProvider = _oauthProviderDao.findByProvider(getName());
-        String clientId = githubProvider.getClientId();
-        String secret = githubProvider.getSecretKey();
-        String redirectURI = githubProvider.getRedirectUri();
+        OauthProviderVO googleProvider = _oauthProviderDao.findByProvider(getName());
+        String clientId = googleProvider.getClientId();
+        String secret = googleProvider.getSecretKey();
+        String redirectURI = googleProvider.getRedirectUri();
         GoogleClientSecrets clientSecrets = new GoogleClientSecrets()
                 .setWeb(new GoogleClientSecrets.Details()
                         .setClientId(clientId)
@@ -122,7 +124,7 @@ public class GoogleOAuth2Provider extends AdapterBase implements UserOAuth2Authe
         try {
             userinfo = oauth2.userinfo().get().execute();
         } catch (IOException e) {
-            throw new CloudRuntimeException(String.format("Failed to fetch the email address with the provided secret: %s" + e.getMessage()));
+            throw new CloudRuntimeException(String.format("Failed to fetch the email address with the provided secret: %s", e.getMessage()));
         }
         return userinfo.getEmail();
     }
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/keycloak/KeycloakOAuth2Provider.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/keycloak/KeycloakOAuth2Provider.java
new file mode 100644
index 00000000000..3f537b1984d
--- /dev/null
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/keycloak/KeycloakOAuth2Provider.java
@@ -0,0 +1,184 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package org.apache.cloudstack.oauth2.keycloak;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.ws.rs.core.HttpHeaders;
+
+import org.apache.cloudstack.auth.UserOAuth2Authenticator;
+import org.apache.cloudstack.oauth2.dao.OauthProviderDao;
+import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import com.cloud.exception.CloudAuthenticationException;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public class KeycloakOAuth2Provider extends AdapterBase implements UserOAuth2Authenticator {
+
+    public static final String KEYCLOAK_PROVIDER = "keycloak";
+
+    protected String idToken = null;
+
+    @Inject
+    OauthProviderDao oauthProviderDao;
+
+    private CloseableHttpClient httpClient;
+
+    public KeycloakOAuth2Provider() {
+        this(HttpClientBuilder.create().build());
+    }
+
+    public KeycloakOAuth2Provider(CloseableHttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
+
+    @Override
+    public String getName() {
+        return KEYCLOAK_PROVIDER;
+    }
+
+    @Override
+    public String getDescription() {
+        return "Keycloak OAuth2 Provider Plugin";
+    }
+
+    @Override
+    public boolean verifyUser(String email, String secretCode) {
+        if (StringUtils.isAnyEmpty(email, secretCode)) {
+            throw new CloudAuthenticationException("Either email or secret code should not be null/empty");
+        }
+
+        OauthProviderVO providerVO = oauthProviderDao.findByProvider(getName());
+        if (providerVO == null) {
+            throw new CloudAuthenticationException("Keycloak provider is not registered, so user cannot be verified");
+        }
+
+        String verifiedEmail = verifyCodeAndFetchEmail(secretCode);
+        if (StringUtils.isBlank(verifiedEmail) || !email.equals(verifiedEmail)) {
+            throw new CloudRuntimeException("Unable to verify the email address with the provided secret");
+        }
+        clearIdToken();
+
+        return true;
+    }
+
+    @Override
+    public String verifyCodeAndFetchEmail(String secretCode) {
+        OauthProviderVO provider = oauthProviderDao.findByProvider(getName());
+        if (provider == null) {
+            throw new CloudAuthenticationException("Keycloak provider is not registered, so user cannot be verified");
+        }
+
+        if (StringUtils.isBlank(idToken)) {
+            String auth = provider.getClientId() + ":" + provider.getSecretKey();
+            String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes(StandardCharsets.UTF_8));
+
+            List<NameValuePair> params = new ArrayList<>();
+            params.add(new BasicNameValuePair("grant_type", "authorization_code"));
+            params.add(new BasicNameValuePair("code", secretCode));
+            params.add(new BasicNameValuePair("redirect_uri", provider.getRedirectUri()));
+
+            HttpPost post = new HttpPost(provider.getTokenUrl());
+            post.setHeader(HttpHeaders.AUTHORIZATION, "Basic " + encodedAuth);
+
+            try {
+                post.setEntity(new UrlEncodedFormEntity(params));
+            } catch (UnsupportedEncodingException e) {
+                throw new CloudRuntimeException("Unable to generate URL parameters: " + e.getMessage());
+            }
+
+            try (CloseableHttpResponse response = httpClient.execute(post)) {
+                String body = EntityUtils.toString(response.getEntity());
+
+                if (response.getStatusLine().getStatusCode() != 200) {
+                    throw new CloudRuntimeException("Keycloak error during token generation: " + body);
+                }
+
+                JsonObject json = JsonParser.parseString(body).getAsJsonObject();
+                JsonElement fetchedIdToken = json.get("id_token");
+                if (fetchedIdToken == null) {
+                    throw new CloudRuntimeException("No id_token found in token");
+                }
+                String idTokenAsString = fetchedIdToken.getAsString();
+                validateIdToken(idTokenAsString , provider);
+
+                this.idToken = idTokenAsString ;
+            } catch (IOException e) {
+                throw new CloudRuntimeException("Unable to connect to Keycloak server", e);
+            }
+        }
+
+        return obtainEmail(idToken, provider);
+    }
+
+    @Override
+    public String getUserEmailAddress() throws CloudRuntimeException {
+        return null;
+    }
+
+    private void validateIdToken(String idTokenStr, OauthProviderVO provider) {
+        JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idTokenStr);
+        JwtClaims claims = jwtConsumer.getJwtToken().getClaims();
+
+        if (!claims.getAudiences().contains(provider.getClientId())) {
+            throw new CloudAuthenticationException("Audience mismatch");
+        }
+    }
+
+    private String obtainEmail(String idTokenStr, OauthProviderVO provider) {
+        JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idTokenStr);
+        JwtClaims claims = jwtConsumer.getJwtToken().getClaims();
+
+        if (!claims.getAudiences().contains(provider.getClientId())) {
+            throw new CloudAuthenticationException("Audience mismatch");
+        }
+
+        return (String) claims.getClaim("email");
+    }
+
+    protected void clearIdToken() {
+        idToken = null;
+    }
+
+    public void setHttpClient(CloseableHttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
+
+}
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/vo/OauthProviderVO.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/vo/OauthProviderVO.java
index efd6004e8f9..54d667bc914 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/vo/OauthProviderVO.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/vo/OauthProviderVO.java
@@ -16,9 +16,8 @@
 // under the License.
 package org.apache.cloudstack.oauth2.vo;
 
-import com.cloud.utils.db.GenericDao;
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.api.InternalIdentity;
+import java.util.Date;
+import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,8 +25,11 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.util.Date;
-import java.util.UUID;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import com.cloud.utils.db.GenericDao;
 
 @Entity
 @Table(name = "oauth_provider")
@@ -55,6 +57,12 @@ public class OauthProviderVO implements Identity, InternalIdentity {
     @Column(name = "redirect_uri")
     private String redirectUri;
 
+    @Column(name = "authorize_url")
+    private String authorizeUrl;
+
+    @Column(name = "token_url")
+    private String tokenUrl;
+
     @Column(name = GenericDao.CREATED_COLUMN)
     private Date created;
 
@@ -110,6 +118,22 @@ public class OauthProviderVO implements Identity, InternalIdentity {
         this.redirectUri = redirectUri;
     }
 
+    public String getAuthorizeUrl() {
+        return authorizeUrl;
+    }
+
+    public void setAuthorizeUrl(String authorizeUrl) {
+        this.authorizeUrl = authorizeUrl;
+    }
+
+    public String getTokenUrl() {
+        return tokenUrl;
+    }
+
+    public void setTokenUrl(String tokenUrl) {
+        this.tokenUrl = tokenUrl;
+    }
+
     public String getSecretKey() {
         return secretKey;
     }
diff --git a/plugins/user-authenticators/oauth2/src/main/resources/META-INF/cloudstack/oauth2/spring-oauth2-context.xml b/plugins/user-authenticators/oauth2/src/main/resources/META-INF/cloudstack/oauth2/spring-oauth2-context.xml
index 04a6c8dabfe..06fe60f4c25 100644
--- a/plugins/user-authenticators/oauth2/src/main/resources/META-INF/cloudstack/oauth2/spring-oauth2-context.xml
+++ b/plugins/user-authenticators/oauth2/src/main/resources/META-INF/cloudstack/oauth2/spring-oauth2-context.xml
@@ -35,6 +35,9 @@
     <bean id="GithubOAuth2Provider" class="org.apache.cloudstack.oauth2.github.GithubOAuth2Provider">
         <property name="name" value="github" />
     </bean>
+    <bean id="KeycloakOAuth2Provider" class="org.apache.cloudstack.oauth2.keycloak.KeycloakOAuth2Provider">
+        <property name="name" value="keycloak" />
+    </bean>
 
     <bean id="OAuth2AuthManager" class="org.apache.cloudstack.oauth2.OAuth2AuthManagerImpl">
         <property name="name" value="OAUTH2Auth" />
@@ -45,7 +48,7 @@
           class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
         <property name="orderConfigKey" value="user.oauth2.providers.order" />
         <property name="excludeKey" value="oauth2.plugins.exclude" />
-        <property name="orderConfigDefault" value="google,github" />
+        <property name="orderConfigDefault" value="google,github,keycloak" />
     </bean>
 
     <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
diff --git a/plugins/user-authenticators/oauth2/src/test/java/org/apache/cloudstack/oauth2/keycloak/KeycloakOAuth2ProviderTest.java b/plugins/user-authenticators/oauth2/src/test/java/org/apache/cloudstack/oauth2/keycloak/KeycloakOAuth2ProviderTest.java
new file mode 100644
index 00000000000..df390f449ca
--- /dev/null
+++ b/plugins/user-authenticators/oauth2/src/test/java/org/apache/cloudstack/oauth2/keycloak/KeycloakOAuth2ProviderTest.java
@@ -0,0 +1,225 @@
+//Licensed to the Apache Software Foundation (ASF) under one
+//or more contributor license agreements.  See the NOTICE file
+//distributed with this work for additional information
+//regarding copyright ownership.  The ASF licenses this file
+//to you under the Apache License, Version 2.0 (the
+//"License"); you may not use this file except in compliance
+//the License.  You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied.  See the License for the
+//specific language governing permissions and limitations
+//under the License.
+package org.apache.cloudstack.oauth2.keycloak;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import org.apache.cloudstack.oauth2.dao.OauthProviderDao;
+import org.apache.cloudstack.oauth2.vo.OauthProviderVO;
+import org.apache.http.HttpEntity;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import com.cloud.exception.CloudAuthenticationException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public class KeycloakOAuth2ProviderTest {
+
+    @Mock
+    private OauthProviderDao oauthProviderDao;
+
+    @Mock
+    private CloseableHttpClient httpClient;
+
+    private KeycloakOAuth2Provider provider;
+
+    private OauthProviderVO mockProviderVO;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        provider = new KeycloakOAuth2Provider(httpClient);
+        provider.oauthProviderDao = oauthProviderDao;
+
+        mockProviderVO = new OauthProviderVO();
+        mockProviderVO.setClientId("test-client");
+        mockProviderVO.setSecretKey("test-secret");
+        mockProviderVO.setTokenUrl("http://localhost/token");
+        mockProviderVO.setRedirectUri("http://localhost/redirect");
+    }
+
+    @Test
+    public void testGetName() {
+        assertEquals("keycloak", provider.getName());
+    }
+
+    @Test(expected = CloudAuthenticationException.class)
+    public void testVerifyUserEmptyParams() {
+        provider.verifyUser("", "");
+    }
+
+    @Test(expected = CloudAuthenticationException.class)
+    public void testVerifyUserProviderNotFound() {
+        when(oauthProviderDao.findByProvider("keycloak")).thenReturn(null);
+        provider.verifyUser("test@example.com", "code123");
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testVerifyCodeAndFetchEmailHttpError() throws IOException {
+        when(oauthProviderDao.findByProvider("keycloak")).thenReturn(mockProviderVO);
+
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        StatusLine statusLine = mock(StatusLine.class);
+
+        when(statusLine.getStatusCode()).thenReturn(400);
+        when(response.getStatusLine()).thenReturn(statusLine);
+
+        HttpEntity entity = mock(HttpEntity.class);
+        when(entity.getContent()).thenReturn(new ByteArrayInputStream("error".getBytes()));
+        when(response.getEntity()).thenReturn(entity);
+
+        when(httpClient.execute(any(HttpPost.class))).thenReturn(response);
+
+        provider.verifyCodeAndFetchEmail("invalid-code");
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testVerifyCodeAndFetchEmailNetworkFailure() throws IOException {
+        when(oauthProviderDao.findByProvider("keycloak")).thenReturn(mockProviderVO);
+        when(httpClient.execute(any(HttpPost.class))).thenThrow(new IOException("Connection refused"));
+
+        provider.verifyCodeAndFetchEmail("code");
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testVerifyUserWithMismatchedEmail() throws IOException {
+        when(oauthProviderDao.findByProvider("keycloak")).thenReturn(mockProviderVO);
+
+        String testEmail = "anotheruser@example.com";
+        String secretCode = "valid-auth-code";
+
+        String header = "{\"alg\":\"none\"}";
+        String payload = "{" +
+                "\"aud\":[\"test-client\"]," +
+                "\"email\":\"" + testEmail + "\"," +
+                "\"iss\":\"http://keycloak\"," +
+                "\"sub\":\"12345\"" +
+                "}";
+
+        String encodedHeader = Base64.getUrlEncoder().withoutPadding().encodeToString(header.getBytes());
+        String encodedPayload = Base64.getUrlEncoder().withoutPadding().encodeToString(payload.getBytes());
+        String fakeJwt = encodedHeader + "." + encodedPayload + ".not-checked-signature";
+
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        StatusLine statusLine = mock(StatusLine.class);
+        HttpEntity entity = mock(HttpEntity.class);
+
+        when(statusLine.getStatusCode()).thenReturn(200);
+        when(response.getStatusLine()).thenReturn(statusLine);
+
+        String jsonResponseBody = "{\"id_token\":\"" + fakeJwt + "\", \"access_token\":\"acc-123\"}";
+        when(entity.getContent()).thenReturn(new ByteArrayInputStream(jsonResponseBody.getBytes(StandardCharsets.UTF_8)));
+        when(response.getEntity()).thenReturn(entity);
+
+        when(httpClient.execute(any(HttpPost.class))).thenReturn(response);
+
+        provider.verifyUser("user@example.com", secretCode);
+    }
+
+    @Test(expected = CloudRuntimeException.class)
+    public void testVerifyUserWithMismatchedClient() throws IOException {
+        when(oauthProviderDao.findByProvider("keycloak")).thenReturn(mockProviderVO);
+
+        String testEmail = "anotheruser@example.com";
+        String secretCode = "valid-auth-code";
+
+        String header = "{\"alg\":\"none\"}";
+        String payload = "{" +
+                "\"aud\":[\"anothertest-client\"]," +
+                "\"email\":\"" + testEmail + "\"," +
+                "\"iss\":\"http://keycloak\"," +
+                "\"sub\":\"12345\"" +
+                "}";
+
+        String encodedHeader = Base64.getUrlEncoder().withoutPadding().encodeToString(header.getBytes());
+        String encodedPayload = Base64.getUrlEncoder().withoutPadding().encodeToString(payload.getBytes());
+        String fakeJwt = encodedHeader + "." + encodedPayload + ".not-checked-signature";
+
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        StatusLine statusLine = mock(StatusLine.class);
+        HttpEntity entity = mock(HttpEntity.class);
+
+        when(statusLine.getStatusCode()).thenReturn(200);
+        when(response.getStatusLine()).thenReturn(statusLine);
+
+        String jsonResponseBody = "{\"id_token\":\"" + fakeJwt + "\", \"access_token\":\"acc-123\"}";
+        when(entity.getContent()).thenReturn(new ByteArrayInputStream(jsonResponseBody.getBytes(StandardCharsets.UTF_8)));
+        when(response.getEntity()).thenReturn(entity);
+
+        when(httpClient.execute(any(HttpPost.class))).thenReturn(response);
+
+        provider.verifyUser(testEmail, secretCode);
+    }
+
+    @Test
+    public void testVerifyUserEmail() throws IOException {
+        when(oauthProviderDao.findByProvider("keycloak")).thenReturn(mockProviderVO);
+
+        String testEmail = "user@example.com";
+        String secretCode = "valid-auth-code";
+
+        String header = "{\"alg\":\"none\"}";
+        String payload = "{" +
+                "\"aud\":[\"test-client\"]," +
+                "\"email\":\"" + testEmail + "\"," +
+                "\"iss\":\"http://keycloak\"," +
+                "\"sub\":\"12345\"" +
+                "}";
+
+        String encodedHeader = Base64.getUrlEncoder().withoutPadding().encodeToString(header.getBytes());
+        String encodedPayload = Base64.getUrlEncoder().withoutPadding().encodeToString(payload.getBytes());
+        String fakeJwt = encodedHeader + "." + encodedPayload + ".not-checked-signature";
+
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        StatusLine statusLine = mock(StatusLine.class);
+        HttpEntity entity = mock(HttpEntity.class);
+
+        when(statusLine.getStatusCode()).thenReturn(200);
+        when(response.getStatusLine()).thenReturn(statusLine);
+
+        String jsonResponseBody = "{\"id_token\":\"" + fakeJwt + "\", \"access_token\":\"acc-123\"}";
+        when(entity.getContent()).thenReturn(new ByteArrayInputStream(jsonResponseBody.getBytes(StandardCharsets.UTF_8)));
+        when(response.getEntity()).thenReturn(entity);
+
+        when(httpClient.execute(any(HttpPost.class))).thenReturn(response);
+
+        boolean result = provider.verifyUser(testEmail, secretCode);
+
+        assertTrue("User successfully verified", result);
+    }
+
+    @Test
+    public void testGetDescription() {
+        assertEquals("Keycloak OAuth2 Provider Plugin", provider.getDescription());
+    }
+}
diff --git a/pom.xml b/pom.xml
index a29a656ce51..38a559ba831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,10 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.exclusions>engine/schema/src/main/java/org/apache/cloudstack/backup/BackupOfferingDetailsVO.java</sonar.exclusions>
         <sonar.exclusions>api/src/main/java/org/apache/cloudstack/api/response/BackupOfferingResponse.java</sonar.exclusions>
+        <sonar.exclusions>core/src/main/java/com/cloud/agent/api/PostMigrationAnswer.java</sonar.exclusions>
+        <sonar.exclusions>core/src/main/java/com/cloud/agent/api/PostMigrationCommand.java</sonar.exclusions>
+        <sonar.exclusions>core/src/main/java/com/cloud/agent/api/PreMigrationCommand.java</sonar.exclusions>
+        <sonar.exclusions>core/src/main/java/org/apache/cloudstack/storage/command/ClvmLockTransferCommand.java</sonar.exclusions>
 
         <!-- Build properties -->
         <cs.jdk.version>11</cs.jdk.version>
diff --git a/scripts/coverage-grade.sh b/scripts/coverage-grade.sh
new file mode 100755
index 00000000000..fc7edc8dcb9
--- /dev/null
+++ b/scripts/coverage-grade.sh
@@ -0,0 +1,174 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# coverage-grade.sh
+#
+# Parses the JaCoCo aggregate XML report and outputs an A–F coverage grade.
+#
+# Usage:
+#   ./scripts/coverage-grade.sh [path/to/jacoco.xml]
+#
+# Exit codes:
+#   0 – grade is D or above  (line coverage >= 20%)
+#   1 – grade is F            (line coverage <  20%)
+#
+# Environment variables (optional, used when writing GitHub outputs):
+#   GITHUB_OUTPUT       – set automatically by GitHub Actions
+#   GITHUB_STEP_SUMMARY – set automatically by GitHub Actions
+
+set -euo pipefail
+
+JACOCO_XML="${1:-client/target/site/jacoco-aggregate/jacoco.xml}"
+
+if [[ ! -f "$JACOCO_XML" ]]; then
+  echo "ERROR: JaCoCo report not found at: $JACOCO_XML" >&2
+  exit 2
+fi
+
+# ---------------------------------------------------------------------------
+# Parse LINE and BRANCH counters from the top-level <report> element using
+# Python's built-in xml.etree.ElementTree (no extra dependencies needed).
+# ---------------------------------------------------------------------------
+read -r LINE_COVERED LINE_MISSED BRANCH_COVERED BRANCH_MISSED < <(python3 - "$JACOCO_XML" <<'PYEOF'
+import sys, xml.etree.ElementTree as ET
+
+tree = ET.parse(sys.argv[1])
+root = tree.getroot()
+
+lc = lm = bc = bm = 0
+# Sum counters from all <package> children so we get the true aggregate,
+# avoiding any duplicate top-level counter that some JaCoCo versions emit.
+for pkg in root.iter('package'):
+    for counter in pkg.findall('counter'):
+        t = counter.get('type')
+        if t == 'LINE':
+            lc += int(counter.get('covered', 0))
+            lm += int(counter.get('missed',  0))
+        elif t == 'BRANCH':
+            bc += int(counter.get('covered', 0))
+            bm += int(counter.get('missed',  0))
+
+print(lc, lm, bc, bm)
+PYEOF
+)
+
+# ---------------------------------------------------------------------------
+# Compute percentages
+# ---------------------------------------------------------------------------
+line_total=$(( LINE_COVERED + LINE_MISSED ))
+branch_total=$(( BRANCH_COVERED + BRANCH_MISSED ))
+
+if (( line_total == 0 )); then
+  echo "ERROR: No LINE counters found in $JACOCO_XML – was the build run with -P quality?" >&2
+  exit 2
+fi
+
+# Use awk for floating-point arithmetic
+LINE_PCT=$(awk "BEGIN { printf \"%.2f\", ($LINE_COVERED / $line_total) * 100 }")
+
+if (( branch_total > 0 )); then
+  BRANCH_PCT=$(awk "BEGIN { printf \"%.2f\", ($BRANCH_COVERED / $branch_total) * 100 }")
+else
+  BRANCH_PCT="N/A"
+fi
+
+# ---------------------------------------------------------------------------
+# Assign grade based on LINE coverage
+#
+#  A  ≥ 80%   Excellent
+#  B  60–79%  Good
+#  C  40–59%  Acceptable
+#  D  20–39%  Marginal (meets minimum gate)
+#  F  < 20%   Failing
+# ---------------------------------------------------------------------------
+LINE_INT=$(awk "BEGIN { printf \"%d\", $LINE_PCT }")   # truncate, not round
+
+if   (( LINE_INT >= 80 )); then GRADE="A"; EMOJI="🟢"; LABEL="Excellent"
+elif (( LINE_INT >= 60 )); then GRADE="B"; EMOJI="🟡"; LABEL="Good"
+elif (( LINE_INT >= 40 )); then GRADE="C"; EMOJI="🟠"; LABEL="Acceptable"
+elif (( LINE_INT >= 20 )); then GRADE="D"; EMOJI="🔴"; LABEL="Marginal"
+else                             GRADE="F"; EMOJI="⛔"; LABEL="Failing"
+fi
+
+# ---------------------------------------------------------------------------
+# Human-readable output (always printed to stdout)
+# ---------------------------------------------------------------------------
+echo "┌─────────────────────────────────────────────────┐"
+echo "│          CloudStack Test Coverage Report         │"
+echo "├─────────────────────────────────────────────────┤"
+printf  "│  Grade        : %s %-5s  %-20s     │\n" "$EMOJI" "$GRADE" "($LABEL)"
+printf  "│  Line coverage: %6s%%  (%d / %d lines)%*s│\n" \
+        "$LINE_PCT" "$LINE_COVERED" "$line_total" \
+        $(( 14 - ${#LINE_COVERED} - ${#line_total} )) " "
+if [[ "$BRANCH_PCT" != "N/A" ]]; then
+  printf "│  Branch cov.  : %6s%%  (%d / %d branches)%*s│\n" \
+         "$BRANCH_PCT" "$BRANCH_COVERED" "$branch_total" \
+         $(( 11 - ${#BRANCH_COVERED} - ${#branch_total} )) " "
+else
+  printf "│  Branch cov.  : N/A (no branch data)           │\n"
+fi
+echo "└─────────────────────────────────────────────────┘"
+echo ""
+echo "Grade scale:  A ≥80%  B 60-79%  C 40-59%  D 20-39%  F <20%  (line coverage)"
+
+# ---------------------------------------------------------------------------
+# GitHub Actions: write outputs and step summary
+# ---------------------------------------------------------------------------
+if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
+  {
+    echo "coverage_grade=$GRADE"
+    echo "coverage_grade_label=$LABEL"
+    echo "line_coverage=$LINE_PCT"
+    echo "branch_coverage=$BRANCH_PCT"
+  } >> "$GITHUB_OUTPUT"
+fi
+
+if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then
+  {
+    echo "## $EMOJI Test Coverage Grade: **$GRADE** — $LABEL"
+    echo ""
+    echo "| Metric | Covered | Total | Percentage |"
+    echo "|--------|---------|-------|------------|"
+    echo "| Line coverage | $LINE_COVERED | $line_total | **${LINE_PCT}%** |"
+    if [[ "$BRANCH_PCT" != "N/A" ]]; then
+      echo "| Branch coverage | $BRANCH_COVERED | $branch_total | **${BRANCH_PCT}%** |"
+    fi
+    echo ""
+    echo "### Grade Scale"
+    echo "| Grade | Line Coverage | Meaning |"
+    echo "|-------|--------------|---------|"
+    echo "| 🟢 A | ≥ 80% | Excellent - this code sleeps well at night 😴 |"
+    echo "| 🟡 B | 60-79% | Good - almost there, don't stop now 😉 |"
+    echo "| 🟠 C | 40-59% | Acceptable - your code is wearing a seatbelt, but no airbags 😬 |"
+    echo "| 🔴 D | 20-39% | Marginal - boldly shipping where no test has gone before 🖖 |"
+    echo "| ⛔ F | < 20% | tests? what tests? 🔥 |"
+    echo ""
+    echo "> Branch coverage is shown as a secondary signal. Grade is based on line coverage."
+  } >> "$GITHUB_STEP_SUMMARY"
+fi
+
+# ---------------------------------------------------------------------------
+# Exit non-zero for grade F so the CI job can be configured to fail
+# ---------------------------------------------------------------------------
+if [[ "$GRADE" == "F" ]]; then
+  echo ""
+  echo "⛔  FAIL: Line coverage ${LINE_PCT}% is below the minimum threshold of 20%." >&2
+  exit 1
+fi
+
+exit 0
diff --git a/scripts/storage/qcow2/managesnapshot.sh b/scripts/storage/qcow2/managesnapshot.sh
index 3650bdd9b6f..a575fdd4ca2 100755
--- a/scripts/storage/qcow2/managesnapshot.sh
+++ b/scripts/storage/qcow2/managesnapshot.sh
@@ -58,15 +58,25 @@ is_lv() {
 }
 
 get_vg() {
-	lvm lvs --noheadings --unbuffered --separator=/ "${1}" | cut -d '/' -f 2
+	lvm lvs --noheadings --unbuffered --separator=/ "${1}" | cut -d '/' -f 2 | tr -d ' '
 }
 
 get_lv() {
-	lvm lvs --noheadings --unbuffered --separator=/ "${1}" | cut -d '/' -f 1
+	lvm lvs --noheadings --unbuffered --separator=/ "${1}" | cut -d '/' -f 1 | tr -d ' '
 }
 
-double_hyphens() {
-	echo ${1} | sed -e "s/-/--/g"
+# Check if a block device contains QCOW2 data (CLVM_NG)
+is_qcow2_on_block_device() {
+	local disk=$1
+
+	# Must be a block device
+	if [ ! -b "${disk}" ]; then
+		return 1
+	fi
+
+	# Check if it contains QCOW2 data using qemu-img info
+	${qemu_img} info "${disk}" 2>/dev/null | grep -q "file format: qcow2"
+	return $?
 }
 
 create_snapshot() {
@@ -79,28 +89,36 @@ create_snapshot() {
   if [ ${dmsnapshot} = "yes" ] && [ "$islv_ret" == "1" ]; then
     local lv=`get_lv ${disk}`
     local vg=`get_vg ${disk}`
-    local lv_dm=`double_hyphens ${lv}`
-    local vg_dm=`double_hyphens ${vg}`
-    local lvdevice=/dev/mapper/${vg_dm}-${lv_dm}
-    local lv_bytes=`blockdev --getsize64 ${lvdevice}`
-    local lv_sectors=`blockdev --getsz ${lvdevice}`
+    local lv_bytes=`blockdev --getsize64 ${disk}`
 
-    lvm lvcreate --size ${lv_bytes}b --name "${snapshotname}-cow" ${vg} >&2 || return 2
-    dmsetup suspend ${vg_dm}-${lv_dm} >&2
-    if dmsetup info -c --noheadings -o name ${vg_dm}-${lv_dm}-real > /dev/null 2>&1; then
-      echo "0 ${lv_sectors} snapshot ${lvdevice}-real /dev/mapper/${vg_dm}-${snapshotname}--cow p 64" | \
-       dmsetup create "${vg_dm}-${snapshotname}" >&2 || ( destroy_snapshot ${disk} "${snapshotname}"; return 2 )
-      dmsetup resume "${vg_dm}-${snapshotname}" >&2 || ( destroy_snapshot ${disk} "${snapshotname}"; return 2 )
-    else
-      dmsetup table ${vg_dm}-${lv_dm} | dmsetup create ${vg_dm}-${lv_dm}-real >&2 || ( destroy_snapshot ${disk} "${snapshotname}"; return 2 )
-      dmsetup resume ${vg_dm}-${lv_dm}-real >&2 || ( destroy_snapshot ${disk} "${snapshotname}"; return 2 )
-      echo "0 ${lv_sectors} snapshot ${lvdevice}-real /dev/mapper/${vg_dm}-${snapshotname}--cow p 64" | \
-       dmsetup create "${vg_dm}-${snapshotname}" >&2 || ( destroy_snapshot ${disk} "${snapshotname}"; return 2 )
-      echo "0 ${lv_sectors} snapshot-origin ${lvdevice}-real" | \
-       dmsetup load ${vg_dm}-${lv_dm} >&2 || ( destroy_snapshot ${disk} "${snapshotname}"; return 2 )
-      dmsetup resume "${vg_dm}-${snapshotname}" >&2 || ( destroy_snapshot ${disk} "${snapshotname}"; return 2 )
+    # Calculate snapshot size (10% of origin size, minimum 100MB, maximum 10GB)
+    local snapshot_size=$((lv_bytes / 10))
+    local min_size=$((100 * 1024 * 1024))  # 100MB
+    local max_size=$((10 * 1024 * 1024 * 1024))  # 10GB
+
+    if [ ${snapshot_size} -lt ${min_size} ]; then
+      snapshot_size=${min_size}
+    elif [ ${snapshot_size} -gt ${max_size} ]; then
+      snapshot_size=${max_size}
+    fi
+
+    # Round to nearest 512-byte multiple (LVM requirement)
+    snapshot_size=$(((snapshot_size + 511) / 512 * 512))
+
+    # Create LVM snapshot using native command
+    lvm lvcreate -L ${snapshot_size}b -s -n "${snapshotname}" "${vg}/${lv}" >&2
+    if [ $? -gt 0 ]; then
+      printf "***Failed to create LVM snapshot ${snapshotname} for ${vg}/${lv}\n" >&2
+      return 2
+    fi
+
+    # Activate the snapshot
+    lvm lvchange --yes -ay "${vg}/${snapshotname}" >&2
+    if [ $? -gt 0 ]; then
+      printf "***Failed to activate LVM snapshot ${snapshotname}\n" >&2
+      lvm lvremove -f "${vg}/${snapshotname}" >&2
+      return 2
     fi
-    dmsetup resume "${vg_dm}-${lv_dm}" >&2
   elif [ -f "${disk}" ]; then
      $qemu_img snapshot -c "$snapshotname" $disk
 
@@ -128,29 +146,32 @@ destroy_snapshot() {
   local disk=$1
   local snapshotname="$2"
   local failed=0
+
+  # If the disk path does not exist any more, assume volume was deleted and
+  # the snapshot is already gone — return success to let caller proceed.
+  if [ ! -e "${disk}" ]; then
+    printf "Disk %s does not exist; assuming volume removed and snapshot %s is deleted\n" "${disk}" "${snapshotname}" >&2
+    return 0
+  fi
+
   is_lv ${disk}
   islv_ret=$?
 
   if [ "$islv_ret" == "1" ]; then
     local lv=`get_lv ${disk}`
     local vg=`get_vg ${disk}`
-    local lv_dm=`double_hyphens ${lv}`
-    local vg_dm=`double_hyphens ${vg}`
-    if [ -e /dev/mapper/${vg_dm}-${lv_dm}-real ]; then
-      local dm_refcount=`dmsetup info -c --noheadings -o open ${vg_dm}-${lv_dm}-real`
-      if [ ${dm_refcount} -le 2 ]; then
-        dmsetup suspend ${vg_dm}-${lv_dm} >&2
-        dmsetup table ${vg_dm}-${lv_dm}-real | dmsetup load ${vg_dm}-${lv_dm} >&2
-        dmsetup resume ${vg_dm}-${lv_dm}
-        dmsetup remove "${vg_dm}-${snapshotname}"
-        dmsetup remove ${vg_dm}-${lv_dm}-real
-      else
-        dmsetup remove "${vg_dm}-${snapshotname}"
-      fi
-    else
-      dmsetup remove "${vg_dm}-${snapshotname}"
+
+    # Check if snapshot exists
+    if ! lvm lvs "${vg}/${snapshotname}" > /dev/null 2>&1; then
+      printf "Snapshot ${vg}/${snapshotname} does not exist or was already deleted\n" >&2
+      return 0
+    fi
+
+    lvm lvremove -f "${vg}/${snapshotname}" >&2
+    if [ $? -gt 0 ]; then
+      printf "***Failed to remove LVM snapshot ${vg}/${snapshotname}\n" >&2
+      return 2
     fi
-    lvm lvremove -f "${vg}/${snapshotname}-cow"
   elif [ -f $disk ]; then
      #delete all the existing snapshots
      $qemu_img snapshot -l $disk |tail -n +3|awk '{print $1}'|xargs -I {} $qemu_img snapshot -d {} $disk >&2
@@ -170,12 +191,36 @@ rollback_snapshot() {
   local disk=$1
   local snapshotname="$2"
   local failed=0
+  is_lv ${disk}
+  islv_ret=$?
 
-  $qemu_img snapshot -a $snapshotname $disk
+  if [ ${dmrollback} = "yes" ] && [ "$islv_ret" == "1" ]; then
+    local lv=`get_lv ${disk}`
+    local vg=`get_vg ${disk}`
 
-  if [ $? -gt 0 ]
-  then
-    printf "***Failed to apply snapshot $snapshotname for path $disk\n" >&2
+    # Check if snapshot exists
+    if ! lvm lvs "${vg}/${snapshotname}" > /dev/null 2>&1; then
+      printf "***Snapshot ${vg}/${snapshotname} does not exist\n" >&2
+      return 1
+    fi
+
+    # Use lvconvert --merge to rollback
+    lvm lvconvert --merge "${vg}/${snapshotname}" >&2
+    if [ $? -gt 0 ]; then
+      printf "***Failed to merge/rollback snapshot ${snapshotname} for ${vg}/${lv}\n" >&2
+      return 1
+    fi
+  elif [ -f ${disk} ]; then
+    # File-based snapshot rollback using qemu-img
+    $qemu_img snapshot -a $snapshotname $disk
+
+    if [ $? -gt 0 ]
+    then
+      printf "***Failed to apply snapshot $snapshotname for path $disk\n" >&2
+      failed=1
+    fi
+  else
+    printf "***Failed to rollback snapshot $snapshotname, undefined type $disk\n" >&2
     failed=1
   fi
 
@@ -202,22 +247,31 @@ backup_snapshot() {
   is_lv ${disk}
   islv_ret=$?
 
+  # Both CLVM and CLVM_NG use LVM snapshot backup, but with different formats
   if [ ${dmsnapshot} = "yes" ] && [ "$islv_ret" == "1" ] ; then
     local vg=`get_vg ${disk}`
-    local vg_dm=`double_hyphens ${vg}`
     local scriptdir=`dirname ${0}`
+    local input_format="raw"
 
-    if ! dmsetup info -c --noheadings -o name ${vg_dm}-${snapshotname} > /dev/null 2>&1; then
+    # Check if snapshot exists using native LVM command
+    if ! lvm lvs "${vg}/${snapshotname}" > /dev/null 2>&1; then
       printf "Disk ${disk} has no snapshot called ${snapshotname}.\n" >&2
       return 1
     fi
 
-    qemuimg_ret=$($qemu_img $forceShareFlag -f raw -O qcow2 "/dev/mapper/${vg_dm}-${snapshotname}" "${destPath}/${destName}")
+    # Detect if this is CLVM_NG (QCOW2 on block device)
+    if is_qcow2_on_block_device "${disk}"; then
+      input_format="qcow2"
+      printf "Detected CLVM_NG volume, using qcow2 format for backup\n" >&2
+    fi
+
+    # Use native LVM path for backup with appropriate format
+    qemuimg_ret=$($qemu_img convert $forceShareFlag -f ${input_format} -O qcow2 "/dev/${vg}/${snapshotname}" "${destPath}/${destName}" 2>&1)
     ret_code=$?
-    if [ $ret_code -gt 0 ] && [[ $qemuimg_ret == *"snapshot: invalid option -- 'U'"* ]]
+    if [ $ret_code -gt 0 ] && ([[ $qemuimg_ret == *"invalid option"*"'U'"* ]] || [[ $qemuimg_ret == *"unrecognized option"*"'-U'"* ]])
     then
       forceShareFlag=""
-      $qemu_img $forceShareFlag -f raw -O qcow2 "/dev/mapper/${vg_dm}-${snapshotname}" "${destPath}/${destName}"
+      $qemu_img convert $forceShareFlag -f ${input_format} -O qcow2 "/dev/${vg}/${snapshotname}" "${destPath}/${destName}"
       ret_code=$?
     fi
     if [ $ret_code -gt 0 ]
@@ -240,9 +294,9 @@ backup_snapshot() {
       # Backup VM snapshot
       qemuimg_ret=$($qemu_img snapshot $forceShareFlag -l $disk 2>&1)
       ret_code=$?
-      if [ $ret_code -gt 0 ] && [[ $qemuimg_ret == *"snapshot: invalid option -- 'U'"* ]]; then
+      if [ $ret_code -gt 0 ] && ([[ $qemuimg_ret == *"invalid option"*"'U'"* ]] || [[ $qemuimg_ret == *"unrecognized option"*"'-U'"* ]]); then
         forceShareFlag=""
-        qemuimg_ret=$($qemu_img snapshot $forceShareFlag -l $disk)
+        qemuimg_ret=$($qemu_img snapshot $forceShareFlag -l $disk 2>&1)
         ret_code=$?
       fi
 
@@ -251,11 +305,11 @@ backup_snapshot() {
         return 1
       fi
 
-      qemuimg_ret=$($qemu_img convert $forceShareFlag -f qcow2 -O qcow2 -l snapshot.name=$snapshotname $disk $destPath/$destName 2>&1 > /dev/null)
+      qemuimg_ret=$($qemu_img convert $forceShareFlag -f qcow2 -O qcow2 -l snapshot.name=$snapshotname $disk $destPath/$destName 2>&1)
       ret_code=$?
-      if [ $ret_code -gt 0 ] && [[ $qemuimg_ret == *"convert: invalid option -- 'U'"* ]]; then
+      if [ $ret_code -gt 0 ] && ([[ $qemuimg_ret == *"invalid option"*"'U'"* ]] || [[ $qemuimg_ret == *"unrecognized option"*"'-U'"* ]]); then
         forceShareFlag=""
-        qemuimg_ret=$($qemu_img convert $forceShareFlag -f qcow2 -O qcow2 -l snapshot.name=$snapshotname $disk $destPath/$destName 2>&1 > /dev/null)
+        qemuimg_ret=$($qemu_img convert $forceShareFlag -f qcow2 -O qcow2 -l snapshot.name=$snapshotname $disk $destPath/$destName 2>&1)
         ret_code=$?
       fi
 
@@ -279,7 +333,19 @@ backup_snapshot() {
 revert_snapshot() {
   local snapshotPath=$1
   local destPath=$2
-  ${qemu_img} convert -f qcow2 -O qcow2 "$snapshotPath" "$destPath" || \
+  local output_format="qcow2"
+
+  # Check if destination is a block device
+  if [ -b "$destPath" ]; then
+    if is_qcow2_on_block_device "${destPath}"; then
+      output_format="qcow2"
+      printf "Detected CLVM_NG volume %s, preserving QCOW2 format for revert\n" "${destPath}" >&2
+    else
+      output_format="raw"
+    fi
+  fi
+
+  ${qemu_img} convert -f qcow2 -O ${output_format} "$snapshotPath" "$destPath" || \
    ( printf "${qemu_img} failed to revert snapshot ${snapshotPath} to disk ${destPath}.\n" >&2; return 2 )
   return 0
 }
diff --git a/scripts/storage/qcow2/resizevolume.sh b/scripts/storage/qcow2/resizevolume.sh
index a45f2e1151a..f7721e5bb3d 100755
--- a/scripts/storage/qcow2/resizevolume.sh
+++ b/scripts/storage/qcow2/resizevolume.sh
@@ -156,6 +156,147 @@ resizelvm() {
   log "performed successful resize - dm:$dmname currentsize:$currentsize newsize:$newsize path:$path type:$ptype vmname:$vmname live:$liveresize shrink:$shrink"
 }
 
+resizeclvmng() {
+  local liveresize='false'
+
+  if ! `lvresize --version > /dev/null 2>&1`
+  then
+    log "unable to resolve executable 'lvresize'" 1
+    exit 1
+  fi
+
+  if ! `qemu-img info /dev/null > /dev/null 2>&1`
+  then
+    log "unable to resolve executable 'qemu-img'" 1
+    exit 1
+  fi
+
+  if ! `virsh --version > /dev/null 2>&1`
+  then
+    log "unable to resolve executable 'virsh'" 1
+    exit 1
+  fi
+
+  vgname=$(echo "$path" | awk -F'/' '{print $3}')
+  if [[ -z "$vgname" ]]
+  then
+    log "unable to derive VG name from path $path" 1
+    exit 1
+  fi
+
+  # Query PE size in bytes (strip trailing 'B' if present)
+  pe_size_raw=$(vgdisplay --units b -C --noheadings -o vg_extent_size "$vgname" 2>/dev/null | tr -d ' ')
+  pe_size_raw="${pe_size_raw%B}"
+  if [[ -z "$pe_size_raw" || ! "$pe_size_raw" =~ ^[0-9]+$ ]]
+  then
+    log "could not query PE size for VG $vgname, defaulting to 4MiB"
+    pe_size=$((4 * 1024 * 1024))
+  else
+    pe_size=$pe_size_raw
+  fi
+
+  # Calculate new LV size: newsize (virtual) + QCOW2 metadata overhead, rounded up to PE
+  # QCOW2 cluster size = 64KiB, L2 table covers 4096 clusters each
+  cluster_size=$((64 * 1024))
+  l2_multiplier=4096
+  num_data_clusters=$(( (newsize + cluster_size - 1) / cluster_size ))
+  num_l2_clusters=$(( (num_data_clusters + l2_multiplier - 1) / l2_multiplier ))
+  l2_table_size=$(( num_l2_clusters * cluster_size ))
+  refcount_table_size=$l2_table_size
+  header_overhead=$(( 2 * 1024 * 1024 ))
+  metadata_overhead=$(( l2_table_size + refcount_table_size + header_overhead ))
+  target_lv_size=$(( newsize + metadata_overhead ))
+  # Round up to PE boundary
+  lv_size=$(( ((target_lv_size + pe_size - 1) / pe_size) * pe_size ))
+  pe_aligned_newsize=$(( ((newsize + pe_size - 1) / pe_size) * pe_size ))
+
+  log "CLVM_NG resize: path=$path vg=$vgname pe_size=${pe_size}B virtual=${newsize}B pe_aligned_virtual=${pe_aligned_newsize}B metadata=${metadata_overhead}B lv_size=${lv_size}B"
+
+  # Use -U (force-share) if qemu-img >= 2.10 so we can read info even when
+  # QEMU has the file open with an exclusive lock (VM running case)
+  qemu_force_share_flag=""
+  regex=".*version\s([0-9]+)\.([0-9]+).*"
+  content=$(qemu-img --version | grep version)
+  if [[ $content =~ $regex ]]
+  then
+    ver_major="${BASH_REMATCH[1]}"
+    ver_minor="${BASH_REMATCH[2]}"
+    if [[ ${ver_major} -gt 2 ]] || [[ ${ver_major} -eq 2 && ${ver_minor} -ge 10 ]]
+    then
+      qemu_force_share_flag="-U"
+    fi
+  fi
+
+  actualsize=`qemu-img info $qemu_force_share_flag $path | grep "virtual size" | sed -re 's/^.*\(([0-9]+).*$/\1/g'`
+  if [[ -z "$actualsize" ]]
+  then
+    log "unable to determine current QCOW2 virtual size for $path" 1
+    exit 1
+  fi
+
+  if [ $actualsize -ne $currentsize ]
+  then
+    log "disk isn't the size we think it is: cloudstack said $currentsize, disk said $actualsize."
+  fi
+
+  # Shrink guard on virtual size
+  if [ $actualsize -gt $newsize ]
+  then
+    if [ "$shrink" == "false" ]
+    then
+      log "result would shrink the volume from $actualsize to $newsize, but shrink wasn't confirmed" 1
+      exit 1
+    fi
+  fi
+
+  # Step 1: resize the LV to accommodate new virtual size + overhead
+  output=`lvresize -f -L ${lv_size}B $path 2>&1`
+  retval=$?
+  if [ -z $retval ] || [ $retval -ne 0 ]
+  then
+    log "lvresize failed: $output" 1
+    exit 1
+  fi
+  log "lvresize succeeded: $path to ${lv_size}B"
+
+  # Step 2: resize the QCOW2 virtual disk.
+  # If the VM is running QEMU has the file open, calling qemu-img resize on an open file
+  # is unsafe. Instead use virsh blockresize which tells QEMU to resize the virtual disk
+  # safely from within. If the VM is stopped, qemu-img resize is safe to use directly.
+  if `virsh domstate $vmname >/dev/null 2>&1`
+  then
+    log "VM $vmname is running, using virsh blockresize for safe live QCOW2 resize"
+    sizeinkb=$(($pe_aligned_newsize/1024))
+    devicepath=$(virsh domblklist $vmname | grep $path | awk '{print $1}')
+    if [[ -z "$devicepath" ]]
+    then
+      log "could not find device alias for $path in VM $vmname domblklist" 1
+      exit 1
+    fi
+    output=`virsh blockresize --path $devicepath --size $sizeinkb $vmname 2>&1`
+    retval=$?
+    if [ -z $retval ] || [ $retval -ne 0 ]
+    then
+      log "virsh blockresize failed: $output" 1
+      exit 1
+    fi
+    liveresize='true'
+    log "virsh blockresize succeeded: $vmname $devicepath to ${sizeinkb}KiB virtual"
+  else
+    log "VM $vmname is not running, using qemu-img resize"
+    output=`qemu-img resize $path $pe_aligned_newsize 2>&1`
+    retval=$?
+    if [ -z $retval ] || [ $retval -ne 0 ]
+    then
+      log "qemu-img resize failed: $output" 1
+      exit 1
+    fi
+    log "qemu-img resize succeeded: $path to ${pe_aligned_newsize}B virtual"
+  fi
+
+  log "performed successful CLVM_NG resize - currentsize:$currentsize newsize:$newsize lv_size:$lv_size path:$path vmname:$vmname live:$liveresize shrink:$shrink"
+}
+
 resizeqcow2() {
 
    ##### sanity checks #####
@@ -271,6 +412,9 @@ shouldwelog=1 #set this to 1 while debugging to get output in /var/log/cloudstac
 if [ "$ptype" == "CLVM" ]
 then
   resizelvm
+elif [ "$ptype" == "CLVM_NG" ]
+then
+  resizeclvmng
 elif [ "$ptype" == "QCOW2" ]
 then
   resizeqcow2
diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/BaseAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/BaseAllocator.java
index 58fcc62cdc3..ad5726e0a01 100644
--- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/BaseAllocator.java
+++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/BaseAllocator.java
@@ -17,11 +17,13 @@
 package com.cloud.agent.manager.allocator.impl;
 
 import com.cloud.agent.manager.allocator.HostAllocator;
+import com.cloud.api.ApiDBUtils;
 import com.cloud.capacity.CapacityManager;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.offering.ServiceOffering;
+import com.cloud.storage.VMTemplateVO;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.AdapterBase;
 import org.apache.commons.collections.CollectionUtils;
@@ -69,6 +71,29 @@ public abstract class BaseAllocator extends AdapterBase implements HostAllocator
         clusterHosts.addAll(hostsWithTagRules);
     }
 
+    protected void filterHostsBasedOnGuestOsRules(VMTemplateVO vmTemplate, List<? extends Host> clusterHosts) {
+        if (clusterHosts.isEmpty()) {
+            logger.info("Will not filter hosts based on guest OS as there is no available hosts left to verify.");
+            return;
+        }
+
+        String templateGuestOSName = ApiDBUtils.getTemplateGuestOSName(vmTemplate);
+        List<HostVO> incompatibleHosts = hostDao.findHostsWithGuestOsRulesThatDidNotMatchOsOfGuestVm(templateGuestOSName);
+
+        if (incompatibleHosts.isEmpty()) {
+            logger.info("No incompatible hosts found with guest OS rules matching the VM guest OS [{}].", templateGuestOSName);
+            return;
+        }
+
+        logger.info("Found incompatible hosts {} with guest OS rules that did not match the VM guest OS [{}]. They will be removed from the suitable hosts list.",
+                incompatibleHosts, templateGuestOSName);
+        clusterHosts.removeAll(incompatibleHosts);
+
+        if (clusterHosts.isEmpty()) {
+            logger.info("After filtering by guest OS rules, no compatible hosts were found for VM with OS [{}].", templateGuestOSName);
+        }
+    }
+
     /**
      * Adds hosts with enough CPU capability and enough CPU capacity to the suitable hosts list.
      */
diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index 8b4ca318bf7..4bc34d8a5c6 100644
--- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -123,7 +123,7 @@ public class FirstFitAllocator extends BaseAllocator {
         String hostTagOnTemplate = template.getTemplateTag();
         String paramAsStringToLog = String.format("zone [%s], pod [%s], cluster [%s]", dcId, podId, clusterId);
 
-        List<HostVO> suitableHosts = retrieveHosts(vmProfile, type, (List<HostVO>) hosts, clusterId, podId, dcId, hostTagOnOffering, hostTagOnTemplate);
+        List<HostVO> suitableHosts = retrieveHosts(vmProfile, type, (List<HostVO>) hosts, template, clusterId, podId, dcId, hostTagOnOffering, hostTagOnTemplate);
 
         if (suitableHosts.isEmpty()) {
             logger.info("No suitable host found for VM [{}] in {}.", vmProfile, paramAsStringToLog);
@@ -137,8 +137,8 @@ public class FirstFitAllocator extends BaseAllocator {
         return allocateTo(vmProfile, plan, offering, template, avoid, suitableHosts, returnUpTo, considerReservedCapacity, account);
     }
 
-    protected List<HostVO> retrieveHosts(VirtualMachineProfile vmProfile, Type type, List<HostVO> hostsToFilter, Long clusterId, Long podId, long dcId, String hostTagOnOffering,
-                                         String hostTagOnTemplate) {
+    protected List<HostVO> retrieveHosts(VirtualMachineProfile vmProfile, Type type, List<HostVO> hostsToFilter, VMTemplateVO template,
+                                         Long clusterId, Long podId, long dcId, String hostTagOnOffering, String hostTagOnTemplate) {
         String haVmTag = (String) vmProfile.getParameter(VirtualMachineProfile.Param.HaTag);
         List<HostVO> clusterHosts;
 
@@ -159,6 +159,7 @@ public class FirstFitAllocator extends BaseAllocator {
         filterHostsWithUefiEnabled(type, vmProfile, clusterId, podId, dcId, clusterHosts);
 
         addHostsBasedOnTagRules(hostTagOnOffering, clusterHosts);
+        filterHostsBasedOnGuestOsRules(template, clusterHosts);
 
         return clusterHosts;
 
diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
index 96b4255b876..92fdaf7faf0 100644
--- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
+++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
@@ -42,7 +42,7 @@ public class RandomAllocator extends BaseAllocator {
     private ResourceManager _resourceMgr;
 
     protected List<Host> findSuitableHosts(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, ExcludeList avoid, List<? extends Host> hosts, int returnUpTo,
-                                         boolean considerReservedCapacity) {
+                                           boolean considerReservedCapacity) {
         if (type == Host.Type.Storage) {
             return null;
         }
@@ -115,6 +115,7 @@ public class RandomAllocator extends BaseAllocator {
         }
 
         addHostsBasedOnTagRules(offeringHostTag, availableHosts);
+        filterHostsBasedOnGuestOsRules(template, availableHosts);
 
         return availableHosts;
     }
diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java
index 1d00e9ec16b..d8b3c155ae8 100644
--- a/server/src/main/java/com/cloud/api/ApiDBUtils.java
+++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java
@@ -31,6 +31,7 @@ import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import com.cloud.cpu.CPU;
+import com.cloud.storage.GuestOSVO;
 import org.apache.cloudstack.acl.Role;
 import org.apache.cloudstack.acl.RoleService;
 import org.apache.cloudstack.affinity.AffinityGroup;
@@ -2345,4 +2346,15 @@ public class ApiDBUtils {
     public static List<CPU.CPUArch> listZoneClustersArchs(long zoneId) {
         return s_clusterDao.getClustersArchsByZone(zoneId);
     }
+
+    public static String getTemplateGuestOSName(VMTemplateVO template) {
+        long guestOSId = template.getGuestOSId();
+        GuestOSVO guestOS = s_guestOSDao.findById(guestOSId);
+
+        if (guestOS == null) {
+            return null;
+        }
+
+        return guestOS.getDisplayName();
+    }
 }
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index a8551b4c669..8c51d992684 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -4759,6 +4759,7 @@ public class ApiResponseHelper implements ResponseGenerator, ResourceIdSupport {
         setResponseIpAddress(result, response);
         response.setNicId(nic.getUuid());
         response.setNwId(network.getUuid());
+        response.setDescription(result.getDescription());
         response.setObjectName("nicsecondaryip");
         return response;
     }
@@ -4845,6 +4846,7 @@ public class ApiResponseHelper implements ResponseGenerator, ResourceIdSupport {
                 for (NicSecondaryIpVO ip : secondaryIps) {
                     NicSecondaryIpResponse ipRes = new NicSecondaryIpResponse();
                     ipRes.setId(ip.getUuid());
+                    ipRes.setDescription(ip.getDescription());
                     setResponseIpAddress(ip, ipRes);
                     ipList.add(ipRes);
                 }
diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
index 0200dec2cd3..b7464ba987c 100644
--- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
@@ -225,6 +225,7 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
                 hostResponse.setHaHost(containsHostHATag(hostTags));
                 hostResponse.setExplicitHostTags(host.getExplicitTag());
                 hostResponse.setImplicitHostTags(host.getImplicitTag());
+                hostResponse.setGuestOsRule(host.getGuestOsRule());
 
                 hostResponse.setHypervisorVersion(host.getHypervisorVersion());
                 if (host.getArch() != null) {
diff --git a/server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
index a9d5b726b86..946e3df4e90 100644
--- a/server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import com.cloud.storage.clvm.ClvmPoolManager;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
@@ -35,7 +36,7 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.utils.jsinterpreter.TagAsRuleHelper;
+import org.apache.cloudstack.utils.jsinterpreter.GenericRuleHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.stereotype.Component;
@@ -183,7 +184,11 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
         poolResponse.setTags(pool.getTag());
         poolResponse.setStorageAccessGroups(pool.getStorageAccessGroup());
         poolResponse.setIsTagARule(pool.getIsTagARule());
-        poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));
+        if (ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            poolResponse.setOverProvisionFactor(String.valueOf(1));
+        } else {
+            poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));
+        }
         poolResponse.setManaged(storagePool.isManaged());
         Map<String, String> details = ApiDBUtils.getResourceDetails(pool.getId(), ResourceTag.ResourceObjectType.Storage);
         poolResponse.setDetails(details);
@@ -274,7 +279,11 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
             }
         }
 
-        poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));
+        if (ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            poolResponse.setOverProvisionFactor(String.valueOf(1));
+        } else {
+            poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));
+        }
 
         // TODO: StatsCollector does not persist data
         StorageStats stats = ApiDBUtils.getStoragePoolStatistics(pool.getId());
@@ -401,7 +410,8 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase<StoragePoolJoinVO, Lo
         String injectableTag = injectableTagsBuilder.toString();
 
         for (StoragePoolJoinVO storagePoolJoinVO : storagePools) {
-            if (TagAsRuleHelper.interpretTagAsRule(storagePoolJoinVO.getTag(), injectableTag, VolumeApiServiceImpl.storageTagRuleExecutionTimeout.value())) {
+            if (GenericRuleHelper.interpretTagAsRule(storagePoolJoinVO.getTag(), injectableTag, VolumeApiServiceImpl.storageTagRuleExecutionTimeout.value(),
+                    VolumeApiServiceImpl.storageTagRuleExecutionTimeout.key())) {
                 StoragePoolVO storagePoolVO = storagePoolDao.findById(storagePoolJoinVO.getId());
                 if (storagePoolVO != null) {
                     filteredPools.add(storagePoolVO);
diff --git a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index 39cca06c100..aeb54de1290 100644
--- a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -39,6 +39,7 @@ import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiConstants.VMDetails;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.response.AttachedIsoResponse;
 import org.apache.cloudstack.api.response.NicExtraDhcpOptionResponse;
 import org.apache.cloudstack.api.response.NicResponse;
 import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
@@ -62,6 +63,11 @@ import com.cloud.gpu.GPU;
 import com.cloud.gpu.dao.VgpuProfileDao;
 import com.cloud.host.ControlState;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.host.DetailVO;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.network.IpAddress;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.VpcDao;
@@ -72,6 +78,7 @@ import com.cloud.storage.GuestOS;
 import com.cloud.storage.Storage.TemplateType;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.VnfTemplateDetailVO;
+import com.cloud.template.TemplateManager;
 import com.cloud.storage.VnfTemplateNicVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.dao.VMTemplateDao;
@@ -93,10 +100,12 @@ import com.cloud.vm.UserVmManager;
 import com.cloud.vm.VMInstanceDetailVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.VmIsoMapVO;
 import com.cloud.vm.VmStats;
 import com.cloud.vm.dao.NicExtraDhcpOptionDao;
 import com.cloud.vm.dao.NicSecondaryIpVO;
 import com.cloud.vm.dao.VMInstanceDetailsDao;
+import com.cloud.vm.dao.VmIsoMapDao;
 
 @Component
 public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJoinVO, UserVmResponse> implements UserVmJoinDao {
@@ -130,6 +139,12 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
     @Inject
     VMTemplateDao vmTemplateDao;
     @Inject
+    VmIsoMapDao vmIsoMapDao;
+    @Inject
+    HostDetailsDao hostDetailsDao;
+    @Inject
+    HostDao hostDao;
+    @Inject
     ExtensionHelper extensionHelper;
 
     private final SearchBuilder<UserVmJoinVO> VmDetailSearch;
@@ -246,6 +261,23 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
             userVmResponse.setIsoId(userVm.getIsoUuid());
             userVmResponse.setIsoName(userVm.getIsoName());
             userVmResponse.setIsoDisplayText(userVm.getIsoDisplayText());
+
+            List<AttachedIsoResponse> attachedIsos = new ArrayList<>();
+            if (userVm.getIsoUuid() != null) {
+                VMTemplateVO bootIso = vmTemplateDao.findById(userVm.getIsoId());
+                boolean bootIsoBootable = bootIso != null && bootIso.isBootable();
+                attachedIsos.add(new AttachedIsoResponse(userVm.getIsoUuid(), userVm.getIsoName(),
+                        userVm.getIsoDisplayText(), TemplateManager.CDROM_PRIMARY_DEVICE_SEQ, bootIsoBootable));
+            }
+            for (VmIsoMapVO row : vmIsoMapDao.listByVmId(userVm.getId())) {
+                VMTemplateVO tmpl = vmTemplateDao.findById(row.getIsoId());
+                if (tmpl != null) {
+                    attachedIsos.add(new AttachedIsoResponse(tmpl.getUuid(), tmpl.getName(),
+                            tmpl.getDisplayText(), row.getDeviceSeq(), false));
+                }
+            }
+            userVmResponse.setIsos(attachedIsos);
+            userVmResponse.setIsoMaxCount(effectiveCdromMaxCount(userVm));
         }
         if (details.contains(VMDetails.all) || details.contains(VMDetails.servoff)) {
             userVmResponse.setServiceOfferingId(userVm.getServiceOfferingUuid());
@@ -388,6 +420,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
                     for (NicSecondaryIpVO ip : secondaryIps) {
                         NicSecondaryIpResponse ipRes = new NicSecondaryIpResponse();
                         ipRes.setId(ip.getUuid());
+                        ipRes.setDescription(ip.getDescription());
                         ApiResponseHelper.setResponseIpAddress(ip, ipRes);
                         ipList.add(ipRes);
                     }
@@ -539,6 +572,44 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
         return ChronoUnit.DAYS.between(createdDate, expiryDate);
     }
 
+    int effectiveCdromMaxCount(UserVmJoinVO userVm) {
+        Long hostId = userVm.getHostId() != null && userVm.getHostId() > 0
+                ? userVm.getHostId() : userVm.getLastHostId();
+        if (hostId == null && userVm.getHypervisorType() != null) {
+            List<HostVO> candidates = hostDao.listByDataCenterIdAndHypervisorType(userVm.getDataCenterId(), userVm.getHypervisorType());
+            if (!candidates.isEmpty()) {
+                hostId = candidates.get(0).getId();
+            }
+        }
+        Long clusterId = userVm.getClusterId();
+        if (clusterId == null && hostId != null) {
+            HostVO host = hostDao.findById(hostId);
+            if (host != null) {
+                clusterId = host.getClusterId();
+            }
+        }
+        int configuredCap = TemplateManager.VmIsoMaxCount.valueIn(clusterId);
+        int hypervisorCap = advertisedCdromCap(hostId);
+        // List endpoint clamps for display robustness; the action paths in TemplateManagerImpl
+        // throw on misconfiguration so operators still see the loud error when they try to attach.
+        return Math.min(configuredCap, hypervisorCap);
+    }
+
+    int advertisedCdromCap(Long hostId) {
+        if (hostId == null) {
+            return TemplateManager.DEFAULT_CDROM_MAX_PER_VM;
+        }
+        DetailVO detail = hostDetailsDao.findDetail(hostId, Host.HOST_CDROM_MAX_COUNT);
+        if (detail == null || detail.getValue() == null) {
+            return TemplateManager.DEFAULT_CDROM_MAX_PER_VM;
+        }
+        try {
+            return Integer.parseInt(detail.getValue());
+        } catch (NumberFormatException e) {
+            return TemplateManager.DEFAULT_CDROM_MAX_PER_VM;
+        }
+    }
+
     private void addVnfInfoToserVmResponse(UserVmJoinVO userVm, UserVmResponse userVmResponse) {
         List<VnfTemplateNicVO> vnfNics = vnfTemplateNicDao.listByTemplateId(userVm.getTemplateId());
         for (VnfTemplateNicVO nic : vnfNics) {
diff --git a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index a92427ca19f..94d06b2ed6b 100644
--- a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -22,6 +22,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import com.cloud.storage.clvm.ClvmPoolManager;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
@@ -134,7 +135,11 @@ public class VolumeJoinDaoImpl extends GenericDaoBaseWithTagInformation<VolumeJo
         }
 
         if (volume.getProvisioningType() != null) {
-            volResponse.setProvisioningType(volume.getProvisioningType().toString());
+            Long poolId = volume.getPoolId();
+            StoragePoolVO poolVO = primaryDataStoreDao.findById(poolId);
+            if (poolVO == null || !ClvmPoolManager.isClvmPoolType(poolVO.getPoolType())) {
+                volResponse.setProvisioningType(volume.getProvisioningType().toString());
+            }
         }
 
         // Show the virtual size of the volume
diff --git a/server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java
index 83cfcc8375f..24ab5291a42 100644
--- a/server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java
@@ -173,6 +173,9 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
     @Column(name = "guest_os_category_name")
     private String osCategoryName;
 
+    @Column(name = "guest_os_rule")
+    private String guestOsRule;
+
     @Column(name = "tag")
     private String tag;
 
@@ -373,6 +376,10 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
         return osCategoryName;
     }
 
+    public String getGuestOsRule() {
+        return guestOsRule;
+    }
+
     public Long getJobId() {
         return jobId;
     }
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index ad31cfbaef9..6889d33c5c8 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -143,7 +143,7 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.userdata.UserDataManager;
-import org.apache.cloudstack.utils.jsinterpreter.TagAsRuleHelper;
+import org.apache.cloudstack.utils.jsinterpreter.GenericRuleHelper;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.apache.cloudstack.vm.UnmanagedVMsManager;
 import org.apache.cloudstack.vm.lease.VMLeaseManager;
@@ -5115,7 +5115,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
 
                     if ((CollectionUtils.isNotEmpty(tagsAsString) && tagsAsString.containsAll(listOfTags)) ||
                         (tagsOnPool.size() == 1 && tagsOnPool.get(0).isTagARule() &&
-                        TagAsRuleHelper.interpretTagAsRule(tagsOnPool.get(0).getTag(), tags, VolumeApiServiceImpl.storageTagRuleExecutionTimeout.value()))) {
+                        GenericRuleHelper.interpretTagAsRule(tagsOnPool.get(0).getTag(), tags, VolumeApiServiceImpl.storageTagRuleExecutionTimeout.value(),
+                                VolumeApiServiceImpl.storageTagRuleExecutionTimeout.key()))) {
                         continue;
                     }
 
@@ -5158,7 +5159,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
 
                     if ((CollectionUtils.isNotEmpty(tagsAsString) && tagsAsString.containsAll(listOfHostTags)) ||
                         (tagsOnHost.size() == 1 && tagsOnHost.get(0).getIsTagARule() &&
-                        TagAsRuleHelper.interpretTagAsRule(tagsOnHost.get(0).getTag(), hostTags, HostTagsDao.hostTagRuleExecutionTimeout.value()))) {
+                        GenericRuleHelper.interpretTagAsRule(tagsOnHost.get(0).getTag(), hostTags, HostTagsDao.hostTagRuleExecutionTimeout.value(),
+                                HostTagsDao.hostTagRuleExecutionTimeout.key()))) {
                         continue;
                     }
 
diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 7fb4a97e149..2eaa44af1b0 100644
--- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -35,6 +35,7 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.api.ApiDBUtils;
 import com.cloud.gpu.dao.VgpuProfileDao;
 import com.cloud.resource.ResourceState;
 import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO;
@@ -805,18 +806,49 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
                 return false;
             }
         }
+
+        DetailVO guestOsRule = _hostDetailsDao.findDetail(host.getId(), HostVO.GUEST_OS_RULE);
+        if (guestOsRule != null) {
+            return isHostGuestOsCompatible(vmProfile, host, guestOsRule);
+        }
+
+        DetailVO guestOsCategoryId = _hostDetailsDao.findDetail(host.getId(), HostVO.GUEST_OS_CATEGORY_ID);
+        if (guestOsCategoryId != null) {
+            return isHostGuestOsCategoryCompatible(vmProfile, host, guestOsCategoryId);
+        }
+
+        return true;
+    }
+
+    private boolean isHostGuestOsCategoryCompatible(VirtualMachineProfile vmProfile, HostVO host, DetailVO guestOsCategoryId) {
         long guestOSId = vmProfile.getTemplate().getGuestOSId();
         GuestOSVO guestOS = _guestOSDao.findById(guestOSId);
-        if (guestOS != null) {
-            long guestOSCategoryId = guestOS.getCategoryId();
-            DetailVO hostDetail = _hostDetailsDao.findDetail(host.getId(), "guest.os.category.id");
-            if (hostDetail != null) {
-                String guestOSCategoryIdString = hostDetail.getValue();
-                if (String.valueOf(guestOSCategoryId) != guestOSCategoryIdString) {
-                    logger.debug("The last host has different guest.os.category.id than guest os category of VM, skipping");
-                    return false;
-                }
-            }
+
+        if (guestOS == null) {
+            return true;
+        }
+
+        long guestOSCategoryId = guestOS.getCategoryId();
+        String guestOSCategoryIdString = guestOsCategoryId.getValue();
+        if (!String.valueOf(guestOSCategoryId).equals(guestOSCategoryIdString)) {
+            logger.debug("The last host has different `{}` than guest os category of VM, skipping", Host.GUEST_OS_CATEGORY_ID);
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean isHostGuestOsCompatible(VirtualMachineProfile vmProfile, HostVO host, DetailVO guestOsRule) {
+        VMTemplateVO template = (VMTemplateVO) vmProfile.getTemplate();
+        String templateGuestOSName = ApiDBUtils.getTemplateGuestOSName(template);
+
+        List<HostVO> incompatibleHosts = _hostDao.findHostsWithGuestOsRulesThatDidNotMatchOsOfGuestVm(templateGuestOSName);
+
+        boolean isHostCompatible = incompatibleHosts.stream().noneMatch(incompatibleHost -> incompatibleHost.getId() == host.getId());
+
+        if (!isHostCompatible) {
+            logger.debug("The template [{}] is incompatible with the host [{}] due to the guest OS rule [{}].", template, host, guestOsRule);
+            return false;
         }
         return true;
     }
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index d18fd043f69..387fd6e4058 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -891,7 +891,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
      */
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_NIC_SECONDARY_IP_ASSIGN, eventDescription = "Assigning secondary IP to NIC", create = true)
-    public NicSecondaryIp allocateSecondaryGuestIP(final long nicId, IpAddresses requestedIpPair) throws InsufficientAddressCapacityException {
+    public NicSecondaryIp allocateSecondaryGuestIP(final long nicId, IpAddresses requestedIpPair, String description) throws InsufficientAddressCapacityException {
 
         Account caller = CallContext.current().getCallingAccount();
         String ipv4Address = requestedIpPair.getIp4Address();
@@ -989,7 +989,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
 
                     logger.debug("Setting nic_secondary_ip table ...");
                     Long vmId = nicVO.getInstanceId();
-                    NicSecondaryIpVO secondaryIpVO = new NicSecondaryIpVO(nicId, ip4AddrFinal, ip6AddrFinal, vmId, ipOwner.getId(), ipOwner.getDomainId(), networkId);
+                    NicSecondaryIpVO secondaryIpVO = new NicSecondaryIpVO(nicId, ip4AddrFinal, ip6AddrFinal, vmId, ipOwner.getId(), ipOwner.getDomainId(), networkId, description);
                     _nicSecondaryIpDao.persist(secondaryIpVO);
                     return secondaryIpVO.getId();
                 }
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManager.java b/server/src/main/java/com/cloud/network/as/AutoScaleManager.java
index eec1eec2ff1..cb1c577b934 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManager.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManager.java
@@ -48,6 +48,8 @@ public interface AutoScaleManager extends AutoScaleService {
 
     void checkAutoScaleUser(Long autoscaleUserId, long accountId);
 
+    void validateMinMaxMembers(int minMembers, int maxMembers);
+
     boolean deleteAutoScaleVmGroupsByAccount(Account account);
 
     void cleanUpAutoScaleResources(Account account);
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
index 805ac4aed86..4ccd4ee0665 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -73,6 +73,7 @@ import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 import org.apache.cloudstack.userdata.UserDataManager;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -285,6 +286,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
     private VirtualMachineManager virtualMachineManager;
     @Inject
     GuestOSDao guestOSDao;
+    @Inject
+    private ResourceScheduleManager resourceScheduleManager;
 
     private static final String PARAM_ROOT_DISK_SIZE = "rootdisksize";
     private static final String PARAM_DISK_OFFERING_ID = "diskofferingid";
@@ -1098,7 +1101,11 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
 
         if (autoScaleVmGroupVO.getState().equals(AutoScaleVmGroup.State.NEW)) {
             /* This condition is for handling failures during creation command */
-            return autoScaleVmGroupDao.remove(id);
+            boolean removed = autoScaleVmGroupDao.remove(id);
+            if (removed) {
+                resourceScheduleManager.removeSchedulesForResource(ApiCommandResourceType.AutoScaleVmGroup, id);
+            }
+            return removed;
         }
 
         if (!autoScaleVmGroupVO.getState().equals(AutoScaleVmGroup.State.DISABLED) && !Boolean.TRUE.equals(cleanup)) {
@@ -1168,6 +1175,8 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
                     return false;
                 }
 
+                resourceScheduleManager.removeSchedulesForResource(ApiCommandResourceType.AutoScaleVmGroup, id);
+
                 logger.info("Successfully deleted autoscale vm group: {}", autoScaleVmGroupVO);
                 return success; // Successfull
             }
@@ -1231,6 +1240,22 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
         return searchWrapper.search();
     }
 
+    @Override
+    public void validateMinMaxMembers(int minMembers, int maxMembers) {
+        if (minMembers <= 0) {
+            throw new InvalidParameterValueException(ApiConstants.MIN_MEMBERS + " is an invalid value: " + minMembers);
+        }
+
+        if (maxMembers <= 0) {
+            throw new InvalidParameterValueException(ApiConstants.MAX_MEMBERS + " is an invalid value: " + maxMembers);
+        }
+
+        if (minMembers > maxMembers) {
+            throw new InvalidParameterValueException(ApiConstants.MIN_MEMBERS + " (" + minMembers +
+                    ") cannot be greater than " + ApiConstants.MAX_MEMBERS + " (" + maxMembers + ")");
+        }
+    }
+
     @DB
     protected AutoScaleVmGroupVO checkValidityAndPersist(final AutoScaleVmGroupVO vmGroup, final List<Long> passedScaleUpPolicyIds,
         final List<Long> passedScaleDownPolicyIds) {
@@ -1249,18 +1274,7 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
             ApiDBUtils.getAutoScaleVmGroupPolicyIds(vmGroup.getId(), currentScaleUpPolicyIds, currentScaleDownPolicyIds);
         }
 
-        if (minMembers <= 0) {
-            throw new InvalidParameterValueException(ApiConstants.MIN_MEMBERS + " is an invalid value: " + minMembers);
-        }
-
-        if (maxMembers <= 0) {
-            throw new InvalidParameterValueException(ApiConstants.MAX_MEMBERS + " is an invalid value: " + maxMembers);
-        }
-
-        if (minMembers > maxMembers) {
-            throw new InvalidParameterValueException(ApiConstants.MIN_MEMBERS + " (" + minMembers + ")cannot be greater than " + ApiConstants.MAX_MEMBERS + " (" +
-                maxMembers + ")");
-        }
+        validateMinMaxMembers(minMembers, maxMembers);
 
         if (interval <= 0) {
             throw new InvalidParameterValueException("interval is an invalid value: " + interval);
@@ -1341,10 +1355,10 @@ public class AutoScaleManagerImpl extends ManagerBase implements AutoScaleManage
         AutoScaleVmGroupVO vmGroupVO = getEntityInDatabase(CallContext.current().getCallingAccount(), "AutoScale Vm Group", vmGroupId, autoScaleVmGroupDao);
         int currentInterval = vmGroupVO.getInterval();
 
-        boolean physicalParametersUpdate = (minMembers != null || maxMembers != null || (interval != null && interval != currentInterval) || CollectionUtils.isNotEmpty(scaleUpPolicyIds) || CollectionUtils.isNotEmpty(scaleDownPolicyIds));
+        boolean physicalParametersUpdate = ((interval != null && interval != currentInterval) || CollectionUtils.isNotEmpty(scaleUpPolicyIds) || CollectionUtils.isNotEmpty(scaleDownPolicyIds));
 
         if (physicalParametersUpdate && !vmGroupVO.getState().equals(AutoScaleVmGroup.State.DISABLED)) {
-            throw new InvalidParameterValueException("An AutoScale Vm Group can be updated with minMembers/maxMembers/Interval only when it is in disabled state");
+            throw new InvalidParameterValueException("An AutoScale Vm Group can be updated with Interval/Policies only when it is in disabled state");
         }
 
         if (StringUtils.isNotBlank(name)) {
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index 0f6933664f9..8db55790fd8 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -84,8 +84,8 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
@@ -2046,31 +2046,74 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         _hostDao.update(host.getId(), host);
     }
 
-    private void updateHostGuestOSCategory(Long hostId, Long guestOSCategoryId) {
-        // Verify that the guest OS Category exists
-        if (!(guestOSCategoryId > 0) || _guestOSCategoryDao.findById(guestOSCategoryId) == null) {
+    /**
+     * Updates the guest OS details related to the host ({@code guest.os.rule} and {@code guest.os.category.id}); only one can be set at a time for a given host.
+     */
+    private void updateGuestOsRelatedFields(Long hostId, Long cmdOsCategoryId, String cmdGuestOsRule) {
+        if (ObjectUtils.allNotNull(cmdOsCategoryId, cmdGuestOsRule)) {
+            throw new InvalidParameterValueException("Informing both guest OS category and guest OS rule is invalid; please, inform only one of them.");
+        }
+
+        if (cmdOsCategoryId != null) {
+            updateHostCategoryOs(hostId, cmdOsCategoryId);
+        } else if (cmdGuestOsRule != null) {
+            updateHostGuestOsRule(hostId, cmdGuestOsRule);
+        }
+    }
+
+    /**
+     * Associates/removes a guest OS rule to a host and removes any guest OS category associated with it.
+     */
+    private void updateHostGuestOsRule(Long hostId, String cmdGuestOsRule) {
+        final DetailVO hostGuestOsRule = _hostDetailsDao.findDetail(hostId, Host.GUEST_OS_RULE);
+
+        if (StringUtils.isNotBlank(cmdGuestOsRule)) {
+            createOrUpdateHostDetails(hostGuestOsRule, cmdGuestOsRule, Host.GUEST_OS_RULE, hostId);
+        } else if (hostGuestOsRule != null) {
+            _hostDetailsDao.remove(hostGuestOsRule.getId());
+        }
+        removeHostDetails(hostId, Host.GUEST_OS_CATEGORY_ID);
+    }
+
+    /**
+     * Removes a host details if it exists.
+     */
+    private void removeHostDetails(Long hostId, String detailString) {
+        DetailVO detailVO = _hostDetailsDao.findDetail(hostId, detailString);
+
+        if (detailVO != null) {
+            _hostDetailsDao.remove(detailVO.getId());
+        }
+    }
+
+    private void createOrUpdateHostDetails(DetailVO hostDetail, String detailValue, String detailName, Long hostId) {
+        if (hostDetail != null) {
+            hostDetail.setValue(detailValue);
+            _hostDetailsDao.update(hostDetail.getId(), hostDetail);
+        } else {
+            Map<String, String> detail = new HashMap<>();
+            detail.put(detailName, detailValue);
+            _hostDetailsDao.persist(hostId, detail);
+        }
+    }
+
+    /**
+     * Associates/removes a valid guest OS category to a host and removes any guest OS rules associated with it.
+     */
+    private void updateHostCategoryOs(Long hostId, Long cmdOsCategoryId) {
+        if (cmdOsCategoryId <= 0 || _guestOSCategoryDao.findById(cmdOsCategoryId) == null) {
             throw new InvalidParameterValueException("Please specify a valid guest OS category.");
         }
 
-        final GuestOSCategoryVO guestOSCategory = _guestOSCategoryDao.findById(guestOSCategoryId);
-        final DetailVO guestOSDetail = _hostDetailsDao.findDetail(hostId, "guest.os.category.id");
+        GuestOSCategoryVO guestOSCategory = _guestOSCategoryDao.findById(cmdOsCategoryId);
+        DetailVO guestOSDetail = _hostDetailsDao.findDetail(hostId, Host.GUEST_OS_CATEGORY_ID);
 
         if (guestOSCategory != null && !GuestOSCategoryVO.CATEGORY_NONE.equalsIgnoreCase(guestOSCategory.getName())) {
-            // Create/Update an entry for guest.os.category.id
-            if (guestOSDetail != null) {
-                guestOSDetail.setValue(String.valueOf(guestOSCategory.getId()));
-                _hostDetailsDao.update(guestOSDetail.getId(), guestOSDetail);
-            } else {
-                final Map<String, String> detail = new HashMap<>();
-                detail.put("guest.os.category.id", String.valueOf(guestOSCategory.getId()));
-                _hostDetailsDao.persist(hostId, detail);
-            }
-        } else {
-            // Delete any existing entry for guest.os.category.id
-            if (guestOSDetail != null) {
-                _hostDetailsDao.remove(guestOSDetail.getId());
-            }
+            createOrUpdateHostDetails(guestOSDetail, String.valueOf(guestOSCategory.getId()), Host.GUEST_OS_CATEGORY_ID, hostId);
+        } else if (guestOSDetail != null) {
+            _hostDetailsDao.remove(guestOSDetail.getId());
         }
+        removeHostDetails(hostId, Host.GUEST_OS_RULE);
     }
 
     private void removeStorageAccessGroupsOnPodsInZone(long zoneId, List<String> newStoragePoolTags, List<String> tagsToDeleteOnZone) {
@@ -2821,16 +2864,17 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 
     @Override
     public Host updateHost(final UpdateHostCmd cmd) throws NoTransitionException {
-        return updateHost(cmd.getId(), cmd.getName(), cmd.getOsCategoryId(),
+        return updateHost(cmd.getId(), cmd.getName(), cmd.getOsCategoryId(), cmd.getGuestOsRule(),
                 cmd.getAllocationState(), cmd.getUrl(), cmd.getHostTags(), cmd.getIsTagARule(), cmd.getAnnotation(), false,
                 cmd.getExternalDetails(), cmd.isCleanupExternalDetails());
     }
 
-    private Host updateHost(Long hostId, String name, Long guestOSCategoryId, String allocationState,
+    private Host updateHost(Long hostId, String name, Long guestOSCategoryId, String guestOsRule, String allocationState,
             String url, List<String> hostTags, Boolean isTagARule, String annotation,
             boolean isUpdateFromHostHealthCheck, Map<String, String> externalDetails,
             boolean cleanupExternalDetails) throws NoTransitionException {
         jsInterpreterHelper.ensureInterpreterEnabledIfParameterProvided(ApiConstants.IS_TAG_A_RULE, Boolean.TRUE.equals(isTagARule));
+        jsInterpreterHelper.ensureInterpreterEnabledIfParameterProvided(ApiConstants.GUEST_OS_RULE, guestOsRule != null);
 
         // Verify that the host exists
         final HostVO host = _hostDao.findById(hostId);
@@ -2847,9 +2891,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             updateHostName(host, name);
         }
 
-        if (guestOSCategoryId != null) {
-            updateHostGuestOSCategory(hostId, guestOSCategoryId);
-        }
+        updateGuestOsRelatedFields(hostId, guestOSCategoryId, guestOsRule);
 
         if (hostTags != null) {
             updateHostTags(host, hostId, hostTags, isTagARule);
@@ -2919,7 +2961,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 
     @Override
     public Host autoUpdateHostAllocationState(Long hostId, ResourceState.Event resourceEvent) throws NoTransitionException {
-        return updateHost(hostId, null, null, resourceEvent.toString(), null, null, null, null, true, null, false);
+        return updateHost(hostId, null, null, null, resourceEvent.toString(), null, null, null, null, true, null, false);
     }
 
     @Override
@@ -3639,7 +3681,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
         // If the server's private IP is the same as is public IP, this host has
         // a host-only private network. Don't check for conflicts with the
         // private IP address table.
-        if (!ObjectUtils.equals(serverPrivateIP, serverPublicIP)) {
+        if (!StringUtils.equals(serverPrivateIP, serverPublicIP)) {
             if (!_privateIPAddressDao.mark(dc.getId(), pod.getId(), serverPrivateIP)) {
                 // If the server's private IP address is already in the
                 // database, return false
@@ -4284,7 +4326,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             return null;
         } else {
             _hostDao.loadDetails(host);
-            final DetailVO detail = _hostDetailsDao.findDetail(hostId, "guest.os.category.id");
+            final DetailVO detail = _hostDetailsDao.findDetail(hostId, Host.GUEST_OS_CATEGORY_ID);
             if (detail == null) {
                 return null;
             } else {
diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index 7c501c78bee..058f1cbc2cd 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -1058,6 +1058,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
         params.put("managed", cmd.isManaged());
         params.put("capacityBytes", cmd.getCapacityBytes());
         params.put("capacityIops", cmd.getCapacityIops());
+        params.put("scheme", uriParams.get("scheme"));
         if (MapUtils.isNotEmpty(uriParams)) {
             params.putAll(uriParams);
         }
@@ -1143,6 +1144,10 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
             if (isHostOrPathBlank) {
                 throw new InvalidParameterValueException("host or path is null, should be gluster://hostname/volume");
             }
+        } else if (scheme.equalsIgnoreCase("clvm") || scheme.equalsIgnoreCase("clvm_ng")) {
+            if (storagePath == null) {
+                throw new InvalidParameterValueException("path is null, should be " + scheme.toLowerCase() + "://localhost/volume-group-name");
+            }
         }
 
         String hostPath = null;
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index afe16c2b574..1bb8c8ee0db 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -35,6 +35,7 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
+import com.cloud.storage.clvm.ClvmPoolManager;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.InternalIdentity;
@@ -112,7 +113,7 @@ import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
 import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
-import org.apache.cloudstack.utils.jsinterpreter.TagAsRuleHelper;
+import org.apache.cloudstack.utils.jsinterpreter.GenericRuleHelper;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
 import org.apache.commons.collections.CollectionUtils;
@@ -370,6 +371,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
     @Inject
     EndPointSelector _epSelector;
     @Inject
+    ClvmPoolManager clvmPoolManager;
+    @Inject
     private ReservationDao reservationDao;
     @Inject
     private VMSnapshotDetailsDao vmSnapshotDetailsDao;
@@ -1836,6 +1839,11 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             if (DataStoreRole.Image.equals(role)) {
                 _resourceLimitMgr.decrementResourceCount(volOnStorage.getAccountId(), ResourceType.secondary_storage, volOnStorage.getSize());
             }
+
+            // Clean up CLVM lock host tracking detail after successful deletion from primary storage
+            if (DataStoreRole.Primary.equals(role)) {
+                clvmPoolManager.clearClvmLockHostDetail(volume);
+            }
         }
     }
 
@@ -2738,21 +2746,42 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             logger.trace(String.format("is it needed to move the volume: %b?", moveVolumeNeeded));
         }
 
-        if (moveVolumeNeeded) {
+        // Check if CLVM lock transfer is needed (even if moveVolumeNeeded is false)
+        // This handles the case where the volume is already on the correct storage pool
+        // but the VM is running on a different host, requiring only a lock transfer
+        boolean isClvmLockTransferNeeded = !moveVolumeNeeded &&
+                isClvmLockTransferRequired(newVolumeOnPrimaryStorage, existingVolumeOfVm, vm);
+
+        if (isClvmLockTransferNeeded) {
+            // CLVM lock transfer - no data copy, no pool change needed
+            newVolumeOnPrimaryStorage = executeLightweightLockMigration(
+                    newVolumeOnPrimaryStorage, vm, existingVolumeOfVm,
+                    "CLVM lock transfer", "same pool to different host");
+        } else if (moveVolumeNeeded) {
             PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)newVolumeOnPrimaryStorage.getDataStore();
             if (primaryStore.isLocal()) {
                 throw new CloudRuntimeException(
                         "Failed to attach local data volume " + volumeToAttach.getName() + " to VM " + vm.getDisplayName() + " as migration of local data volume is not allowed");
             }
-            StoragePoolVO vmRootVolumePool = _storagePoolDao.findById(existingVolumeOfVm.getPoolId());
 
-            try {
-                HypervisorType volumeToAttachHyperType = _volsDao.getHypervisorType(volumeToAttach.getId());
-                newVolumeOnPrimaryStorage = _volumeMgr.moveVolume(newVolumeOnPrimaryStorage, vmRootVolumePool.getDataCenterId(), vmRootVolumePool.getPodId(), vmRootVolumePool.getClusterId(),
-                        volumeToAttachHyperType);
-            } catch (ConcurrentOperationException | StorageUnavailableException e) {
-                logger.debug("move volume failed", e);
-                throw new CloudRuntimeException("move volume failed", e);
+            boolean isClvmLightweightMigration = isClvmLightweightMigrationNeeded(
+                    newVolumeOnPrimaryStorage, existingVolumeOfVm);
+
+            if (isClvmLightweightMigration) {
+                newVolumeOnPrimaryStorage = executeLightweightLockMigration(
+                        newVolumeOnPrimaryStorage, vm, existingVolumeOfVm,
+                        "CLVM lightweight migration", "different pools, same VG");
+            } else {
+                StoragePoolVO vmRootVolumePool = _storagePoolDao.findById(existingVolumeOfVm.getPoolId());
+
+                try {
+                    HypervisorType volumeToAttachHyperType = _volsDao.getHypervisorType(volumeToAttach.getId());
+                    newVolumeOnPrimaryStorage = _volumeMgr.moveVolume(newVolumeOnPrimaryStorage, vmRootVolumePool.getDataCenterId(), vmRootVolumePool.getPodId(), vmRootVolumePool.getClusterId(),
+                            volumeToAttachHyperType);
+                } catch (ConcurrentOperationException | StorageUnavailableException e) {
+                    logger.debug("move volume failed", e);
+                    throw new CloudRuntimeException("move volume failed", e);
+                }
             }
         }
         VolumeVO newVol = _volsDao.findById(newVolumeOnPrimaryStorage.getId());
@@ -2767,6 +2796,183 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
         return newVol;
     }
 
+    /**
+     * Helper method to get storage pools for volume and VM.
+     *
+     * @param volumeToAttach The volume being attached
+     * @param vmExistingVolume The VM's existing volume
+     * @return Pair of StoragePoolVO objects (volumePool, vmPool), or null if either pool is missing
+     */
+    private Pair<StoragePoolVO, StoragePoolVO> getStoragePoolsForVolumeAttachment(VolumeInfo volumeToAttach, VolumeVO vmExistingVolume) {
+        if (volumeToAttach == null || vmExistingVolume == null) {
+            return null;
+        }
+
+        StoragePoolVO volumePool = _storagePoolDao.findById(volumeToAttach.getPoolId());
+        StoragePoolVO vmPool = _storagePoolDao.findById(vmExistingVolume.getPoolId());
+
+        if (volumePool == null || vmPool == null) {
+            return null;
+        }
+
+        return new Pair<>(volumePool, vmPool);
+    }
+
+    /**
+     * Determines if a CLVM volume needs lightweight lock migration instead of full data copy.
+     *
+     * Lightweight migration is needed when:
+     * 1. Volume is on CLVM storage
+     * 2. Source and destination are in the same Volume Group
+     * 3. Only the host/lock needs to change (not the storage pool)
+     *
+     * @param volumeToAttach The volume being attached
+     * @param vmExistingVolume The VM's existing volume (typically root volume)
+     * @param vm The VM to attach the volume to
+     * @return true if lightweight CLVM lock migration should be used
+     */
+    private boolean isClvmLightweightMigrationNeeded(VolumeInfo volumeToAttach, VolumeVO vmExistingVolume) {
+        Pair<StoragePoolVO, StoragePoolVO> pools = getStoragePoolsForVolumeAttachment(volumeToAttach, vmExistingVolume);
+        if (pools == null) {
+            return false;
+        }
+
+        StoragePoolVO volumePool = pools.first();
+        StoragePoolVO vmPool = pools.second();
+
+        return volService.isLightweightMigrationNeeded(volumePool.getPoolType(), vmPool.getPoolType(),
+                volumePool.getPath(), vmPool.getPath());
+    }
+
+    /**
+     * Determines if a CLVM volume requires lock transfer when already on the correct storage pool.
+     *
+     * Lock transfer is needed when:
+     * 1. Volume is already on the same CLVM storage pool as VM's volumes
+     * 2. But the volume lock is held by a different host than where the VM is running
+     * 3. Only the lock needs to change (no pool change, no data copy)
+     *
+     * @param volumeToAttach The volume being attached
+     * @param vmExistingVolume The VM's existing volume (typically root volume)
+     * @param vm The VM to attach the volume to
+     * @return true if CLVM lock transfer is needed (but not full migration)
+     */
+    private boolean isClvmLockTransferRequired(VolumeInfo volumeToAttach, VolumeVO vmExistingVolume, UserVmVO vm) {
+        if (vm == null) {
+            return false;
+        }
+
+        Pair<StoragePoolVO, StoragePoolVO> pools = getStoragePoolsForVolumeAttachment(volumeToAttach, vmExistingVolume);
+        if (pools == null) {
+            return false;
+        }
+
+        StoragePoolVO volumePool = pools.first();
+        StoragePoolVO vmPool = pools.second();
+
+        Long vmHostId = vm.getHostId();
+        if (vmHostId == null) {
+            vmHostId = vm.getLastHostId();
+        }
+
+        return volService.isLockTransferRequired(volumeToAttach, volumePool.getPoolType(), vmPool.getPoolType(),
+                volumePool.getId(), vmPool.getId(), vmHostId);
+    }
+
+    /**
+     * Determines the destination host for CLVM lock migration.
+     *
+     * If VM is running, uses the VM's current host.
+     * If VM is stopped, picks an available UP host from the storage pool's cluster.
+     *
+     * @param vm The VM
+     * @param vmExistingVolume The VM's existing volume (to determine cluster)
+     * @return Host ID, or null if cannot be determined
+     */
+    private Long determineClvmLockDestinationHost(UserVmVO vm, VolumeVO vmExistingVolume) {
+        Long destHostId = vm.getHostId();
+        if (destHostId != null) {
+            return destHostId;
+        }
+
+        if (vmExistingVolume == null || vmExistingVolume.getPoolId() == null) {
+            return null;
+        }
+        StoragePoolVO pool = _storagePoolDao.findById(vmExistingVolume.getPoolId());
+        if (pool == null || pool.getClusterId() == null) {
+            return null;
+        }
+        List<HostVO> hosts = _hostDao.findByClusterId(pool.getClusterId());
+        if (hosts == null || hosts.isEmpty()) {
+            return null;
+        }
+        // Pick first available UP host
+        for (HostVO host : hosts) {
+            if (host.getStatus() == Status.Up) {
+                destHostId = host.getId();
+                logger.debug("VM {} is stopped, selected host {} from cluster {} for CLVM lock migration",
+                        vm.getUuid(), destHostId, pool.getClusterId());
+                return destHostId;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Executes CLVM lightweight migration with consistent logging and error handling.
+     *
+     * This helper method wraps the actual migration logic to eliminate code duplication
+     * between different CLVM migration scenarios (lock transfer vs. lightweight migration).
+     *
+     * @param volume The volume to migrate locks for
+     * @param vm The VM to attach the volume to
+     * @param vmExistingVolume The VM's existing volume (to determine target host)
+     * @param operationType Description of the operation type for logging (e.g., "CLVM lock transfer")
+     * @param scenarioDescription Description of the scenario for logging (e.g., "same pool to different host")
+     * @return Updated VolumeInfo after lock migration
+     * @throws CloudRuntimeException if migration fails
+     */
+    private VolumeInfo executeLightweightLockMigration(VolumeInfo volume, UserVmVO vm, VolumeVO vmExistingVolume,
+                                                        String operationType, String scenarioDescription) {
+        logger.info("Performing {} for volume {} to VM {} ({})",
+                operationType, volume.getUuid(), vm.getUuid(), scenarioDescription);
+
+        try {
+            return performLightweightLockMigration(volume, vm, vmExistingVolume);
+        } catch (Exception e) {
+            logger.error("{} failed for volume {}: {}",
+                    operationType, volume.getUuid(), e.getMessage(), e);
+            throw new CloudRuntimeException(operationType + " failed", e);
+        }
+    }
+
+    /**
+     * Performs lightweight CLVM lock migration for volume attachment.
+     * Delegates to VolumeService for the actual lock migration.
+     *
+     * @param volume The volume to migrate locks for
+     * @param vm The VM to attach the volume to
+     * @param vmExistingVolume The VM's existing volume (to determine target host)
+     * @return Updated VolumeInfo after lock migration
+     * @throws Exception if lock migration fails
+     */
+    private VolumeInfo performLightweightLockMigration(VolumeInfo volume, UserVmVO vm, VolumeVO vmExistingVolume) throws CloudRuntimeException {
+        Long destHostId = determineClvmLockDestinationHost(vm, vmExistingVolume);
+
+        if (destHostId == null) {
+            throw new CloudRuntimeException(
+                "Cannot determine destination host for CLVM lock migration - VM has no host and no available cluster hosts");
+        }
+
+        try {
+            return volService.performLockMigration(volume, destHostId);
+        } catch (CloudRuntimeException e) {
+            logger.error("CLVM lock migration failed for volume {}: {}", volume.getUuid(), e.getMessage(), e);
+            throw e;
+        }
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_VOLUME_ATTACH, eventDescription = "attaching volume", async = true)
     public Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId, Boolean allowAttachForSharedFS) {
@@ -3904,7 +4110,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
 
         boolean result;
         if (storagePoolTags.second()) {
-            result =  TagAsRuleHelper.interpretTagAsRule(storageTagsList.get(0), diskOfferingTags, storageTagRuleExecutionTimeout.value());
+            result =  GenericRuleHelper.interpretTagAsRule(storageTagsList.get(0), diskOfferingTags, storageTagRuleExecutionTimeout.value(),
+                    storageTagRuleExecutionTimeout.key());
         } else {
             result = CollectionUtils.isSubCollection(Arrays.asList(newDiskOfferingTagsAsStringArray), storageTagsList);
         }
diff --git a/server/src/main/java/com/cloud/storage/clvm/ClvmPoolManager.java b/server/src/main/java/com/cloud/storage/clvm/ClvmPoolManager.java
new file mode 100644
index 00000000000..febef471e68
--- /dev/null
+++ b/server/src/main/java/com/cloud/storage/clvm/ClvmPoolManager.java
@@ -0,0 +1,485 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.cloud.storage.clvm;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.Storage;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.VolumeDetailVO;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.VolumeDetailsDao;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferCommand;
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferAnswer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ClvmPoolManager implements Configurable {
+    @Inject
+    private VolumeDetailsDao _volsDetailsDao;
+    @Inject
+    private AgentManager _agentMgr;
+    @Inject
+    private HostDao _hostDao;
+
+    protected Logger logger = LogManager.getLogger(getClass());
+
+    /**
+     * Constant for the volume detail key that stores the host ID currently holding the CLVM exclusive lock.
+     * This is used during lightweight lock migration to determine the source host for lock transfer.
+     */
+    public static final String CLVM_LOCK_HOST_ID = "clvmLockHostId";
+
+    public static final ConfigKey<Boolean> CLVMSecureZeroFill = new ConfigKey<>("Advanced", Boolean.class, "clvm.secure.zero.fill", "false",
+            "When enabled, CLVM volumes to be zero-filled at the time of deletion to prevent data from being recovered by VMs reusing the space, as thick LVM volumes write data linearly. Note: This setting is propagated to hosts when they connect to the storage pool. Changing this setting requires disconnecting and reconnecting hosts or restarting the KVM agent for it to take effect.", false, ConfigKey.Scope.StoragePool);
+
+    public static boolean isClvmPoolType(Storage.StoragePoolType poolType) {
+        return Arrays.asList(Storage.StoragePoolType.CLVM, Storage.StoragePoolType.CLVM_NG).contains(poolType);
+    }
+
+    /**
+     * Gets the CLVM lock host ID for a volume, optionally querying actual LVM state.
+     *
+     * @param volumeId The volume ID
+     * @param volumeUuid The volume UUID
+     * @return Host ID that holds the lock, or null if not found
+     * @deprecated Use getClvmLockHostId(volumeId, volumeUuid, volumePath, pool, queryActual) instead
+     */
+    public Long getClvmLockHostId(Long volumeId, String volumeUuid) {
+        VolumeDetailVO detail = _volsDetailsDao.findDetail(volumeId, CLVM_LOCK_HOST_ID);
+        if (detail != null && detail.getValue() != null && !detail.getValue().isEmpty()) {
+            try {
+                return Long.parseLong(detail.getValue());
+            } catch (NumberFormatException e) {
+                logger.warn("Invalid clvmLockHostId in volume_details for volume {}: {}",
+                        volumeUuid, detail.getValue());
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets the CLVM lock host ID for a volume, optionally querying actual LVM state.
+     * This method can query the actual lock state from LVM (source of truth) instead of
+     * relying solely on potentially stale database records.
+     *
+     * @param volumeId The volume ID
+     * @param volumeUuid The volume UUID
+     * @param volumePath The LV path (required if queryActual is true)
+     * @param pool The storage pool (required if queryActual is true)
+     * @param queryActual If true, queries actual LVM state instead of database
+     * @return Host ID that holds the lock, or null if not found
+     */
+    public Long getClvmLockHostId(Long volumeId, String volumeUuid, String volumePath,
+                                  StoragePool pool, boolean queryActual) {
+        if (queryActual) {
+            if (volumePath == null || pool == null) {
+                logger.warn("Cannot query actual CLVM lock state for volume {} - missing volumePath or pool", volumeUuid);
+                return getClvmLockHostId(volumeId, volumeUuid);
+            }
+            return queryCurrentLockHolder(volumeId, volumeUuid, volumePath, pool, true);
+        }
+
+        return getClvmLockHostId(volumeId, volumeUuid);
+    }
+
+    /**
+     * Safely sets or updates the CLVM_LOCK_HOST_ID detail for a volume.
+     * If the detail already exists, it will be updated. Otherwise, it will be created.
+     *
+     * @param volumeId The ID of the volume
+     * @param hostId The host ID that holds/should hold the CLVM exclusive lock
+     */
+    public void setClvmLockHostId(long volumeId, long hostId) {
+        VolumeDetailVO existingDetail = _volsDetailsDao.findDetail(volumeId, CLVM_LOCK_HOST_ID);
+        if (existingDetail != null) {
+            existingDetail.setValue(String.valueOf(hostId));
+            _volsDetailsDao.update(existingDetail.getId(), existingDetail);
+            logger.debug("Updated CLVM_LOCK_HOST_ID for volume {} to host {}", volumeId, hostId);
+            return;
+        }
+        _volsDetailsDao.addDetail(volumeId, CLVM_LOCK_HOST_ID, String.valueOf(hostId), false);
+        logger.debug("Created CLVM_LOCK_HOST_ID for volume {} with host {}", volumeId, hostId);
+    }
+
+    /**
+     * Query LVM to find the actual current lock holder for a volume.
+     * This is the SOURCE OF TRUTH - it queries the actual LVM state via sanlock/lvmlockd.
+     *
+     * <p>If no host holds the exclusive lock (e.g. after a storage outage), this method attempts
+     * an exclusive activation on the best available host before giving up. Activation failure
+     * is non-fatal: the method returns null so callers can apply their own fallback logic.
+     *
+     * @param volumeId The volume ID
+     * @param volumeUuid The volume UUID
+     * @param volumePath The LV path (e.g., "vm-123-disk-0")
+     * @param pool The storage pool
+     * @param updateDatabase If true, persists the discovered or newly-activated lock host to the DB
+     * @return Host ID of current or newly-activated lock holder, or null if none found/activated
+     */
+    public Long queryCurrentLockHolder(Long volumeId, String volumeUuid, String volumePath,
+                                       StoragePool pool, boolean updateDatabase) {
+        if (pool == null) {
+            logger.error("Cannot query CLVM lock for volume {} - pool is null", volumeUuid);
+            return null;
+        }
+
+        String vgName = pool.getPath();
+        if (vgName.startsWith("/")) {
+            vgName = vgName.substring(1);
+        }
+        String lvPath = String.format("/dev/%s/%s", vgName, volumePath);
+
+        // Fast path: trust the DB record and verify with a single host query
+        Long dbHostId = getClvmLockHostId(volumeId, volumeUuid);
+        if (dbHostId != null) {
+            HostVO dbHost = _hostDao.findById(dbHostId);
+            if (dbHost != null && dbHost.getStatus() == Status.Up
+                    && dbHost.getHypervisorType() == Hypervisor.HypervisorType.KVM) {
+                Boolean active = querySingleHostLockState(dbHostId, lvPath, volumeUuid);
+                if (Boolean.TRUE.equals(active)) {
+                    logger.debug("Fast path: volume {} confirmed active on DB host {}", volumeUuid, dbHostId);
+                    return dbHostId;
+                }
+                logger.info("Fast path miss: volume {} not active on DB host {} - falling back to full fan-out",
+                        volumeUuid, dbHostId);
+            } else {
+                logger.info("Fast path skip: DB host {} for volume {} is down/missing — falling back to full fan-out",
+                        dbHostId, volumeUuid);
+            }
+        }
+
+        List<HostVO> hosts = null;
+        Long clusterId = pool.getClusterId();
+        if (clusterId != null) {
+            hosts = _hostDao.findByClusterId(clusterId, Host.Type.Routing);
+        } else if (pool.getDataCenterId() > 0) {
+            hosts = _hostDao.findByDataCenterId(pool.getDataCenterId());
+        }
+        if (hosts == null || hosts.isEmpty()) {
+            logger.warn("No KVM routing hosts found to query CLVM lock state for volume {} (pool: {}, cluster: {}, zone: {})",
+                    volumeUuid, pool.getName(), clusterId, pool.getDataCenterId());
+            return null;
+        }
+
+        List<Long> activeHostIds = new ArrayList<>();
+
+        for (HostVO host : hosts) {
+            if (host.getStatus() != Status.Up ||
+                host.getType() != Host.Type.Routing ||
+                host.getHypervisorType() != Hypervisor.HypervisorType.KVM) {
+                continue;
+            }
+            // Skip the DB host, already confirmed inactive in the fast path above
+            if (dbHostId != null && host.getId() == dbHostId) {
+                continue;
+            }
+
+            Boolean active = querySingleHostLockState(host.getId(), lvPath, volumeUuid);
+            if (Boolean.TRUE.equals(active)) {
+                logger.debug("Volume {} is locally active on host {} (fan-out)", volumeUuid, host.getId());
+                activeHostIds.add(host.getId());
+            }
+        }
+
+        if (activeHostIds.isEmpty()) {
+            logger.debug("Volume {} is not active on any reachable host — no exclusive lock held", volumeUuid);
+
+            // Recovery: attempt exclusive activation on the best available host before giving up.
+            Long targetHostId = selectActivationTargetHost(dbHostId, hosts);
+            if (targetHostId != null) {
+                Long recoveredHostId = tryActivateExclusivelyOnHost(volumeId, volumeUuid, lvPath,
+                        targetHostId, updateDatabase);
+                if (recoveredHostId != null) {
+                    return recoveredHostId;
+                }
+            }
+
+            // Activation failed or no eligible host - clean up stale DB record and give up
+            if (updateDatabase && dbHostId != null) {
+                VolumeDetailVO detail = _volsDetailsDao.findDetail(volumeId, CLVM_LOCK_HOST_ID);
+                if (detail != null && String.valueOf(dbHostId).equals(detail.getValue())) {
+                    _volsDetailsDao.remove(detail.getId());
+                }
+            }
+            return null;
+        }
+
+        if (activeHostIds.size() > 1) {
+            logger.warn("Volume {} is active on {} hosts {}, shared-mode LV (template?). "
+                    + "Skipping exclusive lock transfer.",
+                    volumeUuid, activeHostIds.size(), activeHostIds);
+            return null;
+        }
+
+        Long lockHostId = activeHostIds.get(0);
+        logger.info("Volume {} is exclusively active on host {} (found via fan-out, DB had {})",
+                volumeUuid, lockHostId, dbHostId);
+
+        if (updateDatabase) {
+            if (dbHostId == null || !dbHostId.equals(lockHostId)) {
+                logger.info("Correcting database: volume {} lock host: {} -> {} (actual)",
+                        volumeUuid, dbHostId, lockHostId);
+                setClvmLockHostId(volumeId, lockHostId);
+            }
+        }
+
+        return lockHostId;
+    }
+
+    /**
+     * Queries a single host for the CLVM LV activation state.
+     *
+     * @return {@code Boolean.TRUE} if the LV is active on that host,
+     *         {@code Boolean.FALSE} if reachable but inactive,
+     *         {@code null} if the host is unreachable or returned an error
+     */
+    private Boolean querySingleHostLockState(Long hostId, String lvPath, String volumeUuid) {
+        try {
+            ClvmLockTransferCommand queryCmd = new ClvmLockTransferCommand(
+                    ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE, lvPath, volumeUuid);
+            Answer answer = _agentMgr.send(hostId, queryCmd);
+
+            if (answer == null || !answer.getResult()) {
+                logger.debug("Failed to query lock state from host {}: {}",
+                        hostId, answer != null ? answer.getDetails() : "null answer");
+                return null;
+            }
+            if (!(answer instanceof ClvmLockTransferAnswer)) {
+                logger.warn("Unexpected answer type from host {} for QUERY_LOCK_STATE: {}",
+                        hostId, answer.getClass());
+                return null;
+            }
+            ClvmLockTransferAnswer queryAnswer = (ClvmLockTransferAnswer) answer;
+            logger.debug("Host {} reports volume {} active={} (attr={})",
+                    hostId, volumeUuid, queryAnswer.isActive(), queryAnswer.getLvAttributes());
+            return queryAnswer.isActive();
+        } catch (AgentUnavailableException | OperationTimedoutException e) {
+            logger.debug("Could not query host {} for lock state: {}", hostId, e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * Selects the best host on which to exclusively activate an inactive CLVM volume.
+     *
+     * <p>Priority 1: the last known lock holder ({@code clvmLockHostId} from DB), if that host
+     * is UP and KVM.
+     *
+     * <p>Priority 2: a random UP KVM routing host from the cluster/zone list (fallback).
+     *
+     * @param dbHostId last known lock holder host ID from the DB (may be null)
+     * @param hosts    routing hosts in the cluster or zone collected during fan-out
+     * @return host ID to activate on, or null if no eligible host found
+     */
+    private Long selectActivationTargetHost(Long dbHostId, List<HostVO> hosts) {
+        if (dbHostId != null) {
+            HostVO dbHost = _hostDao.findById(dbHostId);
+            if (dbHost != null && dbHost.getStatus() == Status.Up
+                    && dbHost.getHypervisorType() == Hypervisor.HypervisorType.KVM) {
+                logger.debug("selectActivationTargetHost: preferring DB host {} (last known lock holder)", dbHostId);
+                return dbHostId;
+            }
+        }
+        if (hosts != null) {
+            List<HostVO> eligible = hosts.stream()
+                    .filter(h -> h.getStatus() == Status.Up
+                            && h.getType() == Host.Type.Routing
+                            && h.getHypervisorType() == Hypervisor.HypervisorType.KVM)
+                    .collect(Collectors.toList());
+            if (!eligible.isEmpty()) {
+                Collections.shuffle(eligible);
+                HostVO chosen = eligible.get(0);
+                logger.debug("selectActivationTargetHost: falling back to random UP KVM host {} in cluster/zone",
+                        chosen.getId());
+                return chosen.getId();
+            }
+        }
+        logger.warn("selectActivationTargetHost: no eligible UP KVM host found");
+        return null;
+    }
+
+    /**
+     * Sends an {@code ACTIVATE_EXCLUSIVE} command to {@code targetHostId} and optionally
+     * persists the new lock host to the database.
+     *
+     * <p>Activation failure is non-fatal: returns null so the caller can apply its own fallback.
+     *
+     * @param volumeId       volume DB ID
+     * @param volumeUuid     volume UUID (for logging)
+     * @param lvPath         full LV device path, e.g. {@code /dev/vgname/vol-path}
+     * @param targetHostId   host to activate on
+     * @param updateDatabase if true, persists the new lock host on success
+     * @return {@code targetHostId} on success, {@code null} if the command failed or threw
+     */
+    private Long tryActivateExclusivelyOnHost(Long volumeId, String volumeUuid, String lvPath,
+                                              Long targetHostId, boolean updateDatabase) {
+        try {
+            ClvmLockTransferCommand activateCmd = new ClvmLockTransferCommand(
+                    ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE, lvPath, volumeUuid);
+            Answer activateAnswer = _agentMgr.send(targetHostId, activateCmd);
+            if (activateAnswer != null && activateAnswer.getResult()) {
+                logger.info("Recovery: exclusively activated volume {} on host {} (was inactive on all hosts)",
+                        volumeUuid, targetHostId);
+                if (updateDatabase) {
+                    setClvmLockHostId(volumeId, targetHostId);
+                }
+                return targetHostId;
+            }
+            logger.warn("Recovery activation of volume {} on host {} failed: {}",
+                    volumeUuid, targetHostId,
+                    activateAnswer != null ? activateAnswer.getDetails() : "null answer");
+        } catch (AgentUnavailableException | OperationTimedoutException e) {
+            logger.warn("Recovery activation of volume {} on host {} threw exception: {}",
+                    volumeUuid, targetHostId, e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * Cleans up CLVM lock host tracking detail from volume_details table.
+     * Called after successful volume deletion to prevent orphaned records.
+     *
+     * @param volume The volume being deleted
+     */
+    public void clearClvmLockHostDetail(VolumeVO volume) {
+        try {
+            VolumeDetailVO detail = _volsDetailsDao.findDetail(volume.getId(), CLVM_LOCK_HOST_ID);
+            if (detail != null) {
+                logger.debug("Removing CLVM lock host detail for deleted volume {}", volume.getUuid());
+                _volsDetailsDao.remove(detail.getId());
+            }
+        } catch (Exception e) {
+            logger.warn("Failed to clean up CLVM lock host detail for volume {}: {}",
+                    volume.getUuid(), e.getMessage());
+        }
+    }
+
+    /**
+     * Transfers the CLVM exclusive lock for a volume from the source host to the destination host.
+     *
+     * @param volumeUuid   The volume UUID
+     * @param volumeId     The volume DB ID
+     * @param volumePath   The LV name within the VG (e.g. "vm-123-disk-0")
+     * @param pool         The storage pool
+     * @param sourceHostId The host currently holding the lock (pre-validated by caller)
+     * @param destHostId   The host that should hold the lock after transfer
+     * @return true if the lock was successfully transferred and activated on the destination
+     */
+    public boolean transferClvmVolumeLock(String volumeUuid, Long volumeId, String volumePath,
+                                          StoragePool pool, Long sourceHostId, Long destHostId) {
+        if (pool == null) {
+            logger.error("Cannot transfer CLVM lock for volume {} - pool is null", volumeUuid);
+            return false;
+        }
+
+        String vgName = pool.getPath();
+        if (vgName.startsWith("/")) {
+            vgName = vgName.substring(1);
+        }
+
+        String lvPath = String.format("/dev/%s/%s", vgName, volumePath);
+
+        try {
+            // sourceHostId is trusted as pre-validated by the caller
+            Long hostToDeactivate = sourceHostId;
+
+            logger.info("Transferring CLVM lock for volume {}: source={}, destination={}",
+                    volumeUuid, sourceHostId, destHostId);
+
+            if (hostToDeactivate != null && !hostToDeactivate.equals(destHostId)) {
+                HostVO deactivateHost = _hostDao.findById(hostToDeactivate);
+                if (deactivateHost != null && deactivateHost.getStatus() == Status.Up) {
+                    ClvmLockTransferCommand deactivateCmd = new ClvmLockTransferCommand(
+                            ClvmLockTransferCommand.Operation.DEACTIVATE, lvPath, volumeUuid);
+
+                    Answer deactivateAnswer = _agentMgr.send(hostToDeactivate, deactivateCmd);
+
+                    if (deactivateAnswer == null || !deactivateAnswer.getResult()) {
+                        logger.warn("Failed to deactivate CLVM volume {} on host {}. Will attempt activation on destination.",
+                                volumeUuid, hostToDeactivate);
+                    } else {
+                        logger.debug("Successfully deactivated volume {} on host {}", volumeUuid, hostToDeactivate);
+                    }
+                } else {
+                    logger.warn("Host {} (current lock holder) is down. Will attempt force claim on destination host {}",
+                            hostToDeactivate, destHostId);
+                }
+            } else if (hostToDeactivate == null) {
+                logger.debug("Volume {} has no active lock holder, will directly activate on destination", volumeUuid);
+            }
+
+            ClvmLockTransferCommand activateCmd = new ClvmLockTransferCommand(
+                    ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE,
+                    lvPath,
+                    volumeUuid
+            );
+
+            Answer activateAnswer = _agentMgr.send(destHostId, activateCmd);
+
+            if (activateAnswer == null || !activateAnswer.getResult()) {
+                String error = activateAnswer != null ? activateAnswer.getDetails() : "null answer";
+                logger.error("Failed to activate CLVM volume {} exclusively on dest host {}: {}",
+                        volumeUuid, destHostId, error);
+                return false;
+            }
+
+            setClvmLockHostId(volumeId, destHostId);
+
+            logger.info("Successfully transferred CLVM lock for volume {} from host {} to host {}",
+                    volumeUuid, sourceHostId != null ? sourceHostId : "none", destHostId);
+
+            return true;
+
+        } catch (AgentUnavailableException | OperationTimedoutException e) {
+            logger.error("Exception during CLVM lock transfer for volume {}: {}", volumeUuid, e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return ClvmPoolManager.class.getSimpleName();
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey<?>[] {
+                CLVMSecureZeroFill
+        };
+    }
+}
diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index ce01048eaa5..dc33a4442a3 100755
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -165,6 +165,7 @@ import com.cloud.utils.DateUtil;
 import com.cloud.utils.DateUtil.IntervalType;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.utils.Ternary;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.DB;
@@ -1633,6 +1634,8 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
         boolean isKvmAndFileBasedStorage = isHypervisorKvmAndFileBasedStorage(volume, storagePool);
         boolean backupSnapToSecondary = isBackupSnapshotToSecondaryForZone(volume.getDataCenterId());
 
+        StoragePoolType poolType = volume.getStoragePoolType();
+
         if (isKvmAndFileBasedStorage && backupSnapToSecondary) {
             DataStore imageStore = snapshotSrv.findSnapshotImageStore(snapshot);
             if (imageStore == null) {
@@ -1641,7 +1644,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
             snapshot.setImageStore(imageStore);
         }
 
-        updateSnapshotPayload(volume.getPoolId(), payload, isKvmAndFileBasedStorage, clusterId);
+        updateSnapshotPayload(volume.getPoolId(), payload, isKvmAndFileBasedStorage, poolType, clusterId);
 
         snapshot.addPayload(payload);
         try {
@@ -1659,6 +1662,9 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
             if (backupSnapToSecondary) {
                 if (!isKvmAndFileBasedStorage) {
                     backupSnapshotToSecondary(payload.getAsyncBackup(), snapshotStrategy, snapshotOnPrimary, payload.getZoneIds(), payload.getStoragePoolIds());
+                    if (!payload.getAsyncBackup() && ClvmPoolManager.isClvmPoolType(storagePool.getPoolType())) {
+                        _snapshotStoreDao.removeBySnapshotStore(snapshotId, snapshotOnPrimary.getDataStore().getId(), snapshotOnPrimary.getDataStore().getRole());
+                    }
                 } else {
                     postSnapshotDirectlyToSecondary(snapshot, snapshotOnPrimary, snapshotId);
                 }
@@ -1678,7 +1684,12 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
                 postCreateSnapshot(volume.getId(), snapshotId, payload.getSnapshotPolicyId(), clusterId);
                 snapshotZoneDao.addSnapshotToZone(snapshotId, snapshot.getDataCenterId());
 
-                DataStoreRole dataStoreRole = backupSnapToSecondary ? snapshotHelper.getDataStoreRole(snapshot) : DataStoreRole.Primary;
+                DataStoreRole dataStoreRole;
+                if (payload.getAsyncBackup() && backupSnapToSecondary && !isKvmAndFileBasedStorage) {
+                    dataStoreRole = DataStoreRole.Primary;
+                } else {
+                    dataStoreRole = backupSnapToSecondary ? snapshotHelper.getDataStoreRole(snapshot) : DataStoreRole.Primary;
+                }
 
                 List<SnapshotDataStoreVO> snapshotStoreRefs = _snapshotStoreDao.listReadyBySnapshot(snapshotId, dataStoreRole);
                 if (CollectionUtils.isEmpty(snapshotStoreRefs)) {
@@ -1816,6 +1827,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
                     SnapshotInfo backupedSnapshot = snapshotStrategy.backupSnapshot(snapshotOnPrimary);
                     if (backupedSnapshot != null) {
                         snapshotStrategy.postSnapshotCreation(snapshotOnPrimary);
+                        removeClvmPrimarySnapshotStoreRefIfNeeded(snapshotOnPrimary);
                         copyNewSnapshotToZones(snapshotOnPrimary.getId(), snapshotOnPrimary.getDataCenterId(), zoneIds);
                     }
                 }
@@ -1841,7 +1853,15 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
         }
     }
 
-    private void updateSnapshotPayload(long storagePoolId, CreateSnapshotPayload payload, boolean isKvmAndFileBasedStorage, Long clusterId) {
+    void removeClvmPrimarySnapshotStoreRefIfNeeded(SnapshotInfo snapshotOnPrimary) {
+        DataStore dataStore = snapshotOnPrimary.getDataStore();
+        StoragePoolVO pool = _storagePoolDao.findById(dataStore.getId());
+        if (pool != null && ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+            _snapshotStoreDao.removeBySnapshotStore(snapshotOnPrimary.getId(), dataStore.getId(), dataStore.getRole());
+        }
+    }
+
+    private void updateSnapshotPayload(long storagePoolId, CreateSnapshotPayload payload, boolean isKvmAndFileBasedStorage, StoragePoolType poolType, Long clusterId) {
         StoragePoolVO storagePoolVO = _storagePoolDao.findById(storagePoolId);
 
         if (storagePoolVO.isManaged()) {
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
index 3aaebc69130..6cac485c4e1 100755
--- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -145,8 +146,11 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.StorageUnavailableException;
+import com.cloud.host.DetailVO;
+import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.hypervisor.HypervisorGuru;
@@ -222,7 +226,9 @@ import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.VmDetailConstants;
+import com.cloud.vm.VmIsoMapVO;
 import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VmIsoMapDao;
 import com.cloud.vm.dao.VMInstanceDao;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -252,10 +258,14 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
     @Inject
     private HostDao _hostDao;
     @Inject
+    private HostDetailsDao _hostDetailsDao;
+    @Inject
     private DataCenterDao _dcDao;
     @Inject
     private UserVmDao _userVmDao;
     @Inject
+    private VmIsoMapDao _vmIsoMapDao;
+    @Inject
     private VolumeDao _volumeDao;
     @Inject
     private SnapshotDao _snapshotDao;
@@ -679,47 +689,75 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
     @Override
     public void prepareIsoForVmProfile(VirtualMachineProfile profile, DeployDestination dest) {
         UserVmVO vm = _userVmDao.findById(profile.getId());
-        if (vm.getIsoId() != null) {
-            Map<Volume, StoragePool> storageForDisks = dest.getStorageForDisks();
-            Long poolId = null;
-            TemplateInfo template;
-            if (MapUtils.isNotEmpty(storageForDisks)) {
-                for (StoragePool storagePool : storageForDisks.values()) {
-                    if (poolId != null && storagePool.getId() != poolId) {
-                        throw new CloudRuntimeException("Cannot determine where to download ISO");
-                    }
-                    poolId = storagePool.getId();
-                }
-            }
-            template = prepareIso(vm.getIsoId(), vm.getDataCenterId(), dest.getHost().getId(), poolId);
+        Map<Integer, Long> slotToIsoId = loadAttachedIsoSlots(vm);
+        Long poolId = slotToIsoId.isEmpty() ? null : singleStoragePoolId(dest);
 
-            if (template == null){
-                logger.error("Failed to prepare ISO on secondary or cache storage");
-                throw new CloudRuntimeException("Failed to prepare ISO on secondary or cache storage");
-            }
-            if (template.isBootable()) {
-                profile.setBootLoaderType(BootloaderType.CD);
-            }
-
-            GuestOSVO guestOS = _guestOSDao.findById(template.getGuestOSId());
-            String displayName = null;
-            if (guestOS != null) {
-                displayName = guestOS.getDisplayName();
-            }
-
-            TemplateObjectTO iso = (TemplateObjectTO)template.getTO();
-            iso.setDirectDownload(template.isDirectDownload());
-            iso.setGuestOsType(displayName);
-            DiskTO disk = new DiskTO(iso, 3L, null, Volume.Type.ISO);
-            profile.addDisk(disk);
-        } else {
-            TemplateObjectTO iso = new TemplateObjectTO();
-            iso.setFormat(ImageFormat.ISO);
-            DiskTO disk = new DiskTO(iso, 3L, null, Volume.Type.ISO);
-            profile.addDisk(disk);
+        // Pre-allocate every cdrom slot at boot. QEMU/IDE refuses to hot-add new cdrom drives, so
+        // runtime attachIso can only media-swap into a slot the domain already owns.
+        int totalSlots = Math.max(effectiveMaxCdroms(vm, dest.getHost().getId()), slotsNeededFor(slotToIsoId));
+        for (int i = 0; i < totalSlots; i++) {
+            int diskSeq = CDROM_PRIMARY_DEVICE_SEQ + i;
+            Long isoId = slotToIsoId.get(diskSeq);
+            profile.addDisk(isoId != null
+                    ? buildIsoDisk(profile, vm, dest, poolId, diskSeq, isoId)
+                    : buildEmptyCdromDisk(diskSeq));
         }
     }
 
+    private Long singleStoragePoolId(DeployDestination dest) {
+        Long poolId = null;
+        Map<Volume, StoragePool> storageForDisks = dest.getStorageForDisks();
+        if (MapUtils.isNotEmpty(storageForDisks)) {
+            for (StoragePool pool : storageForDisks.values()) {
+                if (poolId != null && pool.getId() != poolId) {
+                    throw new CloudRuntimeException("Cannot determine where to download ISO");
+                }
+                poolId = pool.getId();
+            }
+        }
+        return poolId;
+    }
+
+    private Map<Integer, Long> loadAttachedIsoSlots(UserVmVO vm) {
+        Map<Integer, Long> slots = new HashMap<>();
+        if (vm.getIsoId() != null) {
+            slots.put(CDROM_PRIMARY_DEVICE_SEQ, vm.getIsoId());
+        }
+        for (VmIsoMapVO row : _vmIsoMapDao.listByVmId(vm.getId())) {
+            slots.put(row.getDeviceSeq(), row.getIsoId());
+        }
+        return slots;
+    }
+
+    private int slotsNeededFor(Map<Integer, Long> slotToIsoId) {
+        if (slotToIsoId.isEmpty()) {
+            return 0;
+        }
+        return Collections.max(slotToIsoId.keySet()) - CDROM_PRIMARY_DEVICE_SEQ + 1;
+    }
+
+    private DiskTO buildIsoDisk(VirtualMachineProfile profile, UserVmVO vm, DeployDestination dest, Long poolId, int diskSeq, long isoId) {
+        TemplateInfo template = prepareIso(isoId, vm.getDataCenterId(), dest.getHost().getId(), poolId);
+        if (template == null) {
+            logger.error("Failed to prepare ISO on secondary or cache storage");
+            throw new CloudRuntimeException("Failed to prepare ISO on secondary or cache storage");
+        }
+        if (diskSeq == CDROM_PRIMARY_DEVICE_SEQ && template.isBootable()) {
+            profile.setBootLoaderType(BootloaderType.CD);
+        }
+        GuestOSVO guestOS = _guestOSDao.findById(template.getGuestOSId());
+        TemplateObjectTO iso = (TemplateObjectTO) template.getTO();
+        iso.setDirectDownload(template.isDirectDownload());
+        iso.setGuestOsType(guestOS != null ? guestOS.getDisplayName() : null);
+        return new DiskTO(iso, (long) diskSeq, null, Volume.Type.ISO);
+    }
+
+    private DiskTO buildEmptyCdromDisk(int diskSeq) {
+        TemplateObjectTO empty = new TemplateObjectTO();
+        empty.setFormat(ImageFormat.ISO);
+        return new DiskTO(empty, (long) diskSeq, null, Volume.Type.ISO);
+    }
+
     private void prepareTemplateInOneStoragePool(final VMTemplateVO template, final StoragePoolVO pool) {
         logger.info("Schedule to preload Template {} into primary storage {}", template, pool);
         if (pool.getPoolType() == Storage.StoragePoolType.DatastoreCluster) {
@@ -1206,17 +1244,20 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
 
     @Override
     public boolean templateIsDeleteable(long templateId) {
+        // ISO can only be referenced by user_vm.iso_id (primary cdrom slot) or vm_iso_map (extra slots).
+        // Templates always live on primary storage and aren't tracked here.
         List<UserVmJoinVO> userVmUsingIso = _userVmJoinDao.listActiveByIsoId(templateId);
-        // check if there is any Vm using this ISO. We only need to check the
-        // case where templateId is an ISO since
-        // VM can be launched from ISO in secondary storage, while template will
-        // always be copied to
-        // primary storage before deploying VM.
         if (!userVmUsingIso.isEmpty()) {
-            logger.debug("ISO " + templateId + " is not deleteable because it is attached to " + userVmUsingIso.size() + " Instances");
+            logger.debug("Unable to delete ISO {} because it is attached to {} Instances", templateId, userVmUsingIso.size());
             return false;
         }
-
+        for (VmIsoMapVO row : _vmIsoMapDao.listByIsoId(templateId)) {
+            UserVmVO vm = _userVmDao.findById(row.getVmId());
+            if (vm != null && vm.getState() != State.Error && vm.getState() != State.Expunging) {
+                logger.debug("Unable to delete ISO {} because it is attached to Instance {} at slot {}", templateId, vm.getUuid(), row.getDeviceSeq());
+                return false;
+            }
+        }
         return true;
     }
 
@@ -1237,7 +1278,14 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
 
         _accountMgr.checkAccess(caller, null, true, virtualMachine);
 
-        Long isoId = !isVirtualRouter ? ((UserVm) virtualMachine).getIsoId() : isoParamId;
+        Long isoId;
+        if (isVirtualRouter) {
+            isoId = isoParamId;
+        } else {
+            Long primaryIsoId = ((UserVm) virtualMachine).getIsoId();
+            List<VmIsoMapVO> extras = _vmIsoMapDao.listByVmId(vmId);
+            isoId = resolveIsoIdForDetach(primaryIsoId, extras, isoParamId);
+        }
         if (isoId == null) {
             throw new InvalidParameterValueException("The specified instance has no ISO attached to it.");
         }
@@ -1321,6 +1369,9 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         if (VMWARE_TOOLS_ISO.equals(iso.getUniqueName()) && vm.getHypervisorType() != Hypervisor.HypervisorType.VMware) {
             throw new InvalidParameterValueException("Cannot attach VMware tools drivers to incompatible hypervisor " + vm.getHypervisorType());
         }
+        if (!isVirtualRouter) {
+            enforceCdromAttachLimits(vmId, (UserVm) vm, isoId);
+        }
         boolean result = attachISOToVM(vmId, userId, isoId, true, forced, isVirtualRouter);
         if (result) {
             return result;
@@ -1360,7 +1411,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         }
     }
 
-    private boolean attachISOToVM(long vmId, long isoId, boolean attach, boolean forced, boolean isVirtualRouter) {
+    private boolean attachISOToVM(long vmId, long isoId, int deviceSeq, boolean attach, boolean forced, boolean isVirtualRouter) {
         VirtualMachine vm = !isVirtualRouter ? _userVmDao.findById(vmId) : _vmInstanceDao.findById(vmId);
 
         if (vm == null || (isVirtualRouter && vm.getType() != VirtualMachine.Type.DomainRouter)) {
@@ -1384,7 +1435,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         }
 
         DataTO isoTO = tmplt.getTO();
-        DiskTO disk = new DiskTO(isoTO, null, null, Volume.Type.ISO);
+        DiskTO disk = new DiskTO(isoTO, (long) deviceSeq, null, Volume.Type.ISO);
 
         HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
         VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
@@ -1402,22 +1453,150 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         return (a != null && a.getResult());
     }
 
-    private boolean attachISOToVM(long vmId, long userId, long isoId, boolean attach, boolean forced, boolean isVirtualRouter) {
+    boolean attachISOToVM(long vmId, long userId, long isoId, boolean attach, boolean forced, boolean isVirtualRouter) {
         UserVmVO vm = _userVmDao.findById(vmId);
         VMTemplateVO iso = _tmpltDao.findById(isoId);
 
-        boolean success = attachISOToVM(vmId, isoId, attach, forced, isVirtualRouter);
-        if (success && attach && !isVirtualRouter) {
-            vm.setIsoId(iso.getId());
-            _userVmDao.update(vmId, vm);
+        int targetSlot = attach ? chooseAttachSlot(vmId, vm) : findAttachedSlot(vmId, vm, isoId);
+        boolean success = attachISOToVM(vmId, isoId, targetSlot, attach, forced, isVirtualRouter);
+        if (!success || isVirtualRouter) {
+            return success;
         }
-        if (success && !attach && !isVirtualRouter) {
-            vm.setIsoId(null);
-            _userVmDao.update(vmId, vm);
+        if (attach) {
+            persistIsoAttachment(vmId, vm, iso, targetSlot);
+        } else {
+            persistIsoDetachment(vmId, vm, isoId, targetSlot);
         }
         return success;
     }
 
+    private int chooseAttachSlot(long vmId, UserVmVO vm) {
+        if (vm.getIsoId() == null) {
+            return CDROM_PRIMARY_DEVICE_SEQ;
+        }
+        VmIsoMapVO highest = highestCdromMapEntry(vmId);
+        return highest == null ? CDROM_PRIMARY_DEVICE_SEQ + 1 : highest.getDeviceSeq() + 1;
+    }
+
+    private int findAttachedSlot(long vmId, UserVmVO vm, long isoId) {
+        if (vm.getIsoId() != null && vm.getIsoId() == isoId) {
+            return CDROM_PRIMARY_DEVICE_SEQ;
+        }
+        VmIsoMapVO entry = _vmIsoMapDao.findByVmIdIsoId(vmId, isoId);
+        return entry != null ? entry.getDeviceSeq() : CDROM_PRIMARY_DEVICE_SEQ;
+    }
+
+    private void persistIsoAttachment(long vmId, UserVmVO vm, VMTemplateVO iso, int slot) {
+        if (slot == CDROM_PRIMARY_DEVICE_SEQ) {
+            vm.setIsoId(iso.getId());
+            _userVmDao.update(vmId, vm);
+        } else {
+            _vmIsoMapDao.persist(new VmIsoMapVO(vmId, iso.getId(), slot));
+        }
+    }
+
+    private void persistIsoDetachment(long vmId, UserVmVO vm, long isoId, int slot) {
+        if (slot == CDROM_PRIMARY_DEVICE_SEQ) {
+            vm.setIsoId(null);
+            _userVmDao.update(vmId, vm);
+            return;
+        }
+        VmIsoMapVO entry = _vmIsoMapDao.findByVmIdIsoId(vmId, isoId);
+        if (entry != null) {
+            _vmIsoMapDao.remove(entry.getId());
+        }
+    }
+
+    VmIsoMapVO highestCdromMapEntry(long vmId) {
+        VmIsoMapVO highest = null;
+        for (VmIsoMapVO row : _vmIsoMapDao.listByVmId(vmId)) {
+            if (highest == null || row.getDeviceSeq() > highest.getDeviceSeq()) {
+                highest = row;
+            }
+        }
+        return highest;
+    }
+
+    Long resolveIsoIdForDetach(Long primaryIsoId, List<VmIsoMapVO> extras, Long isoParamId) {
+        if (isoParamId != null) {
+            boolean attached = (primaryIsoId != null && primaryIsoId.equals(isoParamId))
+                    || extras.stream().anyMatch(r -> r.getIsoId() == isoParamId);
+            if (!attached) {
+                throw new InvalidParameterValueException("The specified ISO is not attached to this Instance.");
+            }
+            return isoParamId;
+        }
+        int totalAttached = (primaryIsoId != null ? 1 : 0) + extras.size();
+        if (totalAttached == 0) {
+            throw new InvalidParameterValueException("The specified instance has no ISO attached to it.");
+        }
+        if (totalAttached > 1) {
+            throw new InvalidParameterValueException("Instance has more than one ISO attached; specify the 'id' parameter to choose which to detach.");
+        }
+        return primaryIsoId != null ? primaryIsoId : extras.get(0).getIsoId();
+    }
+
+    boolean isIsoAlreadyAttached(long vmId, Long primaryIsoId, long isoId) {
+        if (primaryIsoId != null && primaryIsoId.equals(isoId)) {
+            return true;
+        }
+        return _vmIsoMapDao.findByVmIdIsoId(vmId, isoId) != null;
+    }
+
+    void enforceCdromAttachLimits(long vmId, UserVm vm, long isoId) {
+        Long primaryIsoId = vm.getIsoId();
+        if (isIsoAlreadyAttached(vmId, primaryIsoId, isoId)) {
+            throw new InvalidParameterValueException("The specified ISO is already attached to this Instance.");
+        }
+        int effectiveMax = effectiveMaxCdroms(vm, hostIdForVm(vm));
+        int attached = (primaryIsoId != null ? 1 : 0) + _vmIsoMapDao.listByVmId(vmId).size();
+        if (attached >= effectiveMax) {
+            throw new InvalidParameterValueException(String.format(
+                    "Instance has reached the maximum of %d attached CD-ROM(s); detach one before attaching another.", effectiveMax));
+        }
+    }
+
+    int effectiveMaxCdroms(VirtualMachine vm, Long hostId) {
+        HostVO host = hostId != null ? _hostDao.findById(hostId) : null;
+        Long clusterId = host != null ? host.getClusterId() : null;
+        int configuredCap = VmIsoMaxCount.valueIn(clusterId);
+        int hypervisorCap = advertisedCdromCap(hostId);
+        if (configuredCap > hypervisorCap) {
+            logger.warn("{} is set to {} but the placement host supports a maximum of {} CD-ROM(s) per Instance. Clamping to {}.",
+                    VmIsoMaxCount.key(), configuredCap, hypervisorCap, hypervisorCap);
+            return hypervisorCap;
+        }
+        return configuredCap;
+    }
+
+    int advertisedCdromCap(Long hostId) {
+        if (hostId == null) {
+            return DEFAULT_CDROM_MAX_PER_VM;
+        }
+        DetailVO detail = _hostDetailsDao.findDetail(hostId, Host.HOST_CDROM_MAX_COUNT);
+        if (detail == null || detail.getValue() == null) {
+            return DEFAULT_CDROM_MAX_PER_VM;
+        }
+        try {
+            return Integer.parseInt(detail.getValue());
+        } catch (NumberFormatException e) {
+            logger.warn("Invalid {} value '{}' for host {}; using default {}.",
+                    Host.HOST_CDROM_MAX_COUNT, detail.getValue(), hostId, DEFAULT_CDROM_MAX_PER_VM);
+            return DEFAULT_CDROM_MAX_PER_VM;
+        }
+    }
+
+    Long hostIdForVm(VirtualMachine vm) {
+        Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId();
+        if (hostId == null && vm.getHypervisorType() != null) {
+            List<HostVO> candidates = _hostDao.listByDataCenterIdAndHypervisorType(vm.getDataCenterId(), vm.getHypervisorType());
+            if (!candidates.isEmpty()) {
+                hostId = candidates.get(0).getId();
+            }
+        }
+        return hostId;
+    }
+
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_TEMPLATE_DELETE, eventDescription = "Deleting Template", async = true)
     public boolean deleteTemplate(DeleteTemplateCmd cmd) {
@@ -2538,7 +2717,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
         return new ConfigKey<?>[] {AllowPublicUserTemplates,
                 TemplatePreloaderPoolSize,
                 ValidateUrlIsResolvableBeforeRegisteringTemplate,
-                TemplateDeleteFromPrimaryStorage};
+                TemplateDeleteFromPrimaryStorage,
+                VmIsoMaxCount};
     }
 
     public List<TemplateAdapter> getTemplateAdapters() {
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 0e14846b00b..a1d0ac5a2b1 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -108,6 +108,7 @@ import org.apache.cloudstack.backup.BackupScheduleVO;
 import org.apache.cloudstack.backup.BackupVO;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupScheduleDao;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
 import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMNetworkMapDao;
@@ -343,6 +344,7 @@ import com.cloud.storage.VMTemplateZoneVO;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeApiService;
 import com.cloud.storage.VolumeVO;
+import com.cloud.storage.clvm.ClvmPoolManager;
 import com.cloud.storage.dao.DiskOfferingDao;
 import com.cloud.storage.dao.GuestOSCategoryDao;
 import com.cloud.storage.dao.GuestOSDao;
@@ -431,6 +433,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     @Inject
     private EntityManager _entityMgr;
     @Inject
+    private ResourceScheduleManager resourceScheduleManager;
+    @Inject
     private HostDao _hostDao;
     @Inject
     private ServiceOfferingDao serviceOfferingDao;
@@ -651,6 +655,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
     @Inject
     ExtensionHelper extensionHelper;
 
+    @Inject
+    ClvmPoolManager clvmPoolManager;
+
     private ScheduledExecutorService _executor = null;
     private ScheduledExecutorService _vmIpFetchExecutor = null;
     private int _expungeInterval;
@@ -2612,11 +2619,16 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
             autoScaleManager.removeVmFromVmGroup(vm.getId());
 
+            resourceScheduleManager.removeSchedulesForResource(ApiCommandResourceType.VirtualMachine, vm.getId());
+
             releaseNetworkResourcesOnExpunge(vm.getId());
 
             List<VolumeVO> rootVol = _volsDao.findByInstanceAndType(vm.getId(), Volume.Type.ROOT);
             // expunge the vm
             _itMgr.advanceExpunge(vm.getUuid());
+            for (VolumeVO volume : rootVol) {
+                clvmPoolManager.clearClvmLockHostDetail(volume);
+            }
 
             // Only if vm is not expunged already, cleanup it's resources
             if (vm.getRemoved() == null) {
diff --git a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index 52e2434d320..7572ab4a78b 100644
--- a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -436,6 +436,12 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
             vmSnapshotType = VMSnapshot.Type.Disk;
         }
 
+        // CLVM_NG: Block VM snapshots until Phase 2 implementation is complete
+        if (rootVolumePool.getPoolType() == Storage.StoragePoolType.CLVM_NG) {
+            throw new InvalidParameterValueException("VM snapshots are not yet supported on CLVM_NG storage pools. " +
+                    "This feature will be available in a future release.");
+        }
+
         try {
             return createAndPersistVMSnapshot(userVmVo, vsDescription, vmSnapshotName, vsDisplayName, vmSnapshotType);
         } catch (Exception e) {
diff --git a/server/src/main/java/org/apache/cloudstack/schedule/BaseScheduleWorker.java b/server/src/main/java/org/apache/cloudstack/schedule/BaseScheduleWorker.java
new file mode 100644
index 00000000000..29b0d683c87
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/schedule/BaseScheduleWorker.java
@@ -0,0 +1,417 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule;
+
+import com.cloud.api.ApiGsonHelper;
+import com.cloud.event.ActionEventUtils;
+import com.cloud.event.EventTypes;
+import com.cloud.user.User;
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.db.GlobalLock;
+import com.google.common.primitives.Longs;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher;
+import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDao;
+import org.apache.cloudstack.schedule.dao.ResourceScheduledJobDao;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.scheduling.support.CronExpression;
+
+import javax.inject.Inject;
+import javax.persistence.EntityExistsException;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Base class for per-resource-type schedule workers.
+ * Each subclass owns a dedicated {@link Timer} and {@link GlobalLock} keyed by
+ * its resource type, so VM scheduling and AutoScale scheduling (for example) run
+ * independently and cannot block each other.
+ */
+public abstract class BaseScheduleWorker extends ManagerBase {
+
+    public static final ConfigKey<Integer> ScheduledJobExpireInterval = new ConfigKey<>(
+            ConfigKey.CATEGORY_ADVANCED, Integer.class,
+            "scheduler.jobs.expire.interval", "30",
+            "Scheduled job expiry interval in days (applies to all resource-type schedulers)", true);
+
+    @Inject
+    protected ResourceScheduleDao resourceScheduleDao;
+
+    @Inject
+    protected ResourceScheduledJobDao resourceScheduledJobDao;
+
+    @Inject
+    protected AsyncJobManager asyncJobManager;
+
+    protected AsyncJobDispatcher asyncJobDispatcher;
+    private Timer schedulerTimer;
+    protected Date currentTimestamp;
+
+    public AsyncJobDispatcher getAsyncJobDispatcher() {
+        return asyncJobDispatcher;
+    }
+
+    public void setAsyncJobDispatcher(final AsyncJobDispatcher dispatcher) {
+        asyncJobDispatcher = dispatcher;
+    }
+
+    /**
+     * The API resource type this worker handles (e.g. {@code ApiCommandResourceType.VirtualMachine}).
+     */
+    public abstract ApiCommandResourceType getApiResourceType();
+
+    /**
+     * Convenience method returning {@code getApiResourceType().name()} for use in DAO queries, locks, and logging.
+     */
+    protected final String getResourceTypeName() {
+        return getApiResourceType().name();
+    }
+
+    /**
+     * Execute the action described by {@code job} against the owning resource.
+     *
+     * @return the async-job id, or {@code null} if the job was skipped.
+     */
+    protected abstract Long processJob(ResourceScheduledJobVO job);
+
+    /**
+     * Get a human-readable description of the schedule, for use in the UI and audit logs.
+     */
+    public String getDescription(ResourceSchedule.Action parsedAction, CronExpression cronExpression, Map<String, String> details) {
+        return String.format("%s - %s", parsedAction.name(), DateUtil.getHumanReadableSchedule(cronExpression));
+    }
+
+    // -------------------------------------------------------------------------
+    // Lifecycle
+    // -------------------------------------------------------------------------
+
+    @Override
+    public boolean start() {
+        currentTimestamp = DateUtils.addMinutes(new Date(), 1);
+        scheduleNextJobs(currentTimestamp);
+
+        final TimerTask pollTask = new ManagedContextTimerTask() {
+            @Override
+            protected void runInContext() {
+                try {
+                    poll(new Date());
+                } catch (final Throwable t) {
+                    logger.warn("Uncaught throwable in {} scheduler", getResourceTypeName(), t);
+                }
+            }
+        };
+
+        schedulerTimer = new Timer(getResourceTypeName() + "SchedulerPollTask");
+        schedulerTimer.scheduleAtFixedRate(pollTask, 5000L, 60 * 1000L);
+        return true;
+    }
+
+    @Override
+    public boolean stop() {
+        if (schedulerTimer != null) {
+            schedulerTimer.cancel();
+        }
+        return true;
+    }
+
+    // -------------------------------------------------------------------------
+    // Poll loop (identical structure for every resource type)
+    // -------------------------------------------------------------------------
+
+    public void poll(Date timestamp) {
+        currentTimestamp = DateUtils.round(timestamp, Calendar.MINUTE);
+        String displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, currentTimestamp);
+        logger.debug("{} scheduler poll at {}", getResourceTypeName(), displayTime);
+
+        GlobalLock scanLock = GlobalLock.getInternLock("resourceScheduler.poll." + getResourceTypeName());
+        try {
+            if (scanLock.lock(30)) {
+                try {
+                    scheduleNextJobs(currentTimestamp);
+                } finally {
+                    scanLock.unlock();
+                }
+            }
+        } finally {
+            scanLock.releaseRef();
+        }
+
+        scanLock = GlobalLock.getInternLock("resourceScheduler.poll." + getResourceTypeName());
+        try {
+            if (scanLock.lock(30)) {
+                try {
+                    startJobs();
+                } finally {
+                    scanLock.unlock();
+                }
+            }
+        } finally {
+            scanLock.releaseRef();
+        }
+
+        try {
+            cleanupScheduledJobs();
+        } catch (Exception e) {
+            logger.warn("Error cleaning up scheduled jobs for {}", getResourceTypeName(), e);
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Scheduling helpers
+    // -------------------------------------------------------------------------
+
+    private void scheduleNextJobs(Date timestamp) {
+        for (ResourceScheduleVO schedule : resourceScheduleDao.listAllActiveSchedules(getApiResourceType())) {
+            try {
+                scheduleNextJob(schedule, timestamp);
+            } catch (Exception e) {
+                logger.warn("Error scheduling next job for schedule {}", schedule, e);
+            }
+        }
+    }
+
+    public Date scheduleNextJob(ResourceScheduleVO schedule, Date timestamp) {
+        if (!schedule.getEnabled()) {
+            logger.debug("Schedule {} is disabled. Skipping.", schedule);
+            return null;
+        }
+
+        CronExpression cron = DateUtil.parseSchedule(schedule.getSchedule());
+        Date startDate = schedule.getStartDate();
+        Date endDate = schedule.getEndDate();
+
+        if (!isResourceValid(schedule.getResourceId())) {
+            logger.info("Resource id={} is no longer valid. Disabling schedule {}.", schedule.getResourceId(), schedule);
+            disableSchedule(schedule, "owning resource is no longer valid");
+            return null;
+        }
+
+        ZonedDateTime now = (timestamp != null)
+                ? ZonedDateTime.ofInstant(timestamp.toInstant(), schedule.getTimeZoneId())
+                : ZonedDateTime.now(schedule.getTimeZoneId());
+        ZonedDateTime zonedStart = ZonedDateTime.ofInstant(startDate.toInstant(), schedule.getTimeZoneId());
+        ZonedDateTime zonedEnd = (endDate != null)
+                ? ZonedDateTime.ofInstant(endDate.toInstant(), schedule.getTimeZoneId())
+                : null;
+
+        if (zonedEnd != null && now.isAfter(zonedEnd)) {
+            logger.info("End time has passed. Disabling schedule {}.", schedule);
+            disableSchedule(schedule, String.format("end date %s has passed", zonedEnd));
+            return null;
+        }
+
+        ZonedDateTime ts = zonedStart.isAfter(now) ? cron.next(zonedStart) : cron.next(now);
+        if (ts == null) {
+            logger.info("No next schedule time found. Disabling schedule {}.", schedule);
+            disableSchedule(schedule, "schedule has no further occurrences");
+            return null;
+        }
+
+        if (zonedEnd != null && ts.isAfter(zonedEnd)) {
+            logger.info("Next schedule time {} is after end time {}. No more jobs to schedule for {}.", ts, zonedEnd, schedule);
+            return null;
+        }
+
+        Date scheduledDateTime = Date.from(ts.toInstant());
+        ResourceScheduledJobVO existingJob = resourceScheduledJobDao.findByScheduleAndTimestamp(schedule.getId(), scheduledDateTime);
+        if (existingJob != null) {
+            logger.trace("Job already scheduled for {} at {}", schedule, scheduledDateTime);
+            return scheduledDateTime;
+        }
+
+        ResourceScheduledJobVO job = new ResourceScheduledJobVO(
+                getApiResourceType(), schedule.getResourceId(), schedule.getId(),
+                schedule.getActionName(), scheduledDateTime);
+        try {
+            resourceScheduledJobDao.persist(job);
+            long accountId = getEntityOwnerId(schedule.getResourceId());
+            ActionEventUtils.onScheduledActionEvent(
+                    User.UID_SYSTEM, accountId,
+                    parseAction(schedule.getActionName()).getEventType(),
+                    String.format("Scheduled action %s as part of Resource Schedule (uuid=%s description='%s' schedule='%s') for %s (id=%d) at %s",
+                            schedule.getActionName(), schedule.getUuid(), schedule.getDescription(),
+                            schedule.getSchedule(), getResourceTypeName(), schedule.getResourceId(), scheduledDateTime),
+                    schedule.getResourceId(), getResourceTypeName(), true, 0);
+        } catch (EntityExistsException e) {
+            logger.debug("Job already scheduled (concurrent insert).");
+        }
+        return scheduledDateTime;
+    }
+
+    public void updateScheduledJob(ResourceScheduleVO schedule) {
+        removeScheduledJobs(Longs.asList(schedule.getId()));
+        scheduleNextJob(schedule, new Date());
+    }
+
+    public void removeScheduledJobs(List<Long> scheduleIds) {
+        if (CollectionUtils.isEmpty(scheduleIds)) {
+            return;
+        }
+        int removed = resourceScheduledJobDao.expungeJobsForSchedules(scheduleIds, new Date());
+        logger.debug("Removed {} scheduled jobs for schedules {}", removed, scheduleIds);
+    }
+
+    // -------------------------------------------------------------------------
+    // Job execution
+    // -------------------------------------------------------------------------
+
+    private void startJobs() {
+        String displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, currentTimestamp);
+        List<ResourceScheduledJobVO> jobs = resourceScheduledJobDao.listJobsToStart(getApiResourceType(), currentTimestamp);
+        logger.debug("Got {} scheduled jobs for {} at {}", jobs.size(), getResourceTypeName(), displayTime);
+
+        Map<Long, ResourceScheduledJobVO> toExecute = new HashMap<>();
+        Map<Long, List<ResourceScheduledJobVO>> toSkip = new HashMap<>();
+
+        for (ResourceScheduledJobVO job : jobs) {
+            long resourceId = job.getResourceId();
+            if (toExecute.get(resourceId) == null) {
+                toExecute.put(resourceId, job);
+            } else {
+                toSkip.computeIfAbsent(resourceId, k -> new ArrayList<>()).add(job);
+            }
+        }
+
+        executeJobs(toExecute);
+        logSkippedJobs(toExecute, toSkip);
+    }
+
+    public void executeJobs(Map<Long, ResourceScheduledJobVO> jobsToExecute) {
+        for (Map.Entry<Long, ResourceScheduledJobVO> entry : jobsToExecute.entrySet()) {
+            ResourceScheduledJobVO job = entry.getValue();
+            ResourceScheduledJobVO locked = null;
+            try {
+                locked = resourceScheduledJobDao.acquireInLockTable(job.getId());
+                Long jobId = processJob(job);
+                if (jobId != null) {
+                    locked.setAsyncJobId(jobId);
+                    resourceScheduledJobDao.update(job.getId(), locked);
+                }
+            } catch (Exception e) {
+                logger.warn("Failed executing scheduled job {}", job, e);
+            } finally {
+                if (locked != null) {
+                    resourceScheduledJobDao.releaseFromLockTable(job.getId());
+                }
+            }
+        }
+    }
+
+    private void logSkippedJobs(Map<Long, ResourceScheduledJobVO> executed,
+                                Map<Long, List<ResourceScheduledJobVO>> skipped) {
+        for (Map.Entry<Long, List<ResourceScheduledJobVO>> entry : skipped.entrySet()) {
+            long resourceId = entry.getKey();
+            ResourceScheduledJobVO running = executed.get(resourceId);
+            for (ResourceScheduledJobVO s : entry.getValue()) {
+                logger.info("Skipping job {} for resource {} — conflict with {}", s, resourceId, running);
+            }
+        }
+    }
+
+    private void cleanupScheduledJobs() {
+        Date deleteBeforeDate = DateUtils.addDays(currentTimestamp,
+                -1 * ScheduledJobExpireInterval.value());
+        int removed = resourceScheduledJobDao.expungeJobsBefore(getApiResourceType(), deleteBeforeDate);
+        logger.info("Cleaned up {} scheduled job entries for {}", removed, getResourceTypeName());
+    }
+
+    // -------------------------------------------------------------------------
+    // Subclass helpers
+    // -------------------------------------------------------------------------
+
+    private void disableSchedule(ResourceScheduleVO schedule, String reason) {
+        schedule.setEnabled(false);
+        resourceScheduleDao.persist(schedule);
+        long accountId = getEntityOwnerId(schedule.getResourceId());
+        ActionEventUtils.onScheduledActionEvent(
+                User.UID_SYSTEM, accountId, EventTypes.EVENT_SCHEDULE_UPDATE,
+                String.format("Auto-disabled resource schedule (uuid=%s description='%s') for %s (id=%d): %s",
+                        schedule.getUuid(), schedule.getDescription(),
+                        getResourceTypeName(), schedule.getResourceId(), reason),
+                schedule.getResourceId(), getResourceTypeName(), true, 0);
+    }
+
+    public abstract boolean isResourceValid(long resourceId);
+
+    public abstract long getEntityOwnerId(long resourceId);
+
+    /**
+     * Parses an action string into the resource-type-specific typed action constant. Throws InvalidParameterValueException for unknown values.
+     */
+    public abstract ResourceSchedule.Action parseAction(String action);
+
+    /**
+     * Validates action-specific detail parameters. Throws InvalidParameterValueException on failure.
+     */
+    public abstract void validateDetails(ResourceSchedule.Action action, Map<String, String> details);
+
+    /**
+     * Submits an async job for the given command class.
+     *
+     * @param cmdClass   the command to dispatch
+     * @param accountId  account submitting the job
+     * @param resourceId primary resource id (written to AsyncJobVO.instanceId)
+     * @param eventId    the start-event id for correlation
+     * @param extra      additional parameters (e.g. "forced" -> "true")
+     * @return the async job id
+     */
+    public <T extends BaseCmd> long submitAsyncJob(
+            Class<T> cmdClass, long accountId, long resourceId, long eventId,
+            Map<String, String> extra
+    ) {
+        Map<String, String> params = new HashMap<>(extra);
+        params.put(ApiConstants.ID, String.valueOf(resourceId));
+        params.put("ctxUserId", "1");
+        params.put("ctxAccountId", String.valueOf(accountId));
+        params.put(ApiConstants.CTX_START_EVENT_ID, String.valueOf(eventId));
+
+        T cmd;
+        try {
+            cmd = cmdClass.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to instantiate " + cmdClass.getName(), e);
+        }
+        ComponentContext.inject(cmd);
+
+        AsyncJobVO job = new AsyncJobVO("", User.UID_SYSTEM, accountId,
+                cmdClass.getName(),
+                ApiGsonHelper.getBuilder().create().toJson(params),
+                resourceId,
+                cmd.getApiResourceType() != null ? cmd.getApiResourceType().toString() : null,
+                null);
+        job.setDispatcher(asyncJobDispatcher.getName());
+        return asyncJobManager.submitAsyncJob(job);
+    }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleManagerImpl.java b/server/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleManagerImpl.java
new file mode 100644
index 00000000000..db08088feca
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/schedule/ResourceScheduleManagerImpl.java
@@ -0,0 +1,450 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.schedule;
+
+import com.cloud.api.query.MutualExclusiveIdsManagerBase;
+import com.cloud.event.ActionEvent;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.user.AccountManager;
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.PluggableService;
+import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.cloudstack.api.command.user.schedule.CreateResourceScheduleCmd;
+import org.apache.cloudstack.api.command.user.schedule.DeleteResourceScheduleCmd;
+import org.apache.cloudstack.api.command.user.schedule.ListResourceScheduleCmd;
+import org.apache.cloudstack.api.command.user.schedule.UpdateResourceScheduleCmd;
+import org.apache.cloudstack.api.command.user.vm.CreateVMScheduleCmd;
+import org.apache.cloudstack.api.command.user.vm.DeleteVMScheduleCmd;
+import org.apache.cloudstack.api.command.user.vm.ListVMScheduleCmd;
+import org.apache.cloudstack.api.command.user.vm.UpdateVMScheduleCmd;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDao;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDetailsDao;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.scheduling.support.CronExpression;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TimeZone;
+import java.util.stream.Collectors;
+
+public class ResourceScheduleManagerImpl extends MutualExclusiveIdsManagerBase implements ResourceScheduleManager, PluggableService, Configurable {
+
+    @Inject
+    private ResourceScheduleDao resourceScheduleDao;
+
+    @Inject
+    private ResourceScheduleDetailsDao resourceScheduleDetailsDao;
+
+    @Inject
+    private AccountManager accountManager;
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Inject
+    private List<BaseScheduleWorker> workerList;
+
+    private Map<ApiCommandResourceType, BaseScheduleWorker> workerMap;
+
+    @Override
+    public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+        workerMap = new HashMap<>();
+        if (workerList != null) {
+            for (BaseScheduleWorker worker : workerList) {
+                workerMap.put(worker.getApiResourceType(), worker);
+            }
+        }
+        return super.configure(name, params);
+    }
+
+    private BaseScheduleWorker getWorker(ApiCommandResourceType resourceType) {
+        BaseScheduleWorker worker = workerMap.get(resourceType);
+        if (worker == null) {
+            throw new InvalidParameterValueException("Scheduling is not supported for resource type: " + resourceType);
+        }
+        return worker;
+    }
+
+    @Override
+    public List<Class<?>> getCommands() {
+        final List<Class<?>> cmdList = new ArrayList<>();
+        cmdList.add(CreateVMScheduleCmd.class);
+        cmdList.add(ListVMScheduleCmd.class);
+        cmdList.add(UpdateVMScheduleCmd.class);
+        cmdList.add(DeleteVMScheduleCmd.class);
+        cmdList.add(CreateResourceScheduleCmd.class);
+        cmdList.add(ListResourceScheduleCmd.class);
+        cmdList.add(UpdateResourceScheduleCmd.class);
+        cmdList.add(DeleteResourceScheduleCmd.class);
+        return cmdList;
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return ResourceScheduleManager.class.getSimpleName();
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey<?>[]{
+                BaseScheduleWorker.ScheduledJobExpireInterval
+        };
+    }
+
+    // Helper to resolve UUID string to internal ID
+    private long resolveResourceId(String resourceIdStr, Class<?> entityClass) {
+        if (entityClass == null) {
+            throw new CloudRuntimeException("Entity class is required to resolve resource ID");
+        }
+        Object obj = entityManager.findByUuid(entityClass, resourceIdStr);
+        if (obj == null) {
+            try {
+                long id = Long.parseLong(resourceIdStr);
+                obj = entityManager.findById(entityClass, id);
+                if (obj == null) {
+                    throw new InvalidParameterValueException("Unable to find resource by id " + resourceIdStr);
+                }
+            } catch (NumberFormatException e) {
+                throw new InvalidParameterValueException("Unable to find resource by id " + resourceIdStr);
+            }
+        }
+        return ((InternalIdentity) obj).getId();
+    }
+
+    private String getResourceUuid(long internalId, Class<?> entityClass) {
+        if (entityClass != null) {
+            Object obj = entityManager.findById(entityClass, internalId);
+            if (obj instanceof Identity) {
+                return ((Identity) obj).getUuid();
+            }
+        }
+        return String.valueOf(internalId);
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_SCHEDULE_CREATE, eventDescription = "Creating Resource Schedule", create = true)
+    public ResourceScheduleResponse createSchedule(ApiCommandResourceType resourceType, String resourceUuid, String description,
+                                                   String schedule, String timeZoneStr, String action,
+                                                   Date cmdStartDate, Date cmdEndDate, boolean enabled,
+                                                   Map<String, String> details) {
+        BaseScheduleWorker worker = getWorker(resourceType);
+
+        long internalResourceId = resolveResourceId(resourceUuid, worker.getApiResourceType().getAssociatedClass());
+
+        if (!worker.isResourceValid(internalResourceId)) {
+            throw new InvalidParameterValueException("Invalid or non-existent resource: " + resourceUuid);
+        }
+
+        long ownerId = worker.getEntityOwnerId(internalResourceId);
+        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, accountManager.getAccount(ownerId));
+
+        ResourceSchedule.Action parsedAction = worker.parseAction(action);
+
+        worker.validateDetails(parsedAction, details);
+
+        TimeZone timeZone = TimeZone.getTimeZone(timeZoneStr);
+        String timeZoneId = timeZone.getID();
+        Date startDate = DateUtils.addMinutes(new Date(), 1);
+        if (cmdStartDate != null) {
+            startDate = Date.from(DateUtil.getZoneDateTime(cmdStartDate, timeZone.toZoneId()).toInstant());
+        }
+        Date endDate = null;
+        if (cmdEndDate != null) {
+            endDate = Date.from(DateUtil.getZoneDateTime(cmdEndDate, timeZone.toZoneId()).toInstant());
+        }
+
+        CronExpression cronExpression = DateUtil.parseSchedule(schedule);
+        validateStartDateEndDate(startDate, endDate, timeZone);
+
+        if (StringUtils.isBlank(description)) {
+            description = worker.getDescription(parsedAction, cronExpression, details);
+        }
+
+        logger.warn("Using timezone [{}] for running the schedule for resource [{}], as an equivalent of [{}].",
+                timeZoneId, resourceUuid, timeZoneStr);
+
+        String finalDescription = description;
+        String finalAction = parsedAction.name();
+        Date finalStartDate = startDate;
+        Date finalEndDate = endDate;
+
+        return Transaction.execute((TransactionCallback<ResourceScheduleResponse>) status -> {
+            ResourceScheduleVO scheduleVO = resourceScheduleDao.persist(new ResourceScheduleVO(
+                    resourceType, internalResourceId,
+                    finalDescription, cronExpression.toString(), timeZoneId,
+                    finalAction, finalStartDate, finalEndDate, enabled));
+
+            if (MapUtils.isNotEmpty(details)) {
+                List<ResourceScheduleDetailVO> detailVOs = new ArrayList<>();
+                for (Map.Entry<String, String> entry : details.entrySet()) {
+                    detailVOs.add(new ResourceScheduleDetailVO(scheduleVO.getId(), entry.getKey(), entry.getValue(), true));
+                }
+                resourceScheduleDetailsDao.saveDetails(detailVOs);
+            }
+
+            worker.scheduleNextJob(scheduleVO, new Date());
+
+            CallContext.current().setEventResourceId(internalResourceId);
+            CallContext.current().setEventResourceType(worker.getApiResourceType());
+            CallContext.current().setEventDetails(String.format("Created resource schedule %s", scheduleVO));
+            return createResponse(scheduleVO, details);
+        });
+    }
+
+    ResourceScheduleResponse createResponse(ResourceSchedule schedule, Map<String, String> details) {
+        if (details == null || details.isEmpty()) {
+            details = resourceScheduleDetailsDao.listDetailsKeyPairs(schedule.getId(), true);
+        }
+
+        BaseScheduleWorker worker = getWorker(schedule.getResourceType());
+
+        ResourceScheduleResponse response = new ResourceScheduleResponse();
+        response.setObjectName("resourceschedule");
+        response.setId(schedule.getUuid());
+        response.setResourceType(schedule.getResourceType());
+
+        String uuid = getResourceUuid(schedule.getResourceId(), worker.getApiResourceType().getAssociatedClass());
+        response.setResourceId(uuid);
+
+        response.setDescription(schedule.getDescription());
+        response.setSchedule(schedule.getSchedule());
+        response.setTimeZone(schedule.getTimeZone());
+        response.setAction(worker.parseAction(schedule.getActionName()));
+        response.setEnabled(schedule.getEnabled());
+        response.setStartDate(schedule.getStartDate());
+        response.setEndDate(schedule.getEndDate());
+        response.setDetails(details);
+        response.setCreated(schedule.getCreated());
+        return response;
+    }
+
+    @Override
+    public ListResponse<ResourceScheduleResponse> listSchedule(Long id, List<Long> ids, ApiCommandResourceType resourceType,
+                                                               String resourceUuid, String action, Boolean enabled,
+                                                               Long startIndex, Long pageSize) {
+        Long internalResourceId = null;
+        BaseScheduleWorker worker = getWorker(resourceType);
+        if (StringUtils.isBlank(resourceUuid)) {
+            throw new InvalidParameterValueException("Resource ID must be specified");
+        } else {
+            internalResourceId = resolveResourceId(resourceUuid, worker.getApiResourceType().getAssociatedClass());
+            long ownerId = worker.getEntityOwnerId(internalResourceId);
+            accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, accountManager.getAccount(ownerId));
+        }
+
+        List<Long> scheduleIds = getIdsListFromCmd(id, ids);
+        if (action != null) {
+            action = worker.parseAction(action).name();
+        }
+
+        Pair<List<ResourceScheduleVO>, Integer> result = resourceScheduleDao.searchAndCount(
+                scheduleIds, resourceType, internalResourceId, action, enabled, startIndex, pageSize);
+
+        ListResponse<ResourceScheduleResponse> response = new ListResponse<>();
+        List<ResourceScheduleResponse> responsesList = new ArrayList<>();
+        for (ResourceScheduleVO schedule : result.first()) {
+            responsesList.add(createResponse(schedule, null));
+        }
+        response.setResponses(responsesList, result.second());
+        return response;
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_SCHEDULE_UPDATE, eventDescription = "Updating Resource Schedule")
+    public ResourceScheduleResponse updateSchedule(Long id, String description, String schedule,
+                                                   String timeZoneStr, Date cmdStartDate, Date cmdEndDate,
+                                                   Boolean enabled, Map<String, String> details) {
+        ResourceScheduleVO scheduleVO = resourceScheduleDao.findById(id);
+
+        if (scheduleVO == null) {
+            throw new CloudRuntimeException("Resource schedule doesn't exist");
+        }
+
+        BaseScheduleWorker worker = getWorker(scheduleVO.getResourceType());
+        long ownerId = worker.getEntityOwnerId(scheduleVO.getResourceId());
+        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, accountManager.getAccount(ownerId));
+
+        ResourceSchedule.Action parsedAction = worker.parseAction(scheduleVO.getActionName());
+        if (MapUtils.isNotEmpty(details)) {
+            worker.validateDetails(parsedAction, details);
+        }
+
+        CronExpression cronExpression = Objects.requireNonNullElse(
+                DateUtil.parseSchedule(schedule),
+                DateUtil.parseSchedule(scheduleVO.getSchedule())
+        );
+
+        if (description == null && scheduleVO.getDescription() == null) {
+            Map<String, String> effectiveDetails = MapUtils.isNotEmpty(details)
+                    ? details
+                    : resourceScheduleDetailsDao.listDetailsKeyPairs(id, true);
+            description = worker.getDescription(parsedAction, cronExpression, effectiveDetails);
+        }
+
+        final String originalTimeZone = scheduleVO.getTimeZone();
+        final Date originalStartDate = scheduleVO.getStartDate();
+        final Date originalEndDate = scheduleVO.getEndDate();
+
+        TimeZone timeZone;
+        String timeZoneId;
+        if (timeZoneStr != null) {
+            timeZone = TimeZone.getTimeZone(timeZoneStr);
+            timeZoneId = timeZone.getID();
+            if (!timeZoneId.equals(timeZoneStr)) {
+                logger.warn("Using timezone [{}] for running the schedule [{}] for resource {}, as an equivalent of [{}].",
+                        timeZoneId, scheduleVO.getSchedule(), scheduleVO.getResourceId(), timeZoneStr);
+            }
+            scheduleVO.setTimeZone(timeZoneId);
+        } else {
+            timeZoneId = scheduleVO.getTimeZone();
+            timeZone = TimeZone.getTimeZone(timeZoneId);
+        }
+
+        Date startDate = scheduleVO.getStartDate().before(DateUtils.addMinutes(new Date(), 1)) ? DateUtils.addMinutes(new Date(), 1) : scheduleVO.getStartDate();
+        Date endDate = scheduleVO.getEndDate();
+        if (cmdEndDate != null) {
+            endDate = Date.from(DateUtil.getZoneDateTime(cmdEndDate, timeZone.toZoneId()).toInstant());
+        }
+
+        if (cmdStartDate != null) {
+            startDate = Date.from(DateUtil.getZoneDateTime(cmdStartDate, timeZone.toZoneId()).toInstant());
+        }
+
+        boolean enabling = Boolean.TRUE.equals(enabled) && !scheduleVO.getEnabled();
+        if (enabling || (ObjectUtils.anyNotNull(cmdStartDate, cmdEndDate, timeZoneStr) &&
+                (!Objects.equals(originalTimeZone, timeZoneId) ||
+                        !Objects.equals(originalStartDate, startDate) ||
+                        !Objects.equals(originalEndDate, endDate)))) {
+            validateStartDateEndDate(Objects.requireNonNullElse(startDate, DateUtils.addMinutes(new Date(), 1)),
+                    endDate, timeZone);
+        }
+
+        if (enabled != null) {
+            scheduleVO.setEnabled(enabled);
+        }
+        if (description != null) {
+            scheduleVO.setDescription(description);
+        }
+        if (cmdEndDate != null) {
+            scheduleVO.setEndDate(endDate);
+        }
+        if (cmdStartDate != null) {
+            scheduleVO.setStartDate(startDate);
+        }
+        scheduleVO.setSchedule(cronExpression.toString());
+
+        return Transaction.execute((TransactionCallback<ResourceScheduleResponse>) status -> {
+            resourceScheduleDao.update(id, scheduleVO);
+
+            if (MapUtils.isNotEmpty(details)) {
+                List<ResourceScheduleDetailVO> detailVOs = new ArrayList<>();
+                for (Map.Entry<String, String> entry : details.entrySet()) {
+                    detailVOs.add(new ResourceScheduleDetailVO(id, entry.getKey(), entry.getValue(), true));
+                }
+                resourceScheduleDetailsDao.saveDetails(detailVOs);
+            }
+
+            worker.updateScheduledJob(scheduleVO);
+
+            CallContext.current().setEventResourceId(scheduleVO.getResourceId());
+            CallContext.current().setEventResourceType(worker.getApiResourceType());
+
+            CallContext.current().setEventDetails(String.format("Updated resource schedule %s", scheduleVO));
+
+            // Re-load details if they weren't fully replaced
+            Map<String, String> currentDetails = resourceScheduleDetailsDao.listDetailsKeyPairs(id, true);
+            return createResponse(scheduleVO, currentDetails);
+        });
+    }
+
+    void validateStartDateEndDate(Date startDate, Date endDate, TimeZone tz) {
+        ZonedDateTime now = ZonedDateTime.now(tz.toZoneId());
+        ZonedDateTime zonedStartDate = ZonedDateTime.ofInstant(startDate.toInstant(), tz.toZoneId());
+
+        if (zonedStartDate.isBefore(now)) {
+            throw new InvalidParameterValueException(String.format("Invalid value for start date. Start date [%s] can't be before current time [%s].", zonedStartDate, now));
+        }
+
+        if (endDate != null) {
+            ZonedDateTime zonedEndDate = ZonedDateTime.ofInstant(endDate.toInstant(), tz.toZoneId());
+            if (zonedEndDate.isBefore(now)) {
+                throw new InvalidParameterValueException(String.format("Invalid value for end date. End date [%s] can't be before current time [%s].", zonedEndDate, now));
+            }
+            if (zonedEndDate.isBefore(zonedStartDate)) {
+                throw new InvalidParameterValueException(String.format("Invalid value for end date. End date [%s] can't be before start date [%s].", zonedEndDate, zonedStartDate));
+            }
+        }
+    }
+
+    @Override
+    public void removeSchedulesForResource(ApiCommandResourceType resourceType, long resourceId) {
+        List<ResourceScheduleVO> schedules = resourceScheduleDao.search(
+                resourceScheduleDao.getSearchCriteriaForResource(resourceType, resourceId), null);
+        List<Long> ids = new ArrayList<>();
+        for (ResourceScheduleVO schedule : schedules) {
+            ids.add(schedule.getId());
+        }
+
+        getWorker(resourceType).removeScheduledJobs(ids);
+        resourceScheduleDao.removeAllSchedulesForResource(resourceType, resourceId);
+    }
+
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_SCHEDULE_DELETE, eventDescription = "Deleting Resource Schedule")
+    public Long removeSchedule(ApiCommandResourceType resourceType, String resourceUuid, Long id, List<Long> idsList) {
+        BaseScheduleWorker worker = getWorker(resourceType);
+        long internalResourceId = resolveResourceId(resourceUuid, worker.getApiResourceType().getAssociatedClass());
+
+        long ownerId = worker.getEntityOwnerId(internalResourceId);
+        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, accountManager.getAccount(ownerId));
+
+        List<Long> ids = getIdsListFromCmd(id, idsList);
+        Pair<List<ResourceScheduleVO>, Integer> result = resourceScheduleDao.searchAndCount(ids, resourceType, internalResourceId, null, null, null, null);
+        List<ResourceScheduleVO> schedulesToRemove = result.first();
+        List<Long> scheduleIdsToRemove = schedulesToRemove.stream().map(ResourceScheduleVO::getId).collect(Collectors.toList());
+        return Transaction.execute((TransactionCallback<Long>) status -> {
+            worker.removeScheduledJobs(scheduleIdsToRemove);
+
+            CallContext.current().setEventResourceId(internalResourceId);
+            CallContext.current().setEventResourceType(worker.getApiResourceType());
+            return resourceScheduleDao.removeSchedulesForResourceAndIds(resourceType, internalResourceId, scheduleIdsToRemove);
+        });
+    }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleWorker.java b/server/src/main/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleWorker.java
new file mode 100644
index 00000000000..cd7bc1e485f
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleWorker.java
@@ -0,0 +1,146 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.schedule.autoscale;
+
+import com.cloud.event.ActionEventUtils;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.as.AutoScaleManager;
+import com.cloud.network.as.AutoScaleVmGroup;
+import com.cloud.network.as.AutoScaleVmGroupVO;
+import com.cloud.network.as.dao.AutoScaleVmGroupDao;
+import com.cloud.user.User;
+import com.cloud.utils.DateUtil;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
+import org.apache.cloudstack.schedule.BaseScheduleWorker;
+import org.apache.cloudstack.schedule.ResourceSchedule;
+import org.apache.cloudstack.schedule.ResourceScheduledJobVO;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDetailsDao;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.EnumUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.scheduling.support.CronExpression;
+
+import javax.inject.Inject;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.cloudstack.api.ApiConstants.MAX_MEMBERS;
+import static org.apache.cloudstack.api.ApiConstants.MIN_MEMBERS;
+
+public class AutoScaleScheduleWorker extends BaseScheduleWorker {
+
+    @Inject
+    private AutoScaleManager autoScaleManager;
+
+    @Inject
+    private AutoScaleVmGroupDao autoScaleVmGroupDao;
+
+    @Inject
+    private ResourceScheduleDetailsDao resourceScheduleDetailsDao;
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.AutoScaleVmGroup;
+    }
+
+    @Override
+    public String getDescription(ResourceSchedule.Action parsedAction, CronExpression cronExpression, Map<String, String> details) {
+        return String.format("%s Min (%s) Max (%s) - %s", parsedAction.name(), details.get(MIN_MEMBERS), details.get(MAX_MEMBERS), DateUtil.getHumanReadableSchedule(cronExpression));
+    }
+
+    @Override
+    public boolean isResourceValid(long resourceId) {
+        AutoScaleVmGroupVO group = autoScaleVmGroupDao.findById(resourceId);
+        return group != null && !AutoScaleVmGroup.State.REVOKE.equals(group.getState());
+    }
+
+    @Override
+    public long getEntityOwnerId(long resourceId) {
+        AutoScaleVmGroupVO group = autoScaleVmGroupDao.findById(resourceId);
+        return group != null ? group.getAccountId() : User.UID_SYSTEM;
+    }
+
+    @Override
+    public AutoScaleScheduleAction parseAction(String actionName) {
+        AutoScaleScheduleAction action = EnumUtils.getEnumIgnoreCase(AutoScaleScheduleAction.class, actionName);
+        if (action == null) {
+            throw new InvalidParameterValueException(String.format(
+                    "Invalid action for AutoScaleVmGroup schedule: %s. Supported actions: %s",
+                    actionName, Arrays.toString(AutoScaleScheduleAction.values())));
+        }
+        return action;
+    }
+
+    @Override
+    public void validateDetails(ResourceSchedule.Action action, Map<String, String> details) {
+        if (!(action instanceof AutoScaleScheduleAction)) {
+            throw new InvalidParameterValueException("Invalid action type for AutoScaleVmGroup schedule");
+        }
+        if (MapUtils.isEmpty(details)) {
+            throw new InvalidParameterValueException("Details are required for AutoScaleVmGroup schedule");
+        }
+        if (!details.keySet().stream().allMatch(key -> MIN_MEMBERS.equalsIgnoreCase(key) || MAX_MEMBERS.equalsIgnoreCase(key))) {
+            throw new InvalidParameterValueException("Only minmembers and maxmembers are supported for AutoScaleVmGroup schedule details");
+        }
+
+        String minMembersRaw = details.get(MIN_MEMBERS);
+        String maxMembersRaw = details.get(MAX_MEMBERS);
+        if (StringUtils.isBlank(minMembersRaw) || StringUtils.isBlank(maxMembersRaw)) {
+            throw new InvalidParameterValueException("Both minmembers and maxmembers are required for AutoScaleVmGroup schedule");
+        }
+
+        int minMembers;
+        int maxMembers;
+        try {
+            minMembers = Integer.parseInt(minMembersRaw);
+            maxMembers = Integer.parseInt(maxMembersRaw);
+        } catch (NumberFormatException e) {
+            throw new InvalidParameterValueException("minmembers and maxmembers must be valid integers");
+        }
+
+        autoScaleManager.validateMinMaxMembers(minMembers, maxMembers);
+    }
+
+    @Override
+    protected Long processJob(ResourceScheduledJobVO job) {
+        AutoScaleVmGroupVO group = autoScaleVmGroupDao.findById(job.getResourceId());
+        if (group == null || AutoScaleVmGroup.State.REVOKE.equals(group.getState())) {
+            logger.warn("AutoScaleVmGroup id={} not found/invalid; skipping scheduled job {}", job.getResourceId(), job);
+            return null;
+        }
+
+        AutoScaleScheduleAction action = parseAction(job.getActionName());
+        Map<String, String> details = resourceScheduleDetailsDao.listDetailsKeyPairs(job.getScheduleId(), true);
+        validateDetails(action, details);
+
+        String minMembers = details.get(MIN_MEMBERS);
+        String maxMembers = details.get(MAX_MEMBERS);
+        long eventId = ActionEventUtils.onCompletedActionEvent(
+                User.UID_SYSTEM, group.getAccountId(), null,
+                action.getEventType(), true,
+                String.format("Executing action %s (min=%s max=%s) for AutoScaleVmGroup: %s (min=%s max=%s)",
+                        action, minMembers, maxMembers, group.getUuid(), group.getMinMembers(), group.getMaxMembers()),
+                group.getId(), ApiCommandResourceType.AutoScaleVmGroup.toString(), 0);
+
+        Map<String, String> params = new HashMap<>();
+        params.put(MIN_MEMBERS, minMembers);
+        params.put(MAX_MEMBERS, maxMembers);
+        return submitAsyncJob(UpdateAutoScaleVmGroupCmd.class, group.getAccountId(), group.getId(), eventId, params);
+    }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/schedule/vm/VMScheduleWorker.java b/server/src/main/java/org/apache/cloudstack/schedule/vm/VMScheduleWorker.java
new file mode 100644
index 00000000000..9684c5bfcb5
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/schedule/vm/VMScheduleWorker.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule.vm;
+
+import com.cloud.event.ActionEventUtils;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.as.AutoScaleVmGroupVmMapVO;
+import com.cloud.network.as.dao.AutoScaleVmGroupVmMapDao;
+import com.cloud.user.User;
+import com.cloud.uservm.UserVm;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
+import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
+import org.apache.cloudstack.api.command.user.vm.StopVMCmd;
+import org.apache.cloudstack.schedule.BaseScheduleWorker;
+import org.apache.cloudstack.schedule.ResourceSchedule;
+import org.apache.cloudstack.schedule.ResourceScheduledJobVO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.EnumUtils;
+
+import javax.inject.Inject;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class VMScheduleWorker extends BaseScheduleWorker {
+
+    @Inject
+    private UserVmManager userVmManager;
+
+    @Inject
+    private AutoScaleVmGroupVmMapDao autoScaleVmGroupVmMapDao;
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.VirtualMachine;
+    }
+
+    @Override
+    public boolean isResourceValid(long resourceId) {
+        UserVm userVm = userVmManager.getUserVm(resourceId);
+        if (userVm != null) {
+            List<AutoScaleVmGroupVmMapVO> autoScalingGroups = autoScaleVmGroupVmMapDao.listByVm(resourceId);
+            return CollectionUtils.isEmpty(autoScalingGroups);
+        }
+        return false;
+    }
+
+    @Override
+    public long getEntityOwnerId(long resourceId) {
+        VirtualMachine vm = userVmManager.getUserVm(resourceId);
+        return vm != null ? vm.getAccountId() : User.UID_SYSTEM;
+    }
+
+    @Override
+    public VMScheduleAction parseAction(String actionName) {
+        VMScheduleAction action = EnumUtils.getEnumIgnoreCase(VMScheduleAction.class, actionName);
+        if (action == null) {
+            throw new InvalidParameterValueException(String.format(
+                    "Invalid action for VirtualMachine schedule: %s. Supported actions: %s",
+                    actionName, Arrays.toString(VMScheduleAction.values())));
+        }
+        return action;
+    }
+
+    @Override
+    public void validateDetails(ResourceSchedule.Action action, Map<String, String> details) {}
+
+    @Override
+    protected Long processJob(ResourceScheduledJobVO job) {
+        VirtualMachine vm = userVmManager.getUserVm(job.getResourceId());
+        if (vm == null) {
+            logger.warn("VM id={} not found; skipping scheduled job {}", job.getResourceId(), job);
+            return null;
+        }
+
+        if (!Arrays.asList(VirtualMachine.State.Running, VirtualMachine.State.Stopped).contains(vm.getState())) {
+            logger.info("Skipping action ({}) for [vm: {}, job: {}] — VM is in state: {}",
+                    job.getActionName(), vm, job, vm.getState());
+            return null;
+        }
+
+        VMScheduleAction action = parseAction(job.getActionName());
+        final long eventId = ActionEventUtils.onCompletedActionEvent(
+                User.UID_SYSTEM, vm.getAccountId(), null,
+                action.getEventType(), true,
+                String.format("Executing action (%s) for VM: %s", action, vm),
+                vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), 0);
+
+        if (vm.getState() == VirtualMachine.State.Running) {
+            switch (action) {
+                case STOP:
+                    return submitStopVMJob(vm, false, eventId);
+                case FORCE_STOP:
+                    return submitStopVMJob(vm, true, eventId);
+                case REBOOT:
+                    return submitRebootVMJob(vm, false, eventId);
+                case FORCE_REBOOT:
+                    return submitRebootVMJob(vm, true, eventId);
+                default:
+                    break;
+            }
+        } else if (vm.getState() == VirtualMachine.State.Stopped && action == VMScheduleAction.START) {
+            return submitStartVMJob(vm, eventId);
+        }
+
+        logger.warn("Skipping action ({}) for [vm: {}, job: {}] — VM is in state: {}",
+                action, vm, job, vm.getState());
+        return null;
+    }
+
+    private long submitStartVMJob(VirtualMachine vm, long eventId) {
+        return submitAsyncJob(StartVMCmd.class, vm.getAccountId(), vm.getId(), eventId, Collections.emptyMap());
+    }
+
+    private long submitStopVMJob(VirtualMachine vm, boolean forced, long eventId) {
+        return submitAsyncJob(StopVMCmd.class, vm.getAccountId(), vm.getId(), eventId,
+                Map.of(ApiConstants.FORCED, String.valueOf(forced)));
+    }
+
+    private long submitRebootVMJob(VirtualMachine vm, boolean forced, long eventId) {
+        return submitAsyncJob(RebootVMCmd.class, vm.getAccountId(), vm.getId(), eventId,
+                Map.of(ApiConstants.FORCED, String.valueOf(forced)));
+    }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/storage/heuristics/HeuristicRuleHelper.java b/server/src/main/java/org/apache/cloudstack/storage/heuristics/HeuristicRuleHelper.java
index beecf90d2b8..97c13f71447 100644
--- a/server/src/main/java/org/apache/cloudstack/storage/heuristics/HeuristicRuleHelper.java
+++ b/server/src/main/java/org/apache/cloudstack/storage/heuristics/HeuristicRuleHelper.java
@@ -257,7 +257,7 @@ public class HeuristicRuleHelper {
      * @return the {@link DataStore} returned by the script.
      */
     public DataStore interpretHeuristicRule(String rule, HeuristicType heuristicType, Object obj, long zoneId) {
-        try (JsInterpreter jsInterpreter = new JsInterpreter(HEURISTICS_SCRIPT_TIMEOUT)) {
+        try (JsInterpreter jsInterpreter = new JsInterpreter(HEURISTICS_SCRIPT_TIMEOUT, StorageManager.HEURISTICS_SCRIPT_TIMEOUT.key())) {
             buildPresetVariables(jsInterpreter, heuristicType, zoneId, obj);
             Object scriptReturn = jsInterpreter.executeScript(rule);
 
diff --git a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java
deleted file mode 100644
index 866fca3f96e..00000000000
--- a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImpl.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.vm.schedule;
-
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.TimeZone;
-
-import javax.inject.Inject;
-
-import org.apache.cloudstack.api.ApiCommandResourceType;
-import org.apache.cloudstack.api.command.user.vm.CreateVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.DeleteVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.ListVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.UpdateVMScheduleCmd;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.vm.schedule.dao.VMScheduleDao;
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.scheduling.support.CronExpression;
-
-import com.cloud.api.query.MutualExclusiveIdsManagerBase;
-import com.cloud.event.ActionEvent;
-import com.cloud.event.EventTypes;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.user.AccountManager;
-import com.cloud.utils.DateUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.component.PluggableService;
-import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.Transaction;
-import com.cloud.utils.db.TransactionCallback;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.UserVmManager;
-import com.cloud.vm.VirtualMachine;
-
-public class VMScheduleManagerImpl extends MutualExclusiveIdsManagerBase implements VMScheduleManager, PluggableService {
-
-    @Inject
-    private VMScheduleDao vmScheduleDao;
-    @Inject
-    private UserVmManager userVmManager;
-    @Inject
-    private VMScheduler vmScheduler;
-    @Inject
-    private AccountManager accountManager;
-
-    @Override
-    public List<Class<?>> getCommands() {
-        final List<Class<?>> cmdList = new ArrayList<>();
-        cmdList.add(CreateVMScheduleCmd.class);
-        cmdList.add(ListVMScheduleCmd.class);
-        cmdList.add(UpdateVMScheduleCmd.class);
-        cmdList.add(DeleteVMScheduleCmd.class);
-        return cmdList;
-    }
-
-    @Override
-    @ActionEvent(eventType = EventTypes.EVENT_VM_SCHEDULE_CREATE, eventDescription = "Creating VM Schedule", create = true)
-    public VMScheduleResponse createSchedule(CreateVMScheduleCmd cmd) {
-        VirtualMachine vm = userVmManager.getUserVm(cmd.getVmId());
-        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, vm);
-        if (vm == null) {
-            throw new InvalidParameterValueException(String.format("Invalid value for vmId: %s", cmd.getVmId()));
-        }
-
-        VMSchedule.Action action = null;
-        if (cmd.getAction() != null) {
-            try {
-                action = VMSchedule.Action.valueOf(cmd.getAction().toUpperCase());
-            } catch (IllegalArgumentException exception) {
-                throw new InvalidParameterValueException(String.format("Invalid value for action: %s", cmd.getAction()));
-            }
-        }
-
-        Date cmdStartDate = cmd.getStartDate();
-        Date cmdEndDate = cmd.getEndDate();
-        String cmdTimeZone = cmd.getTimeZone();
-        TimeZone timeZone = TimeZone.getTimeZone(cmdTimeZone);
-        String timeZoneId = timeZone.getID();
-        Date startDate = DateUtils.addMinutes(new Date(), 1);
-        if (cmdStartDate != null) {
-            startDate = Date.from(DateUtil.getZoneDateTime(cmdStartDate, timeZone.toZoneId()).toInstant());
-        }
-        Date endDate = null;
-        if (cmdEndDate != null) {
-            endDate = Date.from(DateUtil.getZoneDateTime(cmdEndDate, timeZone.toZoneId()).toInstant());
-        }
-
-        CronExpression cronExpression = DateUtil.parseSchedule(cmd.getSchedule());
-
-        validateStartDateEndDate(startDate, endDate, timeZone);
-
-        String description = null;
-        if (StringUtils.isBlank(cmd.getDescription())) {
-            description = String.format("%s - %s", action, DateUtil.getHumanReadableSchedule(cronExpression));
-        } else description = cmd.getDescription();
-
-        logger.warn("Using timezone [{}] for running the schedule for VM [{}], as an equivalent of [{}].", timeZoneId, vm, cmdTimeZone);
-
-        String finalDescription = description;
-        VMSchedule.Action finalAction = action;
-        Date finalStartDate = startDate;
-        Date finalEndDate = endDate;
-
-        return Transaction.execute((TransactionCallback<VMScheduleResponse>) status -> {
-            VMScheduleVO vmSchedule = vmScheduleDao.persist(new VMScheduleVO(cmd.getVmId(), finalDescription, cronExpression.toString(), timeZoneId, finalAction, finalStartDate, finalEndDate, cmd.getEnabled()));
-            vmScheduler.scheduleNextJob(vmSchedule, new Date());
-            CallContext.current().setEventResourceId(vm.getId());
-            CallContext.current().setEventResourceType(ApiCommandResourceType.VirtualMachine);
-            return createResponse(vmSchedule);
-        });
-    }
-
-    @Override
-    public VMScheduleResponse createResponse(VMSchedule vmSchedule) {
-        VirtualMachine vm = userVmManager.getUserVm(vmSchedule.getVmId());
-        VMScheduleResponse response = new VMScheduleResponse();
-
-        response.setObjectName(VMSchedule.class.getSimpleName().toLowerCase());
-        response.setId(vmSchedule.getUuid());
-        response.setVmId(vm.getUuid());
-        response.setDescription(vmSchedule.getDescription());
-        response.setSchedule(vmSchedule.getSchedule());
-        response.setTimeZone(vmSchedule.getTimeZone());
-        response.setAction(vmSchedule.getAction());
-        response.setEnabled(vmSchedule.getEnabled());
-        response.setStartDate(vmSchedule.getStartDate());
-        response.setEndDate(vmSchedule.getEndDate());
-        response.setCreated(vmSchedule.getCreated());
-        return response;
-    }
-
-    @Override
-    public ListResponse<VMScheduleResponse> listSchedule(ListVMScheduleCmd cmd) {
-        Long id = cmd.getId();
-        Boolean enabled = cmd.getEnabled();
-        Long vmId = cmd.getVmId();
-
-        VirtualMachine vm = userVmManager.getUserVm(vmId);
-        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, vm);
-
-        VMSchedule.Action action = null;
-        if (cmd.getAction() != null) {
-            try {
-                action = VMSchedule.Action.valueOf(cmd.getAction());
-            } catch (IllegalArgumentException exception) {
-                throw new InvalidParameterValueException("Invalid value for action: " + cmd.getAction());
-            }
-        }
-
-        Pair<List<VMScheduleVO>, Integer> result = vmScheduleDao.searchAndCount(id, vmId, action, enabled, cmd.getStartIndex(), cmd.getPageSizeVal());
-
-        ListResponse<VMScheduleResponse> response = new ListResponse<>();
-        List<VMScheduleResponse> responsesList = new ArrayList<>();
-        for (VMSchedule vmSchedule : result.first()) {
-            responsesList.add(createResponse(vmSchedule));
-        }
-        response.setResponses(responsesList, result.second());
-        return response;
-    }
-
-    @Override
-    @ActionEvent(eventType = EventTypes.EVENT_VM_SCHEDULE_UPDATE, eventDescription = "Updating VM Schedule")
-    public VMScheduleResponse updateSchedule(UpdateVMScheduleCmd cmd) {
-        Long id = cmd.getId();
-        VMScheduleVO vmSchedule = vmScheduleDao.findById(id);
-
-        if (vmSchedule == null) {
-            throw new CloudRuntimeException("VM schedule doesn't exist");
-        }
-
-        VirtualMachine vm = userVmManager.getUserVm(vmSchedule.getVmId());
-        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, vm);
-
-        CronExpression cronExpression = Objects.requireNonNullElse(
-                DateUtil.parseSchedule(cmd.getSchedule()),
-                DateUtil.parseSchedule(vmSchedule.getSchedule())
-        );
-
-        String description = cmd.getDescription();
-        if (description == null && vmSchedule.getDescription() == null) {
-            description = String.format("%s - %s", vmSchedule.getAction(), DateUtil.getHumanReadableSchedule(cronExpression));
-        }
-        String cmdTimeZone = cmd.getTimeZone();
-        Date cmdStartDate = cmd.getStartDate();
-        Date cmdEndDate = cmd.getEndDate();
-        Boolean enabled = cmd.getEnabled();
-        final String originalTimeZone = vmSchedule.getTimeZone();
-        final Date originalStartDate = vmSchedule.getStartDate();
-        final Date originalEndDate = vmSchedule.getEndDate();
-
-        TimeZone timeZone;
-        String timeZoneId;
-        if (cmdTimeZone != null) {
-            timeZone = TimeZone.getTimeZone(cmdTimeZone);
-            timeZoneId = timeZone.getID();
-            if (!timeZoneId.equals(cmdTimeZone)) {
-                logger.warn("Using timezone [{}] for running the schedule [{}] for VM {}, as an equivalent of [{}].",
-                        timeZoneId, vmSchedule.getSchedule(), userVmManager.getUserVm(vmSchedule.getVmId()), cmdTimeZone);
-            }
-            vmSchedule.setTimeZone(timeZoneId);
-        } else {
-            timeZoneId = vmSchedule.getTimeZone();
-            timeZone = TimeZone.getTimeZone(timeZoneId);
-        }
-
-        Date startDate = vmSchedule.getStartDate().before(DateUtils.addMinutes(new Date(), 1)) ? DateUtils.addMinutes(new Date(), 1) : vmSchedule.getStartDate();
-        Date endDate = vmSchedule.getEndDate();
-        if (cmdEndDate != null) {
-            endDate = Date.from(DateUtil.getZoneDateTime(cmdEndDate, timeZone.toZoneId()).toInstant());
-        }
-
-        if (cmdStartDate != null) {
-            startDate = Date.from(DateUtil.getZoneDateTime(cmdStartDate, timeZone.toZoneId()).toInstant());
-        }
-
-        if (ObjectUtils.anyNotNull(cmdStartDate, cmdEndDate, cmdTimeZone) &&
-                (!Objects.equals(originalTimeZone, timeZoneId) ||
-                        !Objects.equals(originalStartDate, startDate) ||
-                        !Objects.equals(originalEndDate, endDate))) {
-            validateStartDateEndDate(Objects.requireNonNullElse(startDate, DateUtils.addMinutes(new Date(), 1)),
-                    endDate, timeZone);
-        }
-
-        if (enabled != null) {
-            vmSchedule.setEnabled(enabled);
-        }
-        if (description != null) {
-            vmSchedule.setDescription(description);
-        }
-        if (cmdEndDate != null) {
-            vmSchedule.setEndDate(endDate);
-        }
-        if (cmdStartDate != null) {
-            vmSchedule.setStartDate(startDate);
-        }
-        vmSchedule.setSchedule(cronExpression.toString());
-
-        return Transaction.execute((TransactionCallback<VMScheduleResponse>) status -> {
-            vmScheduleDao.update(cmd.getId(), vmSchedule);
-            vmScheduler.updateScheduledJob(vmSchedule);
-            CallContext.current().setEventResourceId(vm.getId());
-            CallContext.current().setEventResourceType(ApiCommandResourceType.VirtualMachine);
-            return createResponse(vmSchedule);
-        });
-    }
-
-    void validateStartDateEndDate(Date startDate, Date endDate, TimeZone tz) {
-        ZonedDateTime now = ZonedDateTime.now(tz.toZoneId());
-        ZonedDateTime zonedStartDate = ZonedDateTime.ofInstant(startDate.toInstant(), tz.toZoneId());
-
-        if (zonedStartDate.isBefore(now)) {
-            throw new InvalidParameterValueException(String.format("Invalid value for start date. Start date [%s] can't be before current time [%s].", zonedStartDate, now));
-        }
-
-        if (endDate != null) {
-            ZonedDateTime zonedEndDate = ZonedDateTime.ofInstant(endDate.toInstant(), tz.toZoneId());
-            if (zonedEndDate.isBefore(now)) {
-                throw new InvalidParameterValueException(String.format("Invalid value for end date. End date [%s] can't be before current time [%s].", zonedEndDate, now));
-            }
-            if (zonedEndDate.isBefore(zonedStartDate)) {
-                throw new InvalidParameterValueException(String.format("Invalid value for end date. End date [%s] can't be before start date [%s].", zonedEndDate, zonedStartDate));
-            }
-        }
-    }
-
-    @Override
-    @ActionEvent(eventType = EventTypes.EVENT_VM_SCHEDULE_DELETE, eventDescription = "Deleting VM Schedule for VM")
-    public long removeScheduleByVmId(long vmId, boolean expunge) {
-        SearchCriteria<VMScheduleVO> sc = vmScheduleDao.getSearchCriteriaForVMId(vmId);
-        List<VMScheduleVO> vmSchedules = vmScheduleDao.search(sc, null);
-        List<Long> ids = new ArrayList<>();
-        for (final VMScheduleVO vmSchedule : vmSchedules) {
-            ids.add(vmSchedule.getId());
-        }
-        vmScheduler.removeScheduledJobs(ids);
-        if (expunge) {
-            return vmScheduleDao.expunge(sc);
-        }
-        CallContext.current().setEventResourceId(vmId);
-        CallContext.current().setEventResourceType(ApiCommandResourceType.VirtualMachine);
-        return vmScheduleDao.remove(sc);
-    }
-
-    @Override
-    @ActionEvent(eventType = EventTypes.EVENT_VM_SCHEDULE_DELETE, eventDescription = "Deleting VM Schedule")
-    public Long removeSchedule(DeleteVMScheduleCmd cmd) {
-        VirtualMachine vm = userVmManager.getUserVm(cmd.getVmId());
-        accountManager.checkAccess(CallContext.current().getCallingAccount(), null, false, vm);
-
-        List<Long> ids = getIdsListFromCmd(cmd.getId(), cmd.getIds());
-
-        if (ids.isEmpty()) {
-            throw new InvalidParameterValueException("Either id or ids parameter must be specified");
-        }
-        return Transaction.execute((TransactionCallback<Long>) status -> {
-            vmScheduler.removeScheduledJobs(ids);
-            CallContext.current().setEventResourceId(vm.getId());
-            CallContext.current().setEventResourceType(ApiCommandResourceType.VirtualMachine);
-            return vmScheduleDao.removeSchedulesForVmIdAndIds(vm.getId(), ids);
-        });
-    }
-}
diff --git a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduler.java b/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduler.java
deleted file mode 100644
index fa96a1c97b9..00000000000
--- a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.vm.schedule;
-
-import com.cloud.utils.component.Manager;
-import com.cloud.utils.concurrency.Scheduler;
-import org.apache.cloudstack.framework.config.ConfigKey;
-
-import java.util.Date;
-import java.util.List;
-
-public interface VMScheduler extends Manager, Scheduler {
-    ConfigKey<Integer> VMScheduledJobExpireInterval = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Integer.class, "vmscheduler.jobs.expire.interval", "30", "VM Scheduler expire interval in days", true);
-
-    void removeScheduledJobs(List<Long> vmScheduleIds);
-
-    void updateScheduledJob(VMScheduleVO vmSchedule);
-
-    Date scheduleNextJob(VMScheduleVO vmSchedule, Date timestamp);
-}
diff --git a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedulerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedulerImpl.java
deleted file mode 100644
index 56d794fa5c2..00000000000
--- a/server/src/main/java/org/apache/cloudstack/vm/schedule/VMSchedulerImpl.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.vm.schedule;
-
-import com.cloud.api.ApiGsonHelper;
-import com.cloud.event.ActionEventUtils;
-import com.cloud.event.EventTypes;
-import com.cloud.user.User;
-import com.cloud.utils.DateUtil;
-import com.cloud.utils.component.ComponentContext;
-import com.cloud.utils.component.ManagerBase;
-import com.cloud.utils.db.GlobalLock;
-import com.cloud.vm.UserVmManager;
-import com.cloud.vm.VirtualMachine;
-import com.google.common.primitives.Longs;
-import org.apache.cloudstack.api.ApiCommandResourceType;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
-import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
-import org.apache.cloudstack.api.command.user.vm.StopVMCmd;
-import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.Configurable;
-import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher;
-import org.apache.cloudstack.framework.jobs.AsyncJobManager;
-import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
-import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
-import org.apache.cloudstack.vm.schedule.dao.VMScheduleDao;
-import org.apache.cloudstack.vm.schedule.dao.VMScheduledJobDao;
-import org.apache.commons.lang.time.DateUtils;
-import org.springframework.scheduling.support.CronExpression;
-
-import javax.inject.Inject;
-import javax.persistence.EntityExistsException;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class VMSchedulerImpl extends ManagerBase implements VMScheduler, Configurable {
-    @Inject
-    private VMScheduledJobDao vmScheduledJobDao;
-    @Inject
-    private VMScheduleDao vmScheduleDao;
-    @Inject
-    private UserVmManager userVmManager;
-    @Inject
-    private AsyncJobManager asyncJobManager;
-    private AsyncJobDispatcher asyncJobDispatcher;
-    private Timer vmSchedulerTimer;
-    private Date currentTimestamp;
-
-    private EnumMap<VMSchedule.Action, String> actionEventMap = new EnumMap<>(VMSchedule.Action.class);
-
-    public AsyncJobDispatcher getAsyncJobDispatcher() {
-        return asyncJobDispatcher;
-    }
-
-    public void setAsyncJobDispatcher(final AsyncJobDispatcher dispatcher) {
-        asyncJobDispatcher = dispatcher;
-    }
-
-    @Override
-    public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[]{VMScheduledJobExpireInterval};
-    }
-
-    @Override
-    public String getConfigComponentName() {
-        return VMScheduler.class.getSimpleName();
-    }
-
-    @Override
-    public void removeScheduledJobs(List<Long> vmScheduleIds) {
-        if (vmScheduleIds == null || vmScheduleIds.isEmpty()) {
-            logger.debug("Removed 0 scheduled jobs");
-            return;
-        }
-        Date now = new Date();
-        int rowsRemoved = vmScheduledJobDao.expungeJobsForSchedules(vmScheduleIds, now);
-        logger.debug(String.format("Removed %s VM scheduled jobs", rowsRemoved));
-    }
-
-    @Override
-    public void updateScheduledJob(VMScheduleVO vmSchedule) {
-        removeScheduledJobs(Longs.asList(vmSchedule.getId()));
-        scheduleNextJob(vmSchedule, new Date());
-    }
-
-    @Override
-    public Date scheduleNextJob(VMScheduleVO vmSchedule, Date timestamp) {
-        if (!vmSchedule.getEnabled()) {
-            logger.debug("VM Schedule {} for VM {} with id {} is disabled. Not scheduling next job.",
-                    vmSchedule::toString, () -> userVmManager.getUserVm(vmSchedule.getVmId()), vmSchedule::getVmId);
-            return null;
-        }
-
-        CronExpression cron = DateUtil.parseSchedule(vmSchedule.getSchedule());
-        Date startDate = vmSchedule.getStartDate();
-        Date endDate = vmSchedule.getEndDate();
-        VirtualMachine vm = userVmManager.getUserVm(vmSchedule.getVmId());
-
-        if (vm == null) {
-            logger.info("VM id={} is removed. Disabling VM schedule {}.", vmSchedule.getVmId(), vmSchedule);
-            vmSchedule.setEnabled(false);
-            vmScheduleDao.persist(vmSchedule);
-            return null;
-        }
-
-        ZonedDateTime now;
-        if (timestamp != null) {
-            now = ZonedDateTime.ofInstant(timestamp.toInstant(), vmSchedule.getTimeZoneId());
-        } else {
-            now = ZonedDateTime.now(vmSchedule.getTimeZoneId());
-        }
-        ZonedDateTime zonedStartDate = ZonedDateTime.ofInstant(startDate.toInstant(), vmSchedule.getTimeZoneId());
-        ZonedDateTime zonedEndDate = null;
-        if (endDate != null) {
-            zonedEndDate = ZonedDateTime.ofInstant(endDate.toInstant(), vmSchedule.getTimeZoneId());
-        }
-        if (zonedEndDate != null && now.isAfter(zonedEndDate)) {
-            logger.info("End time is less than current time. Disabling VM schedule {} for VM {}.", vmSchedule, vm);
-            vmSchedule.setEnabled(false);
-            vmScheduleDao.persist(vmSchedule);
-            return null;
-        }
-
-        ZonedDateTime ts = null;
-        if (zonedStartDate.isAfter(now)) {
-            ts = cron.next(zonedStartDate);
-        } else {
-            ts = cron.next(now);
-        }
-
-        if (ts == null) {
-            logger.info("No next schedule found. Disabling VM schedule {} for VM {}.", vmSchedule, vm);
-            vmSchedule.setEnabled(false);
-            vmScheduleDao.persist(vmSchedule);
-            return null;
-        }
-
-        Date scheduledDateTime = Date.from(ts.toInstant());
-        VMScheduledJobVO scheduledJob = vmScheduledJobDao.findByScheduleAndTimestamp(vmSchedule.getId(), scheduledDateTime);
-        if (scheduledJob != null) {
-            logger.trace("Job is already scheduled for schedule {} at {}", vmSchedule, scheduledDateTime);
-            return scheduledDateTime;
-        }
-
-        scheduledJob = new VMScheduledJobVO(vmSchedule.getVmId(), vmSchedule.getId(), vmSchedule.getAction(), scheduledDateTime);
-        try {
-            vmScheduledJobDao.persist(scheduledJob);
-            ActionEventUtils.onScheduledActionEvent(User.UID_SYSTEM, vm.getAccountId(), actionEventMap.get(vmSchedule.getAction()),
-                    String.format("Scheduled action (%s) [vm: %s, schedule: %s] at %s", vmSchedule.getAction(), vm, vmSchedule, scheduledDateTime),
-                    vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), true, 0);
-        } catch (EntityExistsException exception) {
-            logger.debug("Job is already scheduled.");
-        }
-        return scheduledDateTime;
-    }
-
-    @Override
-    public boolean start() {
-        actionEventMap.put(VMSchedule.Action.START, EventTypes.EVENT_VM_SCHEDULE_START);
-        actionEventMap.put(VMSchedule.Action.STOP, EventTypes.EVENT_VM_SCHEDULE_STOP);
-        actionEventMap.put(VMSchedule.Action.REBOOT, EventTypes.EVENT_VM_SCHEDULE_REBOOT);
-        actionEventMap.put(VMSchedule.Action.FORCE_STOP, EventTypes.EVENT_VM_SCHEDULE_FORCE_STOP);
-        actionEventMap.put(VMSchedule.Action.FORCE_REBOOT, EventTypes.EVENT_VM_SCHEDULE_FORCE_REBOOT);
-
-        // Adding 1 minute to currentTimestamp to ensure that
-        // jobs which were to be run at current time, doesn't cause issues
-        currentTimestamp = DateUtils.addMinutes(new Date(), 1);
-        scheduleNextJobs(currentTimestamp);
-
-        final TimerTask schedulerPollTask = new ManagedContextTimerTask() {
-            @Override
-            protected void runInContext() {
-                try {
-                    poll(new Date());
-                } catch (final Throwable t) {
-                    logger.warn("Catch throwable in VM scheduler ", t);
-                }
-            }
-        };
-
-        vmSchedulerTimer = new Timer("VMSchedulerPollTask");
-        vmSchedulerTimer.scheduleAtFixedRate(schedulerPollTask, 5000L, 60 * 1000L);
-        return true;
-    }
-
-    @Override
-    public void poll(Date timestamp) {
-        currentTimestamp = DateUtils.round(timestamp, Calendar.MINUTE);
-        String displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, currentTimestamp);
-        logger.debug(String.format("VM scheduler.poll is being called at %s", displayTime));
-
-        GlobalLock scanLock = GlobalLock.getInternLock("vmScheduler.poll");
-        try {
-            if (scanLock.lock(30)) {
-                try {
-                    scheduleNextJobs(currentTimestamp);
-                } finally {
-                    scanLock.unlock();
-                }
-            }
-        } finally {
-            scanLock.releaseRef();
-        }
-
-        scanLock = GlobalLock.getInternLock("vmScheduler.poll");
-        try {
-            if (scanLock.lock(30)) {
-                try {
-                    startJobs(); // Create async job and update scheduled job
-                } finally {
-                    scanLock.unlock();
-                }
-            }
-        } finally {
-            scanLock.releaseRef();
-        }
-
-        try {
-            cleanupVMScheduledJobs();
-        } catch (Exception e) {
-            logger.warn("Error in cleaning up vm scheduled jobs", e);
-        }
-    }
-
-    private void scheduleNextJobs(Date timestamp) {
-        for (final VMScheduleVO schedule : vmScheduleDao.listAllActiveSchedules()) {
-            try {
-                scheduleNextJob(schedule, timestamp);
-            } catch (Exception e) {
-                logger.warn("Error in scheduling next job for schedule {}", schedule, e);
-            }
-        }
-    }
-
-    /**
-     * Delete scheduled jobs before vm.scheduler.expire.interval days
-     */
-    private void cleanupVMScheduledJobs() {
-        Date deleteBeforeDate = DateUtils.addDays(currentTimestamp, -1 * VMScheduledJobExpireInterval.value());
-        int rowsRemoved = vmScheduledJobDao.expungeJobsBefore(deleteBeforeDate);
-        logger.info(String.format("Cleaned up %d VM scheduled job entries", rowsRemoved));
-    }
-
-    void executeJobs(Map<Long, VMScheduledJob> jobsToExecute) {
-        String displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, currentTimestamp);
-
-        for (Map.Entry<Long, VMScheduledJob> entry : jobsToExecute.entrySet()) {
-            VMScheduledJob vmScheduledJob = entry.getValue();
-            VirtualMachine vm = userVmManager.getUserVm(vmScheduledJob.getVmId());
-
-            VMScheduledJobVO tmpVMScheduleJob = null;
-            try {
-                if (logger.isDebugEnabled()) {
-                    final Date scheduledTimestamp = vmScheduledJob.getScheduledTime();
-                    displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, scheduledTimestamp);
-                    logger.debug("Executing {} for VM {} for scheduled job: {} at {}",
-                            vmScheduledJob.getAction(), vm, vmScheduledJob, displayTime);
-                }
-
-                tmpVMScheduleJob = vmScheduledJobDao.acquireInLockTable(vmScheduledJob.getId());
-                Long jobId = processJob(vmScheduledJob, vm);
-                if (jobId != null) {
-                    tmpVMScheduleJob.setAsyncJobId(jobId);
-                    vmScheduledJobDao.update(vmScheduledJob.getId(), tmpVMScheduleJob);
-                }
-            } catch (final Exception e) {
-                logger.warn("Executing scheduled job {} failed due to {}", vmScheduledJob, e);
-            } finally {
-                if (tmpVMScheduleJob != null) {
-                    vmScheduledJobDao.releaseFromLockTable(vmScheduledJob.getId());
-                }
-            }
-        }
-    }
-
-    Long processJob(VMScheduledJob vmScheduledJob, VirtualMachine vm) {
-        if (!Arrays.asList(VirtualMachine.State.Running, VirtualMachine.State.Stopped).contains(vm.getState())) {
-            logger.info("Skipping action ({}) for [vm: {}, scheduled job: {}] because VM is invalid state: {}",
-                    vmScheduledJob.getAction(), vm, vmScheduledJob, vm.getState());
-            return null;
-        }
-
-        final Long eventId = ActionEventUtils.onCompletedActionEvent(User.UID_SYSTEM, vm.getAccountId(), null,
-                actionEventMap.get(vmScheduledJob.getAction()), true,
-                String.format("Executing action (%s) for VM: %s", vmScheduledJob.getAction(), vm),
-                vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), 0);
-
-        if (vm.getState() == VirtualMachine.State.Running) {
-            switch (vmScheduledJob.getAction()) {
-                case STOP:
-                    return executeStopVMJob(vm, false, eventId);
-                case FORCE_STOP:
-                    return executeStopVMJob(vm, true, eventId);
-                case REBOOT:
-                    return executeRebootVMJob(vm, false, eventId);
-                case FORCE_REBOOT:
-                    return executeRebootVMJob(vm, true, eventId);
-            }
-        } else if (vm.getState() == VirtualMachine.State.Stopped && vmScheduledJob.getAction() == VMSchedule.Action.START) {
-            return executeStartVMJob(vm, eventId);
-        }
-
-        logger.warn("Skipping action ({}) for [vm: {}, scheduled job: {}] because VM is in state: {}",
-                vmScheduledJob.getAction(), vm, vmScheduledJob, vm.getState());
-        return null;
-    }
-
-    private void skipJobs(Map<Long, VMScheduledJob> jobsToExecute, Map<Long, List<VMScheduledJob>> jobsNotToExecute) {
-        for (Map.Entry<Long, List<VMScheduledJob>> entry : jobsNotToExecute.entrySet()) {
-            Long vmId = entry.getKey();
-            List<VMScheduledJob> skippedVmScheduledJobVOS = entry.getValue();
-            VirtualMachine vm = userVmManager.getUserVm(vmId);
-            for (final VMScheduledJob skippedVmScheduledJobVO : skippedVmScheduledJobVOS) {
-                VMScheduledJob scheduledJob = jobsToExecute.get(vmId);
-                logger.info("Skipping scheduled job {} for vm {} because of conflict with another scheduled job {}",
-                        skippedVmScheduledJobVO, vm, scheduledJob);
-            }
-        }
-    }
-
-    /**
-     * Create async jobs for VM scheduled jobs
-     */
-    private void startJobs() {
-        String displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, currentTimestamp);
-
-        final List<VMScheduledJobVO> vmScheduledJobs = vmScheduledJobDao.listJobsToStart(currentTimestamp);
-        logger.debug(String.format("Got %d scheduled jobs to be executed at %s", vmScheduledJobs.size(), displayTime));
-
-        Map<Long, VMScheduledJob> jobsToExecute = new HashMap<>();
-        Map<Long, List<VMScheduledJob>> jobsNotToExecute = new HashMap<>();
-        for (final VMScheduledJobVO vmScheduledJobVO : vmScheduledJobs) {
-            long vmId = vmScheduledJobVO.getVmId();
-            if (jobsToExecute.get(vmId) == null) {
-                jobsToExecute.put(vmId, vmScheduledJobVO);
-            } else {
-                jobsNotToExecute.computeIfAbsent(vmId, k -> new ArrayList<>()).add(vmScheduledJobVO);
-            }
-        }
-
-        executeJobs(jobsToExecute);
-        skipJobs(jobsToExecute, jobsNotToExecute);
-    }
-
-    long executeStartVMJob(VirtualMachine vm, long eventId) {
-        final Map<String, String> params = new HashMap<>();
-        params.put(ApiConstants.ID, String.valueOf(vm.getId()));
-        params.put("ctxUserId", "1");
-        params.put("ctxAccountId", String.valueOf(vm.getAccountId()));
-        params.put(ApiConstants.CTX_START_EVENT_ID, String.valueOf(eventId));
-
-        final StartVMCmd cmd = new StartVMCmd();
-        ComponentContext.inject(cmd);
-
-        AsyncJobVO job = new AsyncJobVO("", User.UID_SYSTEM, vm.getAccountId(), StartVMCmd.class.getName(), ApiGsonHelper.getBuilder().create().toJson(params), vm.getId(), cmd.getApiResourceType() != null ? cmd.getApiResourceType().toString() : null, null);
-        job.setDispatcher(asyncJobDispatcher.getName());
-
-        return asyncJobManager.submitAsyncJob(job);
-    }
-
-    long executeStopVMJob(VirtualMachine vm, boolean isForced, long eventId) {
-        final Map<String, String> params = new HashMap<>();
-        params.put(ApiConstants.ID, String.valueOf(vm.getId()));
-        params.put("ctxUserId", "1");
-        params.put("ctxAccountId", String.valueOf(vm.getAccountId()));
-        params.put(ApiConstants.CTX_START_EVENT_ID, String.valueOf(eventId));
-        params.put(ApiConstants.FORCED, String.valueOf(isForced));
-
-        final StopVMCmd cmd = new StopVMCmd();
-        ComponentContext.inject(cmd);
-
-        AsyncJobVO job = new AsyncJobVO("", User.UID_SYSTEM, vm.getAccountId(), StopVMCmd.class.getName(), ApiGsonHelper.getBuilder().create().toJson(params), vm.getId(), cmd.getApiResourceType() != null ? cmd.getApiResourceType().toString() : null, null);
-        job.setDispatcher(asyncJobDispatcher.getName());
-
-        return asyncJobManager.submitAsyncJob(job);
-    }
-
-    long executeRebootVMJob(VirtualMachine vm, boolean isForced, long eventId) {
-        final Map<String, String> params = new HashMap<>();
-        params.put(ApiConstants.ID, String.valueOf(vm.getId()));
-        params.put("ctxUserId", "1");
-        params.put("ctxAccountId", String.valueOf(vm.getAccountId()));
-        params.put(ApiConstants.CTX_START_EVENT_ID, String.valueOf(eventId));
-        params.put(ApiConstants.FORCED, String.valueOf(isForced));
-
-        final RebootVMCmd cmd = new RebootVMCmd();
-        ComponentContext.inject(cmd);
-
-        AsyncJobVO job = new AsyncJobVO("", User.UID_SYSTEM, vm.getAccountId(), RebootVMCmd.class.getName(), ApiGsonHelper.getBuilder().create().toJson(params), vm.getId(), cmd.getApiResourceType() != null ? cmd.getApiResourceType().toString() : null, null);
-        job.setDispatcher(asyncJobDispatcher.getName());
-
-        return asyncJobManager.submitAsyncJob(job);
-    }
-}
diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index 48fe5bb415d..429a1f54b73 100644
--- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -183,6 +183,8 @@
 
     <bean id="oCFS2ManagerImpl" class="com.cloud.storage.OCFS2ManagerImpl" />
 
+    <bean id="clvmPoolManager" class="com.cloud.storage.clvm.ClvmPoolManager" />
+
     <bean id="outOfBandManagementServiceImpl" class="org.apache.cloudstack.outofbandmanagement.OutOfBandManagementServiceImpl">
         <property name="outOfBandManagementDrivers" value="#{outOfBandManagementDriversRegistry.registered}" />
     </bean>
@@ -374,8 +376,11 @@
     <bean id="bucketApiServiceImpl" class="org.apache.cloudstack.storage.object.BucketApiServiceImpl" />
     <bean id="routedIpv4ManagerImpl" class="org.apache.cloudstack.network.RoutedIpv4ManagerImpl" />
 
-    <bean id="VMScheduleManagerImpl" class="org.apache.cloudstack.vm.schedule.VMScheduleManagerImpl" />
-    <bean id="VMSchedulerImpl" class="org.apache.cloudstack.vm.schedule.VMSchedulerImpl">
+    <bean id="ResourceScheduleManagerImpl" class="org.apache.cloudstack.schedule.ResourceScheduleManagerImpl" />
+    <bean id="VMScheduleWorker" class="org.apache.cloudstack.schedule.vm.VMScheduleWorker">
+        <property name="asyncJobDispatcher" ref="ApiAsyncJobDispatcher" />
+    </bean>
+    <bean id="AutoScaleScheduleWorker" class="org.apache.cloudstack.schedule.autoscale.AutoScaleScheduleWorker">
         <property name="asyncJobDispatcher" ref="ApiAsyncJobDispatcher" />
     </bean>
 
diff --git a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
index 00cac5bbd52..f39ed06a656 100644
--- a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
+++ b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
@@ -193,7 +193,7 @@ public class FirstFitAllocatorTest {
     Mockito.doReturn(account).when(virtualMachineProfile).getOwner();
     Mockito.doReturn(hostTag).when(serviceOffering).getHostTag();
     Mockito.doReturn(templateTag).when(vmTemplateVO).getTemplateTag();
-    Mockito.doReturn(emptyList).when(firstFitAllocatorSpy).retrieveHosts(Mockito.any(VirtualMachineProfile.class), Mockito.any(Host.Type.class), Mockito.nullable(List.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
+    Mockito.doReturn(emptyList).when(firstFitAllocatorSpy).retrieveHosts(Mockito.any(VirtualMachineProfile.class), Mockito.any(Host.Type.class), Mockito.nullable(List.class), Mockito.any(VMTemplateVO.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
     List<Host> suitableHosts = firstFitAllocatorSpy.allocateTo(virtualMachineProfile, deploymentPlan, type, excludeList, null, HostAllocator.RETURN_UPTO_ALL, considerReservedCapacity);
 
     Assert.assertNull(suitableHosts);
@@ -208,7 +208,7 @@ public class FirstFitAllocatorTest {
     Mockito.doReturn(account).when(virtualMachineProfile).getOwner();
     Mockito.doReturn(hostTag).when(serviceOffering).getHostTag();
     Mockito.doReturn(templateTag).when(vmTemplateVO).getTemplateTag();
-    Mockito.doReturn(hosts).when(firstFitAllocatorSpy).retrieveHosts(Mockito.any(VirtualMachineProfile.class), Mockito.any(Host.Type.class), Mockito.nullable(List.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
+    Mockito.doReturn(hosts).when(firstFitAllocatorSpy).retrieveHosts(Mockito.any(VirtualMachineProfile.class), Mockito.any(Host.Type.class), Mockito.nullable(List.class), Mockito.any(VMTemplateVO.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
     Mockito.doReturn(hosts).when(firstFitAllocatorSpy).allocateTo(Mockito.any(VirtualMachineProfile.class), Mockito.any(DeploymentPlan.class), Mockito.any(ServiceOffering.class), Mockito.any(VMTemplateVO.class), Mockito.any(DeploymentPlanner.ExcludeList.class), Mockito.anyList(), Mockito.anyInt(), Mockito.anyBoolean(), Mockito.any(Account.class));
     Mockito.doNothing().when(firstFitAllocatorSpy).addHostsToAvoidSet(Mockito.any(Host.Type.class), Mockito.any(DeploymentPlanner.ExcludeList.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyList());
     List<Host> suitableHosts = firstFitAllocatorSpy.allocateTo(virtualMachineProfile, deploymentPlan, type, excludeList, null, HostAllocator.RETURN_UPTO_ALL, considerReservedCapacity);
@@ -226,7 +226,7 @@ public class FirstFitAllocatorTest {
     Mockito.doReturn(account).when(virtualMachineProfile).getOwner();
     Mockito.doReturn(hostTag).when(serviceOffering).getHostTag();
     Mockito.doReturn(templateTag).when(vmTemplateVO).getTemplateTag();
-    Mockito.doReturn(hosts).when(firstFitAllocatorSpy).retrieveHosts(Mockito.any(VirtualMachineProfile.class), Mockito.any(Host.Type.class), Mockito.nullable(List.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
+    Mockito.doReturn(hosts).when(firstFitAllocatorSpy).retrieveHosts(Mockito.any(VirtualMachineProfile.class), Mockito.any(Host.Type.class), Mockito.nullable(List.class), Mockito.any(VMTemplateVO.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
     Mockito.doReturn(hosts).when(firstFitAllocatorSpy).allocateTo(Mockito.any(VirtualMachineProfile.class), Mockito.any(DeploymentPlan.class), Mockito.any(ServiceOffering.class), Mockito.any(VMTemplateVO.class), Mockito.any(DeploymentPlanner.ExcludeList.class), Mockito.anyList(), Mockito.anyInt(), Mockito.anyBoolean(), Mockito.any(Account.class));
     Mockito.doNothing().when(firstFitAllocatorSpy).addHostsToAvoidSet(Mockito.any(Host.Type.class), Mockito.any(DeploymentPlanner.ExcludeList.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyList());
     firstFitAllocatorSpy.allocateTo(virtualMachineProfile, deploymentPlan, type, excludeList, null, HostAllocator.RETURN_UPTO_ALL, considerReservedCapacity);
@@ -245,7 +245,8 @@ public class FirstFitAllocatorTest {
     Mockito.doReturn(hostsWithHaTag).when(hostDaoMock).listByHostTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString());
     Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsWithUefiEnabled(Mockito.any(Host.Type.class), Mockito.any(VirtualMachineProfile.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyList());
     Mockito.doNothing().when(firstFitAllocatorSpy).addHostsBasedOnTagRules(Mockito.anyString(), Mockito.anyList());
-    List<HostVO> resultHosts = firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, emptyList, clusterId, podId, dcId, hostTag, templateTag);
+    Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
+    List<HostVO> resultHosts = firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, emptyList, vmTemplateVO, clusterId, podId, dcId, hostTag, templateTag);
 
     Assert.assertEquals(2, resultHosts.size());
     Assert.assertEquals(host1, resultHosts.get(0));
@@ -262,7 +263,8 @@ public class FirstFitAllocatorTest {
     Mockito.doReturn(hostsWithHaTag).when(hostDaoMock).listByHostTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString());
     Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsWithUefiEnabled(Mockito.any(Host.Type.class), Mockito.any(VirtualMachineProfile.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyList());
     Mockito.doNothing().when(firstFitAllocatorSpy).addHostsBasedOnTagRules(Mockito.anyString(), Mockito.anyList());
-    List<HostVO> resultHosts = firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, hostsToFilter, clusterId, podId, dcId, hostTag, templateTag);
+    Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
+    List<HostVO> resultHosts = firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, hostsToFilter, vmTemplateVO, clusterId, podId, dcId, hostTag, templateTag);
 
     Assert.assertEquals(2, resultHosts.size());
     Assert.assertEquals(host1, resultHosts.get(0));
@@ -278,7 +280,8 @@ public class FirstFitAllocatorTest {
     Mockito.doReturn(upAndEnabledHostsWithNoHa).when(resourceManagerMock).listAllUpAndEnabledNonHAHosts(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
     Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsWithUefiEnabled(Mockito.any(Host.Type.class), Mockito.any(VirtualMachineProfile.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyList());
     Mockito.doNothing().when(firstFitAllocatorSpy).addHostsBasedOnTagRules(Mockito.nullable(String.class), Mockito.anyList());
-    List<HostVO> resultHosts = firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, emptyList, clusterId, podId, dcId, null, null);
+    Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
+    List<HostVO> resultHosts = firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, emptyList, vmTemplateVO, clusterId, podId, dcId, null, null);
 
     Assert.assertEquals(2, resultHosts.size());
     Assert.assertEquals(host1, resultHosts.get(0));
@@ -293,7 +296,8 @@ public class FirstFitAllocatorTest {
     Mockito.doNothing().when(firstFitAllocatorSpy).retainHostsMatchingServiceOfferingAndTemplateTags(Mockito.anyList(), Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
     Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsWithUefiEnabled(Mockito.any(Host.Type.class), Mockito.any(VirtualMachineProfile.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyList());
     Mockito.doNothing().when(firstFitAllocatorSpy).addHostsBasedOnTagRules(Mockito.anyString(), Mockito.anyList());
-    firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, emptyList, clusterId, podId, dcId, hostTag, templateTag);
+    Mockito.doNothing().when(firstFitAllocatorSpy).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
+    firstFitAllocatorSpy.retrieveHosts(virtualMachineProfile, type, emptyList, vmTemplateVO, clusterId, podId, dcId, hostTag, templateTag);
 
     Mockito.verify(firstFitAllocatorSpy, Mockito.times(1)).retainHostsMatchingServiceOfferingAndTemplateTags(Mockito.anyList(), Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
   }
diff --git a/server/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java b/server/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
index ab9b322eb84..938ed7a152e 100644
--- a/server/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
+++ b/server/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
@@ -222,6 +222,7 @@ public class RandomAllocatorTest {
         Mockito.doReturn(upAndEnabledHosts).when(resourceManagerMock).listAllUpAndEnabledHosts(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(hostsWithNoRuleTagsAndHostTags).when(hostDao).listAllHostsThatHaveNoRuleTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(emptyList).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, null, vmTemplateVO, null, clusterId, podId, zoneId);
 
         Assert.assertEquals(1, availableHosts.size());
@@ -237,6 +238,7 @@ public class RandomAllocatorTest {
         Mockito.doReturn(upAndEnabledHosts).when(resourceManagerMock).listAllUpAndEnabledHosts(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(hostsWithNoRuleTagsAndHostTags).when(hostDao).listAllHostsThatHaveNoRuleTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(hostsMatchingRuleTags).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, null, vmTemplateVO, null, clusterId, podId, zoneId);
 
         Assert.assertEquals(2, availableHosts.size());
@@ -252,6 +254,7 @@ public class RandomAllocatorTest {
         Mockito.doReturn(upAndEnabledHosts).when(resourceManagerMock).listAllUpAndEnabledHosts(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(hostsWithMatchingTags).when(hostDao).listByHostTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString());
         Mockito.doReturn(emptyList).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, null, vmTemplateVO, hostTag, clusterId, podId, zoneId);
 
         Assert.assertEquals(1, availableHosts.size());
@@ -267,6 +270,7 @@ public class RandomAllocatorTest {
         Mockito.doReturn(upAndEnabledHosts).when(resourceManagerMock).listAllUpAndEnabledHosts(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(hostsWithMatchingTags).when(hostDao).listByHostTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString());
         Mockito.doReturn(hostsMatchingRuleTags).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, null, vmTemplateVO, hostTag, clusterId, podId, zoneId);
 
         Assert.assertEquals(2, availableHosts.size());
@@ -281,6 +285,7 @@ public class RandomAllocatorTest {
 
         Mockito.doReturn(hostsWithNoRuleTagsAndHostTags).when(hostDao).listAllHostsThatHaveNoRuleTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(emptyList).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, providedHosts, vmTemplateVO, null, clusterId, podId, zoneId);
 
         Assert.assertEquals(1, availableHosts.size());
@@ -295,6 +300,7 @@ public class RandomAllocatorTest {
 
         Mockito.doReturn(hostsWithNoRuleTagsAndHostTags).when(hostDao).listAllHostsThatHaveNoRuleTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong());
         Mockito.doReturn(hostsMatchingRuleTags).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, providedHosts, vmTemplateVO, null, clusterId, podId, zoneId);
 
         Assert.assertEquals(2, availableHosts.size());
@@ -309,6 +315,7 @@ public class RandomAllocatorTest {
 
         Mockito.doReturn(hostsWithMatchingTags).when(hostDao).listByHostTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString());
         Mockito.doReturn(emptyList).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, providedHosts, vmTemplateVO, hostTag, clusterId, podId, zoneId);
 
         Assert.assertEquals(1, availableHosts.size());
@@ -323,6 +330,7 @@ public class RandomAllocatorTest {
 
         Mockito.doReturn(hostsWithMatchingTags).when(hostDao).listByHostTag(Mockito.any(Host.Type.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString());
         Mockito.doReturn(hostsMatchingRuleTags).when(hostDao).findHostsWithTagRuleThatMatchComputeOfferingTags(Mockito.nullable(String.class));
+        Mockito.doNothing().when(randomAllocator).filterHostsBasedOnGuestOsRules(Mockito.any(VMTemplateVO.class), Mockito.anyList());
         List<HostVO> availableHosts = randomAllocator.retrieveHosts(type, providedHosts, vmTemplateVO, hostTag, clusterId, podId, zoneId);
 
         Assert.assertEquals(2, availableHosts.size());
diff --git a/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java
index e4146fd2265..f657a8bbf04 100755
--- a/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java
+++ b/server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java
@@ -16,10 +16,12 @@
 // under the License.
 package com.cloud.api.query.dao;
 
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumSet;
 
 import com.cloud.storage.dao.VMTemplateDao;
@@ -49,9 +51,11 @@ import com.cloud.user.AccountManager;
 import com.cloud.user.UserStatisticsVO;
 import com.cloud.user.dao.UserDao;
 import com.cloud.user.dao.UserStatisticsDao;
+import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.vm.dao.VMInstanceDetailsDao;
+import com.cloud.vm.dao.VmIsoMapDao;
 
 @RunWith(MockitoJUnitRunner.class)
 public class UserVmJoinDaoImplTest extends GenericDaoBaseWithTagInformationBaseTest<UserVmJoinVO, UserVmResponse> {
@@ -83,6 +87,12 @@ public class UserVmJoinDaoImplTest extends GenericDaoBaseWithTagInformationBaseT
     @Mock
     private VMTemplateDao vmTemplateDao;
 
+    @Mock
+    private VmIsoMapDao vmIsoMapDao;
+
+    @Mock
+    private HostDetailsDao hostDetailsDao;
+
     @Mock
     ExtensionHelper extensionHelper;
 
@@ -103,6 +113,7 @@ public class UserVmJoinDaoImplTest extends GenericDaoBaseWithTagInformationBaseT
     @Before
     public void setup() {
         closeable = openMocks(this);
+        Mockito.lenient().when(vmIsoMapDao.listByVmId(anyLong())).thenReturn(Collections.emptyList());
         prepareSetup();
     }
 
@@ -166,4 +177,39 @@ public class UserVmJoinDaoImplTest extends GenericDaoBaseWithTagInformationBaseT
         Assert.assertEquals(2, response.getVnfNics().size());
         Assert.assertEquals(3, response.getVnfDetails().size());
     }
+
+    @Test
+    public void advertisedCdromCapReturnsDefaultWhenHostIdNull() {
+        Assert.assertEquals(com.cloud.template.TemplateManager.DEFAULT_CDROM_MAX_PER_VM,
+                _userVmJoinDaoImpl.advertisedCdromCap(null));
+    }
+
+    @Test
+    public void advertisedCdromCapReturnsParsedValue() {
+        com.cloud.host.DetailVO detail = Mockito.mock(com.cloud.host.DetailVO.class);
+        Mockito.when(detail.getValue()).thenReturn("2");
+        Mockito.when(hostDetailsDao.findDetail(7L, com.cloud.host.Host.HOST_CDROM_MAX_COUNT)).thenReturn(detail);
+        Assert.assertEquals(2, _userVmJoinDaoImpl.advertisedCdromCap(7L));
+    }
+
+    @Test
+    public void advertisedCdromCapFallsBackOnInvalidValue() {
+        com.cloud.host.DetailVO detail = Mockito.mock(com.cloud.host.DetailVO.class);
+        Mockito.when(detail.getValue()).thenReturn("xyz");
+        Mockito.when(hostDetailsDao.findDetail(7L, com.cloud.host.Host.HOST_CDROM_MAX_COUNT)).thenReturn(detail);
+        Assert.assertEquals(com.cloud.template.TemplateManager.DEFAULT_CDROM_MAX_PER_VM,
+                _userVmJoinDaoImpl.advertisedCdromCap(7L));
+    }
+
+    @Test
+    public void effectiveCdromMaxCountClampsToHypervisorCap() {
+        UserVmJoinVO userVm = Mockito.mock(UserVmJoinVO.class);
+        Mockito.when(userVm.getHostId()).thenReturn(7L);
+        Mockito.when(userVm.getClusterId()).thenReturn(5L);
+        com.cloud.host.DetailVO detail = Mockito.mock(com.cloud.host.DetailVO.class);
+        Mockito.when(detail.getValue()).thenReturn("2");
+        Mockito.when(hostDetailsDao.findDetail(7L, com.cloud.host.Host.HOST_CDROM_MAX_COUNT)).thenReturn(detail);
+        // Configured cap defaults to 1 (no cluster override mocked); host advertises 2; clamps to 1.
+        Assert.assertEquals(1, _userVmJoinDaoImpl.effectiveCdromMaxCount(userVm));
+    }
 }
diff --git a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
index 215a0e784bc..e36166bf927 100644
--- a/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
+++ b/server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
@@ -47,6 +47,7 @@ import org.apache.cloudstack.affinity.AffinityGroupVO;
 import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
@@ -62,6 +63,7 @@ import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
 import org.apache.cloudstack.config.ApiServiceConfiguration;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.schedule.ResourceScheduleManager;
 import org.apache.cloudstack.userdata.UserDataManager;
 import org.junit.After;
 import org.junit.Assert;
@@ -268,6 +270,8 @@ public class AutoScaleManagerImplTest {
     VirtualMachineManager virtualMachineManager;
     @Mock
     GuestOSDao guestOSDao;
+    @Mock
+    ResourceScheduleManager resourceScheduleManager;
 
     @Mock
     NetworkOrchestrationService networkOrchestrationService;
@@ -1036,7 +1040,6 @@ public class AutoScaleManagerImplTest {
         when(asVmGroupMock.getInterval()).thenReturn(interval);
         when(asVmGroupMock.getMaxMembers()).thenReturn(maxMembers);
         when(asVmGroupMock.getMinMembers()).thenReturn(minMembers);
-        when(asVmGroupMock.getState()).thenReturn(AutoScaleVmGroup.State.DISABLED);
         when(asVmGroupMock.getProfileId()).thenReturn(vmProfileId);
         when(asVmGroupMock.getLoadBalancerId()).thenReturn(loadBalancerId);
 
@@ -1086,7 +1089,6 @@ public class AutoScaleManagerImplTest {
 
         when(autoScaleVmGroupDao.findById(vmGroupId)).thenReturn(asVmGroupMock);
         when(asVmGroupMock.getInterval()).thenReturn(interval);
-        when(asVmGroupMock.getState()).thenReturn(AutoScaleVmGroup.State.ENABLED);
 
         AutoScaleVmGroup vmGroup = autoScaleManagerImplSpy.updateAutoScaleVmGroup(cmd);
     }
@@ -1213,6 +1215,7 @@ public class AutoScaleManagerImplTest {
         Mockito.verify(autoScaleManagerImplSpy).configureAutoScaleVmGroup(vmGroupId, AutoScaleVmGroup.State.ENABLED);
         Mockito.verify(annotationDao).removeByEntityType(AnnotationService.EntityType.AUTOSCALE_VM_GROUP.name(), vmGroupUuid);
         Mockito.verify(autoScaleManagerImplSpy).cancelMonitorTask(vmGroupId);
+        Mockito.verify(resourceScheduleManager).removeSchedulesForResource(ApiCommandResourceType.AutoScaleVmGroup, vmGroupId);
     }
 
     @Test
@@ -2557,4 +2560,19 @@ public class AutoScaleManagerImplTest {
         Assert.assertTrue(result.first().matches(vmHostNamePattern));
         Assert.assertEquals(result.first(), result.second());
     }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidateMinMaxMembersInvalidMin() {
+        autoScaleManagerImplSpy.validateMinMaxMembers(-1, 5);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidateMinMaxMembersInvalidMax() {
+        autoScaleManagerImplSpy.validateMinMaxMembers(1, -1);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidateMinMaxMembersInvalidRange() {
+        autoScaleManagerImplSpy.validateMinMaxMembers(5, 1);
+    }
 }
diff --git a/server/src/test/java/com/cloud/storage/ClvmPoolManagerTest.java b/server/src/test/java/com/cloud/storage/ClvmPoolManagerTest.java
new file mode 100644
index 00000000000..1678b376091
--- /dev/null
+++ b/server/src/test/java/com/cloud/storage/ClvmPoolManagerTest.java
@@ -0,0 +1,936 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.storage;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.clvm.ClvmPoolManager;
+import com.cloud.storage.dao.VolumeDetailsDao;
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferAnswer;
+import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferCommand;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ClvmPoolManagerTest {
+
+    @Mock
+    private VolumeDetailsDao volsDetailsDao;
+
+    @Mock
+    private AgentManager agentMgr;
+
+    @Mock
+    private HostDao hostDao;
+
+    @InjectMocks
+    private ClvmPoolManager clvmPoolManager;
+
+    private static final Long VOLUME_ID = 100L;
+    private static final Long HOST_ID_1 = 1L;
+    private static final Long HOST_ID_2 = 2L;
+    private static final String VOLUME_UUID = "test-volume-uuid";
+    private static final String VOLUME_PATH = "test-volume-path";
+    private static final String VG_NAME = "acsvg";
+
+    @Before
+    public void setUp() {
+        Mockito.reset(volsDetailsDao, agentMgr, hostDao);
+    }
+
+    @Test
+    public void testGetClvmLockHostId_Success() {
+        VolumeDetailVO detail = new VolumeDetailVO();
+        detail.setValue("123");
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        Long result = clvmPoolManager.getClvmLockHostId(VOLUME_ID, VOLUME_UUID);
+
+        Assert.assertEquals(Long.valueOf(123), result);
+    }
+
+    @Test
+    public void testGetClvmLockHostId_NoDetail() {
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        Long result = clvmPoolManager.getClvmLockHostId(VOLUME_ID, VOLUME_UUID);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testGetClvmLockHostId_InvalidNumber() {
+        VolumeDetailVO detail = new VolumeDetailVO();
+        detail.setValue("invalid");
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        Long result = clvmPoolManager.getClvmLockHostId(VOLUME_ID, VOLUME_UUID);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testSetClvmLockHostId_NewDetail() {
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        clvmPoolManager.setClvmLockHostId(VOLUME_ID, HOST_ID_1);
+
+        verify(volsDetailsDao, times(1)).addDetail(eq(VOLUME_ID), eq(ClvmPoolManager.CLVM_LOCK_HOST_ID),
+                eq(String.valueOf(HOST_ID_1)), eq(false));
+        verify(volsDetailsDao, never()).update(anyLong(), any());
+    }
+
+    @Test
+    public void testSetClvmLockHostId_UpdateExisting() {
+        VolumeDetailVO existingDetail = Mockito.mock(VolumeDetailVO.class);
+        when(existingDetail.getId()).thenReturn(50L);
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(existingDetail);
+
+        clvmPoolManager.setClvmLockHostId(VOLUME_ID, HOST_ID_2);
+
+        verify(existingDetail, times(1)).setValue(String.valueOf(HOST_ID_2));
+        verify(volsDetailsDao, times(1)).update(eq(50L), eq(existingDetail));
+        verify(volsDetailsDao, never()).addDetail(anyLong(), any(), any(), Mockito.anyBoolean());
+    }
+
+    @Test
+    public void testClearClvmLockHostDetail_Success() {
+        VolumeVO volume = Mockito.mock(VolumeVO.class);
+        when(volume.getId()).thenReturn(VOLUME_ID);
+        when(volume.getUuid()).thenReturn(VOLUME_UUID);
+
+        VolumeDetailVO detail = Mockito.mock(VolumeDetailVO.class);
+        when(detail.getId()).thenReturn(99L);
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        clvmPoolManager.clearClvmLockHostDetail(volume);
+
+        verify(volsDetailsDao, times(1)).remove(99L);
+    }
+
+    @Test
+    public void testClearClvmLockHostDetail_NoDetail() {
+        VolumeVO volume = Mockito.mock(VolumeVO.class);
+        when(volume.getId()).thenReturn(VOLUME_ID);
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        clvmPoolManager.clearClvmLockHostDetail(volume);
+
+        verify(volsDetailsDao, never()).remove(anyLong());
+    }
+
+    @Test
+    public void testTransferClvmVolumeLock_Success() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getPath()).thenReturn("/" + VG_NAME);
+
+        HostVO sourceHost = Mockito.mock(HostVO.class);
+        when(sourceHost.getStatus()).thenReturn(Status.Up);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(sourceHost);
+
+        Answer deactivateAnswer = new Answer(null, true, null);
+        Answer activateAnswer = new Answer(null, true, null);
+
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(deactivateAnswer);
+        when(agentMgr.send(eq(HOST_ID_2), any(ClvmLockTransferCommand.class))).thenReturn(activateAnswer);
+
+        boolean result = clvmPoolManager.transferClvmVolumeLock(VOLUME_UUID, VOLUME_ID,
+                VOLUME_PATH, pool, HOST_ID_1, HOST_ID_2);
+
+        Assert.assertTrue(result);
+        verify(agentMgr, times(2)).send(anyLong(), any(ClvmLockTransferCommand.class));
+    }
+
+    @Test
+    public void testTransferClvmVolumeLock_NullPool() {
+        boolean result = clvmPoolManager.transferClvmVolumeLock(VOLUME_UUID, VOLUME_ID,
+                VOLUME_PATH, null, HOST_ID_1, HOST_ID_2);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testTransferClvmVolumeLock_SameHost() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getPath()).thenReturn("/" + VG_NAME);
+
+        Answer activateAnswer = new Answer(null, true, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(activateAnswer);
+
+        boolean result = clvmPoolManager.transferClvmVolumeLock(VOLUME_UUID, VOLUME_ID,
+                VOLUME_PATH, pool, HOST_ID_1, HOST_ID_1);
+
+        Assert.assertTrue(result);
+        verify(agentMgr, times(1)).send(anyLong(), any(ClvmLockTransferCommand.class));
+    }
+
+    @Test
+    public void testTransferClvmVolumeLock_ActivationFails() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        Answer activateAnswer = new Answer(null, false, "Activation failed");
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(activateAnswer);
+
+        boolean result = clvmPoolManager.transferClvmVolumeLock(VOLUME_UUID, VOLUME_ID,
+                VOLUME_PATH, pool, HOST_ID_1, HOST_ID_1);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testTransferClvmVolumeLock_AgentUnavailable() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(agentMgr.send(anyLong(), any(ClvmLockTransferCommand.class)))
+                .thenThrow(new AgentUnavailableException("Agent unavailable", HOST_ID_2));
+
+        boolean result = clvmPoolManager.transferClvmVolumeLock(VOLUME_UUID, VOLUME_ID,
+                VOLUME_PATH, pool, HOST_ID_1, HOST_ID_2);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_NullPool() {
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, null, false);
+
+        Assert.assertNull(result);
+        verify(hostDao, never()).findByClusterId(anyLong(), any());
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_NoHostsInCluster() {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        when(pool.getDataCenterId()).thenReturn(1L);
+        when(pool.getName()).thenReturn("test-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.emptyList());
+        lenient().when(hostDao.findByDataCenterId(1L)).thenReturn(Collections.emptyList());
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+        verify(hostDao, times(1)).findByClusterId(10L, Host.Type.Routing);
+        verify(hostDao, times(0)).findByDataCenterId(1L);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_ZoneScopedPool() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(null);
+        when(pool.getDataCenterId()).thenReturn(1L);
+        Mockito.lenient().when(pool.getName()).thenReturn("zone-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByDataCenterId(1L)).thenReturn(Collections.singletonList(host));
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "host1", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(hostDao, never()).findByClusterId(anyLong(), any());
+        verify(hostDao, times(1)).findByDataCenterId(1L);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_SuccessfulQuery() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "host1", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(agentMgr, times(1)).send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class));
+        verify(hostDao, never()).findByName(any());
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_VolumeNotLocked() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        // QUERY reports inactive; ACTIVATE_EXCLUSIVE left unstubbed → null answer → recovery fails → returns null
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, null, false, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE)))
+                .thenReturn(inactiveAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_EmptyHostname() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        // QUERY reports inactive with empty hostname; ACTIVATE_EXCLUSIVE left unstubbed → null answer → recovery fails → returns null
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "", false, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE)))
+                .thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_HostnameNotResolved() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "unknown-host", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(hostDao, never()).findByName(any());
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_QueryFails() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        Answer failedAnswer = new Answer(null, false, "Query failed");
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(failedAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_NullAnswer() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(null);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_AgentUnavailableException() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class)))
+                .thenThrow(new AgentUnavailableException("Host unavailable", HOST_ID_1));
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_OperationTimedoutException() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class)))
+                .thenThrow(new OperationTimedoutException(null, HOST_ID_1, 0, 0, false));
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_UpdateDatabase_MatchingValue() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        Mockito.lenient().when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        Mockito.lenient().when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        // DB has correct value, fast path: query HOST_ID_1, returns active
+        VolumeDetailVO detail = new VolumeDetailVO();
+        detail.setValue(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(host);
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "host1", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, true);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        // Fast path succeeded - no DB write needed, no fan-out
+        verify(volsDetailsDao, never()).update(anyLong(), any());
+        verify(volsDetailsDao, never()).addDetail(anyLong(), any(), any(), Mockito.anyBoolean());
+        verify(hostDao, never()).findByClusterId(anyLong(), any());
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_UpdateDatabase_DifferentValue() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        // DB says HOST_ID_1, but actual lock is on HOST_ID_2
+        // Fast path: query HOST_ID_1, inactive: fall back to fan-out
+        VolumeDetailVO detail = Mockito.mock(VolumeDetailVO.class);
+        when(detail.getValue()).thenReturn(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+        when(detail.getId()).thenReturn(99L);
+
+        HostVO host1 = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        HostVO host2 = createMockHost(HOST_ID_2, "host2", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(host1);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Arrays.asList(host1, host2));
+
+        // HOST_ID_1 reports inactive (fast path miss), HOST_ID_2 reports active (fan-out)
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, "host1", false, false, null);
+        ClvmLockTransferAnswer activeAnswer   = new ClvmLockTransferAnswer(null, true, null, "host2", true,  false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(inactiveAnswer);
+        when(agentMgr.send(eq(HOST_ID_2), any(ClvmLockTransferCommand.class))).thenReturn(activeAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, true);
+
+        Assert.assertEquals(HOST_ID_2, result);
+        // DB should be corrected to HOST_ID_2
+        verify(detail, times(1)).setValue(String.valueOf(HOST_ID_2));
+        verify(volsDetailsDao, times(1)).update(eq(99L), eq(detail));
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_UpdateDatabase_NoExistingDetail() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        // No DB record, fast path skipped, fan-out finds HOST_ID_1
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "host1", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, true);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(volsDetailsDao, times(1)).addDetail(eq(VOLUME_ID), eq(ClvmPoolManager.CLVM_LOCK_HOST_ID),
+                eq(String.valueOf(HOST_ID_1)), eq(false));
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_UpdateDatabase_RemoveDetailWhenUnlocked() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        // DB has HOST_ID_1, fast path query returns inactive: fan-out also finds nothing
+        VolumeDetailVO detail = Mockito.mock(VolumeDetailVO.class);
+        when(detail.getId()).thenReturn(99L);
+        when(detail.getValue()).thenReturn(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(host);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        // QUERY_LOCK_STATE: inactive (fast path miss; HOST_ID_1 skipped in fan-out as dbHostId)
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, null, false, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE)))
+                .thenReturn(inactiveAnswer);
+
+        // ACTIVATE_EXCLUSIVE: recovery attempt fails — stale DB record must still be removed
+        Answer failedActivation = new Answer(null, false, "Simulated activation failure for test");
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE)))
+                .thenReturn(failedActivation);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, true);
+
+        Assert.assertNull(result);
+        verify(volsDetailsDao, times(1)).remove(99L);
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_SkipsNonKVMHosts() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO xenHost = createMockHost(10L, "xen-host", Status.Up, Hypervisor.HypervisorType.XenServer);
+        HostVO kvmHost = createMockHost(HOST_ID_1, "kvm-host", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Arrays.asList(xenHost, kvmHost));
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "kvm-host", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(agentMgr, never()).send(eq(10L), any(ClvmLockTransferCommand.class));
+        verify(agentMgr, times(1)).send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class));
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_SkipsDownHosts() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO downHost = createMockHost(10L, "down-host", Status.Down, Hypervisor.HypervisorType.KVM);
+        HostVO upHost = createMockHost(HOST_ID_1, "up-host", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Arrays.asList(downHost, upHost));
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "up-host", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(agentMgr, never()).send(eq(10L), any(ClvmLockTransferCommand.class));
+        verify(agentMgr, times(1)).send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class));
+    }
+
+    @Test
+    public void testQueryCurrentLockHolder_PathWithLeadingSlash() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn("/" + VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host));
+
+        ClvmLockTransferAnswer answer = new ClvmLockTransferAnswer(null, true, null, "host1", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(answer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_1, result);
+    }
+
+    /**
+     * Fast path: DB has the correct host, single query confirms isActive=true.
+     * No fan-out should occur.
+     */
+    @Test
+    public void testQueryCurrentLockHolder_FastPath_HitOnDbHost() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        VolumeDetailVO detail = new VolumeDetailVO();
+        detail.setValue(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        HostVO host = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(host);
+
+        ClvmLockTransferAnswer activeAnswer = new ClvmLockTransferAnswer(null, true, null, "host1", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(activeAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        // Only one agent call, no cluster host lookup, no fan-out
+        verify(agentMgr, times(1)).send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class));
+        verify(hostDao, never()).findByClusterId(anyLong(), any());
+        verify(hostDao, never()).findByDataCenterId(anyLong());
+    }
+
+    /**
+     * Fast path miss: DB has HOST_ID_1 but it's inactive. Fan-out finds HOST_ID_2.
+     * HOST_ID_1 should NOT be queried again during fan-out.
+     */
+    @Test
+    public void testQueryCurrentLockHolder_FastPath_MissDbHost_FanOutFindsOther() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        VolumeDetailVO detail = new VolumeDetailVO();
+        detail.setValue(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        HostVO host1 = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        HostVO host2 = createMockHost(HOST_ID_2, "host2", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(host1);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Arrays.asList(host1, host2));
+
+        // Fast path: HOST_ID_1 inactive
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, "host1", false, false, null);
+        // Fan-out: HOST_ID_2 active (HOST_ID_1 skipped)
+        ClvmLockTransferAnswer activeAnswer   = new ClvmLockTransferAnswer(null, true, null, "host2", true,  false, null);
+        when(agentMgr.send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class))).thenReturn(inactiveAnswer);
+        when(agentMgr.send(eq(HOST_ID_2), any(ClvmLockTransferCommand.class))).thenReturn(activeAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_2, result);
+        // HOST_ID_1 queried once (fast path only), HOST_ID_2 queried once (fan-out)
+        verify(agentMgr, times(1)).send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class));
+        verify(agentMgr, times(1)).send(eq(HOST_ID_2), any(ClvmLockTransferCommand.class));
+    }
+
+    /**
+     * Fast path skip: DB host is DOWN. Fan-out proceeds to all UP hosts.
+     */
+    @Test
+    public void testQueryCurrentLockHolder_FastPath_DbHostDown_FanOut() throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        VolumeDetailVO detail = new VolumeDetailVO();
+        detail.setValue(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        HostVO downHost = createMockHost(HOST_ID_1, "host1", Status.Down, Hypervisor.HypervisorType.KVM);
+        HostVO upHost   = createMockHost(HOST_ID_2, "host2", Status.Up,   Hypervisor.HypervisorType.KVM);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(downHost);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Arrays.asList(downHost, upHost));
+
+        ClvmLockTransferAnswer activeAnswer = new ClvmLockTransferAnswer(null, true, null, "host2", true, false, null);
+        when(agentMgr.send(eq(HOST_ID_2), any(ClvmLockTransferCommand.class))).thenReturn(activeAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertEquals(HOST_ID_2, result);
+        // No query to the down host at all
+        verify(agentMgr, never()).send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class));
+        verify(agentMgr, times(1)).send(eq(HOST_ID_2), any(ClvmLockTransferCommand.class));
+    }
+
+
+    /**
+     * Inactive everywhere, DB host is UP: recovery activates exclusively on the DB host.
+     */
+    @Test
+    public void testQueryCurrentLockHolder_InactiveEverywhere_ActivatesOnDbHost()
+            throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        VolumeDetailVO detail = Mockito.mock(VolumeDetailVO.class);
+        when(detail.getId()).thenReturn(99L);
+        when(detail.getValue()).thenReturn(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        HostVO host1 = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(host1);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host1));
+
+        // Fast path QUERY → inactive
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, null, false, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE)))
+                .thenReturn(inactiveAnswer);
+
+        // Recovery ACTIVATE_EXCLUSIVE → succeeds
+        Answer activateAnswer = new Answer(null, true, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE)))
+                .thenReturn(activateAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, true);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(detail, times(1)).setValue(String.valueOf(HOST_ID_1));
+        verify(volsDetailsDao, times(1)).update(eq(99L), eq(detail));
+        verify(volsDetailsDao, never()).remove(anyLong());
+    }
+
+    /**
+     * Inactive everywhere, no DB record: recovery falls back to the first UP KVM host in cluster.
+     */
+    @Test
+    public void testQueryCurrentLockHolder_InactiveEverywhere_ActivatesOnClusterHostWhenNoDbRecord()
+            throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host1 = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host1));
+
+        // Fan-out QUERY → inactive
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, null, false, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE)))
+                .thenReturn(inactiveAnswer);
+
+        // Recovery ACTIVATE_EXCLUSIVE → succeeds
+        Answer activateAnswer = new Answer(null, true, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE)))
+                .thenReturn(activateAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, true);
+
+        Assert.assertEquals(HOST_ID_1, result);
+        verify(volsDetailsDao, times(1)).addDetail(eq(VOLUME_ID), eq(ClvmPoolManager.CLVM_LOCK_HOST_ID),
+                eq(String.valueOf(HOST_ID_1)), eq(false));
+    }
+
+    /**
+     * Inactive everywhere, DB host is DOWN: selectActivationTargetHost skips it and picks
+     * the first UP host from the cluster list.
+     */
+    @Test
+    public void testQueryCurrentLockHolder_InactiveEverywhere_SkipsDownDbHost_ActivatesOnClusterHost()
+            throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        VolumeDetailVO detail = new VolumeDetailVO();
+        detail.setValue(String.valueOf(HOST_ID_1));
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(detail);
+
+        HostVO downHost = createMockHost(HOST_ID_1, "host1", Status.Down, Hypervisor.HypervisorType.KVM);
+        HostVO upHost   = createMockHost(HOST_ID_2, "host2", Status.Up,   Hypervisor.HypervisorType.KVM);
+        when(hostDao.findById(HOST_ID_1)).thenReturn(downHost);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Arrays.asList(downHost, upHost));
+
+        // Fan-out QUERY on HOST_ID_2 → inactive (HOST_ID_1 filtered by Status.Down)
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, null, false, false, null);
+        when(agentMgr.send(eq(HOST_ID_2), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE)))
+                .thenReturn(inactiveAnswer);
+
+        // Recovery ACTIVATE_EXCLUSIVE on HOST_ID_2 → succeeds
+        Answer activateAnswer = new Answer(null, true, null);
+        when(agentMgr.send(eq(HOST_ID_2), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE)))
+                .thenReturn(activateAnswer);
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, true);
+
+        Assert.assertEquals(HOST_ID_2, result);
+        verify(agentMgr, never()).send(eq(HOST_ID_1), any(ClvmLockTransferCommand.class));
+    }
+
+    /**
+     * Inactive everywhere, recovery activation throws AgentUnavailableException: returns null,
+     * no crash, no DB side-effects (updateDatabase=false).
+     */
+    @Test
+    public void testQueryCurrentLockHolder_InactiveEverywhere_ActivationThrows_ReturnsNull()
+            throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        HostVO host1 = createMockHost(HOST_ID_1, "host1", Status.Up, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(host1));
+
+        ClvmLockTransferAnswer inactiveAnswer = new ClvmLockTransferAnswer(null, true, null, null, false, false, null);
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.QUERY_LOCK_STATE)))
+                .thenReturn(inactiveAnswer);
+
+        when(agentMgr.send(eq(HOST_ID_1), Mockito.<Command>argThat(cmd ->
+                cmd instanceof ClvmLockTransferCommand
+                        && ((ClvmLockTransferCommand) cmd).getOperation()
+                                == ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE)))
+                .thenThrow(new AgentUnavailableException("Host unreachable during recovery", HOST_ID_1));
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+        verify(volsDetailsDao, never()).remove(anyLong());
+        verify(volsDetailsDao, never()).addDetail(anyLong(), any(), any(), Mockito.anyBoolean());
+    }
+
+    /**
+     * Inactive everywhere, no UP KVM host available: selectActivationTargetHost returns null,
+     * no activation is attempted, returns null immediately.
+     */
+    @Test
+    public void testQueryCurrentLockHolder_InactiveEverywhere_NoEligibleHost_ReturnsNull()
+            throws AgentUnavailableException, OperationTimedoutException {
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+        when(pool.getClusterId()).thenReturn(10L);
+        Mockito.lenient().when(pool.getName()).thenReturn("cluster-pool");
+        when(pool.getPath()).thenReturn(VG_NAME);
+
+        when(volsDetailsDao.findDetail(VOLUME_ID, ClvmPoolManager.CLVM_LOCK_HOST_ID)).thenReturn(null);
+
+        // Only a DOWN host exists — selectActivationTargetHost finds no eligible host
+        HostVO downHost = createMockHost(HOST_ID_1, "host1", Status.Down, Hypervisor.HypervisorType.KVM);
+        when(hostDao.findByClusterId(10L, Host.Type.Routing)).thenReturn(Collections.singletonList(downHost));
+
+        Long result = clvmPoolManager.queryCurrentLockHolder(VOLUME_ID, VOLUME_UUID, VOLUME_PATH, pool, false);
+
+        Assert.assertNull(result);
+        verify(agentMgr, never()).send(anyLong(), any(ClvmLockTransferCommand.class));
+    }
+
+    // Helper method to create mock hosts
+    private HostVO createMockHost(Long id, String name, Status status, Hypervisor.HypervisorType hypervisor) {
+        HostVO host = Mockito.mock(HostVO.class);
+        Mockito.lenient().when(host.getId()).thenReturn(id);
+        Mockito.lenient().when(host.getName()).thenReturn(name);
+        Mockito.lenient().when(host.getStatus()).thenReturn(status);
+        Mockito.lenient().when(host.getType()).thenReturn(Host.Type.Routing);
+        Mockito.lenient().when(host.getHypervisorType()).thenReturn(hypervisor);
+        return host;
+    }
+}
diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
index 11d7c70694e..b4153e31cfe 100644
--- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
+++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
@@ -40,6 +40,16 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventUtils;
+import com.cloud.host.HostVO;
+import com.cloud.resourcelimit.CheckedReservation;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.clvm.ClvmPoolManager;
+import com.cloud.vm.snapshot.VMSnapshot;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.command.user.volume.CheckAndRepairVolumeCmd;
@@ -99,24 +109,18 @@ import com.cloud.dc.HostPodVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.HostPodDao;
-import com.cloud.event.EventTypes;
-import com.cloud.event.UsageEventUtils;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
-import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.offering.DiskOffering;
 import com.cloud.org.Grouping;
 import com.cloud.projects.Project;
 import com.cloud.projects.ProjectManager;
-import com.cloud.resourcelimit.CheckedReservation;
 import com.cloud.serializer.GsonHelper;
 import com.cloud.server.ManagementService;
 import com.cloud.server.TaggedResourceService;
-import com.cloud.service.ServiceOfferingVO;
-import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.Storage.ProvisioningType;
 import com.cloud.storage.Volume.Type;
 import com.cloud.storage.dao.DiskOfferingDao;
@@ -144,11 +148,8 @@ import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
-import com.cloud.vm.snapshot.VMSnapshot;
-import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
 import com.cloud.vm.snapshot.VMSnapshotVO;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
-import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
 
 @RunWith(MockitoJUnitRunner.class)
 public class VolumeApiServiceImplTest {
@@ -228,6 +229,8 @@ public class VolumeApiServiceImplTest {
     ClusterDao clusterDao;
     @Mock
     VolumeOrchestrationService volumeOrchestrationService;
+    @Mock
+    ClvmPoolManager clvmPoolManager;
 
 
     private DetachVolumeCmd detachCmd = new DetachVolumeCmd();
@@ -2423,4 +2426,290 @@ public class VolumeApiServiceImplTest {
         Mockito.doReturn(1L).when(mock2).getId();
         return List.of(mock1, mock2);
     }
+
+    @Test
+    public void testIsClvmLightweightMigrationNeeded_SameVG() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 200L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(volumePool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(volumePool.getPath()).thenReturn("/vg1");
+        Mockito.when(vmPool.getPath()).thenReturn("/vg1");
+
+        Mockito.when(volumeServiceMock.isLightweightMigrationNeeded(
+                Storage.StoragePoolType.CLVM, Storage.StoragePoolType.CLVM,
+                "/vg1", "/vg1")).thenReturn(true);
+
+        boolean result = invokePrivateMethod("isClvmLightweightMigrationNeeded",
+                new Class[]{VolumeInfo.class, VolumeVO.class},
+                volumeInfo, vmExistingVolume);
+
+        Assert.assertTrue(result);
+        Mockito.verify(volumeServiceMock).isLightweightMigrationNeeded(
+                Storage.StoragePoolType.CLVM, Storage.StoragePoolType.CLVM, "/vg1", "/vg1");
+    }
+
+    @Test
+    public void testIsClvmLightweightMigrationNeeded_DifferentVG() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 200L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(volumePool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(volumePool.getPath()).thenReturn("/vg1");
+        Mockito.when(vmPool.getPath()).thenReturn("/vg2");
+
+        Mockito.when(volumeServiceMock.isLightweightMigrationNeeded(
+                Storage.StoragePoolType.CLVM, Storage.StoragePoolType.CLVM,
+                "/vg1", "/vg2")).thenReturn(false);
+
+        boolean result = invokePrivateMethod("isClvmLightweightMigrationNeeded",
+                new Class[]{VolumeInfo.class, VolumeVO.class},
+                volumeInfo, vmExistingVolume);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testIsClvmLightweightMigrationNeeded_CLVM_NG_SameVG() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 200L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(volumePool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM_NG);
+        Mockito.when(volumePool.getPath()).thenReturn("/vg1");
+        Mockito.when(vmPool.getPath()).thenReturn("/vg1");
+
+        Mockito.when(volumeServiceMock.isLightweightMigrationNeeded(
+                Storage.StoragePoolType.CLVM_NG, Storage.StoragePoolType.CLVM_NG,
+                "/vg1", "/vg1")).thenReturn(true);
+
+        boolean result = invokePrivateMethod("isClvmLightweightMigrationNeeded",
+                new Class[]{VolumeInfo.class, VolumeVO.class},
+                volumeInfo, vmExistingVolume);
+
+        Assert.assertTrue(result);
+    }
+
+    @Test
+    public void testIsClvmLockTransferRequired_DifferentHosts() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 100L; // Same pool
+        Long vmHostId = 10L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(vm.getHostId()).thenReturn(vmHostId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(vmPool.getId()).thenReturn(vmPoolId);
+
+        Mockito.when(volumeServiceMock.isLockTransferRequired(
+                eq(volumeInfo), eq(Storage.StoragePoolType.CLVM), eq(Storage.StoragePoolType.CLVM),
+                eq(volumePoolId), eq(vmPoolId), eq(vmHostId))).thenReturn(true);
+
+        boolean result = invokePrivateMethod("isClvmLockTransferRequired",
+                new Class[]{VolumeInfo.class, VolumeVO.class, UserVmVO.class},
+                volumeInfo, vmExistingVolume, vm);
+
+        Assert.assertTrue(result);
+        Mockito.verify(volumeServiceMock).isLockTransferRequired(
+                eq(volumeInfo), eq(Storage.StoragePoolType.CLVM), eq(Storage.StoragePoolType.CLVM),
+                eq(volumePoolId), eq(vmPoolId), eq(vmHostId));
+    }
+
+    @Test
+    public void testIsClvmLockTransferRequired_SameHost() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 100L;
+        Long vmHostId = 10L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(vm.getHostId()).thenReturn(vmHostId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(vmPool.getId()).thenReturn(vmPoolId);
+
+        Mockito.when(volumeServiceMock.isLockTransferRequired(
+                eq(volumeInfo), eq(Storage.StoragePoolType.CLVM), eq(Storage.StoragePoolType.CLVM),
+                eq(volumePoolId), eq(vmPoolId), eq(vmHostId))).thenReturn(false);
+
+        boolean result = invokePrivateMethod("isClvmLockTransferRequired",
+                new Class[]{VolumeInfo.class, VolumeVO.class, UserVmVO.class},
+                volumeInfo, vmExistingVolume, vm);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testIsClvmLockTransferRequired_DifferentPools() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 200L; // Different pool
+        Long vmHostId = 10L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(vm.getHostId()).thenReturn(vmHostId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(volumePool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(volumePool.getId()).thenReturn(volumePoolId);
+        Mockito.when(vmPool.getId()).thenReturn(vmPoolId);
+
+        Mockito.when(volumeServiceMock.isLockTransferRequired(
+                eq(volumeInfo), eq(Storage.StoragePoolType.CLVM), eq(Storage.StoragePoolType.CLVM),
+                eq(volumePoolId), eq(vmPoolId), eq(vmHostId))).thenReturn(false);
+
+        boolean result = invokePrivateMethod("isClvmLockTransferRequired",
+                new Class[]{VolumeInfo.class, VolumeVO.class, UserVmVO.class},
+                volumeInfo, vmExistingVolume, vm);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testIsClvmLockTransferRequired_NonCLVMPool() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 100L;
+        Long vmHostId = 10L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(vm.getHostId()).thenReturn(vmHostId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(vmPool.getId()).thenReturn(vmPoolId);
+
+        boolean result = invokePrivateMethod("isClvmLockTransferRequired",
+                new Class[]{VolumeInfo.class, VolumeVO.class, UserVmVO.class},
+                volumeInfo, vmExistingVolume, vm);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testIsClvmLockTransferRequired_NullVM() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+
+        boolean result = invokePrivateMethod("isClvmLockTransferRequired",
+                new Class[]{VolumeInfo.class, VolumeVO.class, UserVmVO.class},
+                volumeInfo, vmExistingVolume, null);
+
+        Assert.assertFalse(result);
+    }
+
+    @Test
+    public void testIsClvmLockTransferRequired_VMStoppedUsesLastHostId() {
+        VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
+        VolumeVO vmExistingVolume = Mockito.mock(VolumeVO.class);
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        StoragePoolVO volumePool = Mockito.mock(StoragePoolVO.class);
+        StoragePoolVO vmPool = Mockito.mock(StoragePoolVO.class);
+
+        Long volumePoolId = 100L;
+        Long vmPoolId = 100L;
+        Long lastHostId = 10L;
+
+        Mockito.when(volumeInfo.getPoolId()).thenReturn(volumePoolId);
+        Mockito.when(vmExistingVolume.getPoolId()).thenReturn(vmPoolId);
+        Mockito.when(vm.getHostId()).thenReturn(null); // VM is stopped
+        Mockito.when(vm.getLastHostId()).thenReturn(lastHostId);
+        Mockito.when(primaryDataStoreDaoMock.findById(volumePoolId)).thenReturn(volumePool);
+        Mockito.when(primaryDataStoreDaoMock.findById(vmPoolId)).thenReturn(vmPool);
+
+        Mockito.when(vmPool.getPoolType()).thenReturn(Storage.StoragePoolType.CLVM);
+        Mockito.when(vmPool.getId()).thenReturn(vmPoolId);
+
+        Mockito.when(volumeServiceMock.isLockTransferRequired(
+                eq(volumeInfo), eq(Storage.StoragePoolType.CLVM), eq(Storage.StoragePoolType.CLVM),
+                eq(volumePoolId), eq(vmPoolId), eq(lastHostId))).thenReturn(true);
+
+        boolean result = invokePrivateMethod("isClvmLockTransferRequired",
+                new Class[]{VolumeInfo.class, VolumeVO.class, UserVmVO.class},
+                volumeInfo, vmExistingVolume, vm);
+
+        Assert.assertTrue(result);
+        Mockito.verify(volumeServiceMock).isLockTransferRequired(
+                eq(volumeInfo), eq(Storage.StoragePoolType.CLVM), eq(Storage.StoragePoolType.CLVM),
+                eq(volumePoolId), eq(vmPoolId), eq(lastHostId));
+    }
+
+
+    private <T> T invokePrivateMethod(String methodName, Class<?>[] paramTypes, Object... params) {
+        try {
+            java.lang.reflect.Method method = VolumeApiServiceImpl.class.getDeclaredMethod(methodName, paramTypes);
+            method.setAccessible(true);
+            return (T) method.invoke(volumeApiServiceImpl, params);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to invoke method: " + methodName, e);
+        }
+    }
 }
diff --git a/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java b/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java
index ff0888c184c..4dc5a1f3bdf 100644
--- a/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java
+++ b/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerImplTest.java
@@ -26,6 +26,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.org.Grouping;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.Snapshot;
+import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.SnapshotPolicyVO;
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.VolumeVO;
@@ -55,8 +56,10 @@ import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
 import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotResult;
 import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotService;
 import org.apache.cloudstack.framework.async.AsyncCallFuture;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 
 import org.junit.Assert;
 import org.junit.After;
@@ -105,6 +108,8 @@ public class SnapshotManagerImplTest {
     SnapshotScheduler snapshotScheduler;
     @Mock
     TaggedResourceService taggedResourceService;
+    @Mock
+    PrimaryDataStoreDao primaryDataStoreDao;
     @InjectMocks
     SnapshotManagerImpl snapshotManager = new SnapshotManagerImpl();
 
@@ -115,6 +120,7 @@ public class SnapshotManagerImplTest {
         snapshotManager._accountMgr = accountManager;
         snapshotManager._snapSchedMgr = snapshotScheduler;
         snapshotManager.taggedResourceService = taggedResourceService;
+        snapshotManager._storagePoolDao = primaryDataStoreDao;
     }
 
     @After
@@ -610,4 +616,57 @@ public class SnapshotManagerImplTest {
 
         snapshotManager.deleteSnapshotPolicies(cmd);
     }
+
+    @Test
+    public void testRemoveClvmPrimarySnapshotStoreRefIfNeeded_ClvmPool() {
+        SnapshotInfo snapshot = Mockito.mock(SnapshotInfo.class);
+        DataStore dataStore = Mockito.mock(DataStore.class);
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+
+        Mockito.when(snapshot.getDataStore()).thenReturn(dataStore);
+        Mockito.when(snapshot.getId()).thenReturn(1L);
+        Mockito.when(dataStore.getId()).thenReturn(2L);
+        Mockito.when(dataStore.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(primaryDataStoreDao.findById(2L)).thenReturn(pool);
+        Mockito.when(pool.getPoolType()).thenReturn(StoragePoolType.CLVM);
+
+        snapshotManager.removeClvmPrimarySnapshotStoreRefIfNeeded(snapshot);
+
+        Mockito.verify(snapshotStoreDao).removeBySnapshotStore(1L, 2L, DataStoreRole.Primary);
+    }
+
+    @Test
+    public void testRemoveClvmPrimarySnapshotStoreRefIfNeeded_ClvmNgPool() {
+        SnapshotInfo snapshot = Mockito.mock(SnapshotInfo.class);
+        DataStore dataStore = Mockito.mock(DataStore.class);
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+
+        Mockito.when(snapshot.getDataStore()).thenReturn(dataStore);
+        Mockito.when(snapshot.getId()).thenReturn(3L);
+        Mockito.when(dataStore.getId()).thenReturn(4L);
+        Mockito.when(dataStore.getRole()).thenReturn(DataStoreRole.Primary);
+        Mockito.when(primaryDataStoreDao.findById(4L)).thenReturn(pool);
+        Mockito.when(pool.getPoolType()).thenReturn(StoragePoolType.CLVM_NG);
+
+        snapshotManager.removeClvmPrimarySnapshotStoreRefIfNeeded(snapshot);
+
+        Mockito.verify(snapshotStoreDao).removeBySnapshotStore(3L, 4L, DataStoreRole.Primary);
+    }
+
+    @Test
+    public void testRemoveClvmPrimarySnapshotStoreRefIfNeeded_NonClvmPool() {
+        SnapshotInfo snapshot = Mockito.mock(SnapshotInfo.class);
+        DataStore dataStore = Mockito.mock(DataStore.class);
+        StoragePoolVO pool = Mockito.mock(StoragePoolVO.class);
+
+        Mockito.when(snapshot.getDataStore()).thenReturn(dataStore);
+        Mockito.when(dataStore.getId()).thenReturn(5L);
+        Mockito.when(primaryDataStoreDao.findById(5L)).thenReturn(pool);
+        Mockito.when(pool.getPoolType()).thenReturn(StoragePoolType.NetworkFilesystem);
+
+        snapshotManager.removeClvmPrimarySnapshotStoreRefIfNeeded(snapshot);
+
+        Mockito.verify(snapshotStoreDao, Mockito.never()).removeBySnapshotStore(
+                Mockito.anyLong(), Mockito.anyLong(), Mockito.any());
+    }
 }
diff --git a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java
index 6288180a9f4..47099c371dc 100755
--- a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java
+++ b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java
@@ -22,6 +22,7 @@ package com.cloud.template;
 import com.cloud.agent.AgentManager;
 import com.cloud.api.query.dao.SnapshotJoinDao;
 import com.cloud.api.query.dao.UserVmJoinDao;
+import com.cloud.api.query.vo.UserVmJoinVO;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.deployasis.dao.TemplateDeployAsIsDetailsDao;
 import com.cloud.domain.dao.DomainDao;
@@ -29,7 +30,11 @@ import com.cloud.event.dao.UsageEventDao;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.host.Status;
+import com.cloud.host.DetailVO;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
 import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.HypervisorGuruManager;
 import com.cloud.projects.ProjectManager;
@@ -66,9 +71,15 @@ import com.cloud.user.UserVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.uservm.UserVm;
+import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.VmIsoMapVO;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.dao.VmIsoMapDao;
 
 import junit.framework.TestCase;
 
@@ -133,6 +144,7 @@ import org.springframework.core.type.filter.TypeFilter;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
@@ -220,6 +232,21 @@ public class TemplateManagerImplTest extends TestCase {
     @Mock
     HeuristicRuleHelper heuristicRuleHelperMock;
 
+    @Mock
+    UserVmDao _userVmDao;
+
+    @Mock
+    VmIsoMapDao _vmIsoMapDao;
+
+    @Mock
+    HostDao _hostDao;
+
+    @Mock
+    HostDetailsDao _hostDetailsDao;
+
+    @Mock
+    UserVmJoinDao _userVmJoinDao;
+
     public class CustomThreadPoolExecutor extends ThreadPoolExecutor {
         AtomicInteger ai = new AtomicInteger(0);
         public CustomThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit,
@@ -750,6 +777,222 @@ public class TemplateManagerImplTest extends TestCase {
         Mockito.verify(heuristicRuleHelperMock, Mockito.times(1)).getImageStoreIfThereIsHeuristicRule(1L, HeuristicType.TEMPLATE, vmTemplateVOMock);
     }
 
+    @Test
+    public void highestCdromMapEntryReturnsNullWhenMapIsEmpty() {
+        Mockito.when(_vmIsoMapDao.listByVmId(1L)).thenReturn(new ArrayList<>());
+        Assert.assertNull(templateManager.highestCdromMapEntry(1L));
+    }
+
+    @Test
+    public void highestCdromMapEntryReturnsEntryWithMaxDeviceSeq() {
+        VmIsoMapVO low = new VmIsoMapVO(1L, 100L, 4);
+        VmIsoMapVO high = new VmIsoMapVO(1L, 200L, 5);
+        Mockito.when(_vmIsoMapDao.listByVmId(1L)).thenReturn(Arrays.asList(low, high));
+        VmIsoMapVO result = templateManager.highestCdromMapEntry(1L);
+        Assert.assertNotNull(result);
+        Assert.assertEquals(5, result.getDeviceSeq());
+    }
+
+    @Test
+    public void attachISOToVMAttachWritesToIsoIdWhenPrimarySlotEmpty() {
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        VMTemplateVO iso = Mockito.mock(VMTemplateVO.class);
+        Mockito.when(_userVmDao.findById(1L)).thenReturn(vm);
+        Mockito.when(vmTemplateDao.findById(42L)).thenReturn(iso);
+        Mockito.when(iso.getId()).thenReturn(42L);
+        Mockito.when(vm.getIsoId()).thenReturn(null);
+
+        boolean result = templateManager.attachISOToVM(1L, 1L, 42L, true, false, false);
+
+        Assert.assertTrue(result);
+        Mockito.verify(vm).setIsoId(42L);
+        Mockito.verify(_userVmDao).update(eq(1L), eq(vm));
+        Mockito.verify(_vmIsoMapDao, Mockito.never()).persist(any(VmIsoMapVO.class));
+    }
+
+    @Test
+    public void resolveIsoIdForDetachReturnsPrimaryWhenOnlyPrimaryIsAttached() {
+        Long resolved = templateManager.resolveIsoIdForDetach(99L, new ArrayList<>(), null);
+        Assert.assertEquals(Long.valueOf(99L), resolved);
+    }
+
+    @Test
+    public void resolveIsoIdForDetachReturnsMapEntryWhenOnlyMapHasOne() {
+        VmIsoMapVO row = new VmIsoMapVO(1L, 100L, 4);
+        Long resolved = templateManager.resolveIsoIdForDetach(null, Arrays.asList(row), null);
+        Assert.assertEquals(Long.valueOf(100L), resolved);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void resolveIsoIdForDetachThrowsWhenMultipleAttachedAndNoIdGiven() {
+        VmIsoMapVO row = new VmIsoMapVO(1L, 100L, 4);
+        templateManager.resolveIsoIdForDetach(99L, Arrays.asList(row), null);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void resolveIsoIdForDetachThrowsWhenNothingAttached() {
+        templateManager.resolveIsoIdForDetach(null, new ArrayList<>(), null);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void resolveIsoIdForDetachThrowsWhenIdNotAttached() {
+        templateManager.resolveIsoIdForDetach(99L, new ArrayList<>(), 42L);
+    }
+
+    @Test
+    public void isIsoAlreadyAttachedReturnsTrueWhenPrimaryMatches() {
+        Assert.assertTrue(templateManager.isIsoAlreadyAttached(1L, 42L, 42L));
+    }
+
+    @Test
+    public void isIsoAlreadyAttachedReturnsTrueWhenInMap() {
+        Mockito.when(_vmIsoMapDao.findByVmIdIsoId(1L, 42L)).thenReturn(new VmIsoMapVO(1L, 42L, 4));
+        Assert.assertTrue(templateManager.isIsoAlreadyAttached(1L, 99L, 42L));
+    }
+
+    @Test
+    public void isIsoAlreadyAttachedReturnsFalseWhenNotAttached() {
+        Mockito.when(_vmIsoMapDao.findByVmIdIsoId(1L, 42L)).thenReturn(null);
+        Assert.assertFalse(templateManager.isIsoAlreadyAttached(1L, null, 42L));
+    }
+
+    @Test
+    public void attachISOToVMAttachWritesToVmIsoMapWhenPrimarySlotOccupied() {
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        VMTemplateVO iso = Mockito.mock(VMTemplateVO.class);
+        Mockito.when(_userVmDao.findById(1L)).thenReturn(vm);
+        Mockito.when(vmTemplateDao.findById(42L)).thenReturn(iso);
+        Mockito.when(iso.getId()).thenReturn(42L);
+        Mockito.when(vm.getIsoId()).thenReturn(99L);
+        Mockito.when(_vmIsoMapDao.listByVmId(1L)).thenReturn(new ArrayList<>());
+
+        boolean result = templateManager.attachISOToVM(1L, 1L, 42L, true, false, false);
+
+        Assert.assertTrue(result);
+        Mockito.verify(_vmIsoMapDao).persist(Mockito.argThat(row ->
+                row.getVmId() == 1L && row.getIsoId() == 42L
+                        && row.getDeviceSeq() == TemplateManager.CDROM_PRIMARY_DEVICE_SEQ + 1));
+        Mockito.verify(vm, Mockito.never()).setIsoId(anyLong());
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void enforceCdromAttachLimitsThrowsWhenIsoAlreadyAttachedAtPrimary() {
+        UserVm vm = Mockito.mock(UserVm.class);
+        Mockito.when(vm.getIsoId()).thenReturn(42L);
+        templateManager.enforceCdromAttachLimits(1L, vm, 42L);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void enforceCdromAttachLimitsThrowsWhenIsoAlreadyAttachedInMap() {
+        UserVm vm = Mockito.mock(UserVm.class);
+        Mockito.when(vm.getIsoId()).thenReturn(99L);
+        Mockito.when(_vmIsoMapDao.findByVmIdIsoId(1L, 42L)).thenReturn(new VmIsoMapVO(1L, 42L, 4));
+        templateManager.enforceCdromAttachLimits(1L, vm, 42L);
+    }
+
+    @Test
+    public void advertisedCdromCapReturnsDefaultWhenHostIdNull() {
+        Assert.assertEquals(TemplateManager.DEFAULT_CDROM_MAX_PER_VM, templateManager.advertisedCdromCap(null));
+    }
+
+    @Test
+    public void advertisedCdromCapReturnsDefaultWhenDetailMissing() {
+        Mockito.when(_hostDetailsDao.findDetail(7L, Host.HOST_CDROM_MAX_COUNT)).thenReturn(null);
+        Assert.assertEquals(TemplateManager.DEFAULT_CDROM_MAX_PER_VM, templateManager.advertisedCdromCap(7L));
+    }
+
+    @Test
+    public void advertisedCdromCapReturnsParsedValue() {
+        DetailVO detail = Mockito.mock(DetailVO.class);
+        Mockito.when(detail.getValue()).thenReturn("3");
+        Mockito.when(_hostDetailsDao.findDetail(7L, Host.HOST_CDROM_MAX_COUNT)).thenReturn(detail);
+        Assert.assertEquals(3, templateManager.advertisedCdromCap(7L));
+    }
+
+    @Test
+    public void advertisedCdromCapFallsBackOnInvalidValue() {
+        DetailVO detail = Mockito.mock(DetailVO.class);
+        Mockito.when(detail.getValue()).thenReturn("not-a-number");
+        Mockito.when(_hostDetailsDao.findDetail(7L, Host.HOST_CDROM_MAX_COUNT)).thenReturn(detail);
+        Assert.assertEquals(TemplateManager.DEFAULT_CDROM_MAX_PER_VM, templateManager.advertisedCdromCap(7L));
+    }
+
+    @Test
+    public void hostIdForVmReturnsCurrentHost() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        Mockito.when(vm.getHostId()).thenReturn(42L);
+        Assert.assertEquals(Long.valueOf(42L), templateManager.hostIdForVm(vm));
+    }
+
+    @Test
+    public void hostIdForVmFallsBackToLastHost() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        Mockito.when(vm.getHostId()).thenReturn(null);
+        Mockito.when(vm.getLastHostId()).thenReturn(99L);
+        Assert.assertEquals(Long.valueOf(99L), templateManager.hostIdForVm(vm));
+    }
+
+    @Test
+    public void hostIdForVmReturnsNullWhenNoHost() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        Mockito.when(vm.getHostId()).thenReturn(null);
+        Mockito.when(vm.getLastHostId()).thenReturn(null);
+        Assert.assertNull(templateManager.hostIdForVm(vm));
+    }
+
+    @Test
+    public void effectiveMaxCdromsReturnsConfiguredCapWhenWithinHypervisorCap() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        DetailVO detail = Mockito.mock(DetailVO.class);
+        Mockito.when(detail.getValue()).thenReturn("2");
+        HostVO host = Mockito.mock(HostVO.class);
+        Mockito.when(host.getClusterId()).thenReturn(5L);
+        Mockito.when(_hostDao.findById(7L)).thenReturn(host);
+        Mockito.when(_hostDetailsDao.findDetail(7L, Host.HOST_CDROM_MAX_COUNT)).thenReturn(detail);
+        // Configured cap defaults to 1 (no cluster override mocked); hypervisor cap is 2; 1 <= 2 → no throw, returns 1.
+        Assert.assertEquals(1, templateManager.effectiveMaxCdroms(vm, 7L));
+    }
+
+    @Test
+    public void templateIsDeleteableReturnsTrueWhenNoVmsUseIso() {
+        Mockito.when(_userVmJoinDao.listActiveByIsoId(42L)).thenReturn(new ArrayList<>());
+        Mockito.when(_vmIsoMapDao.listByIsoId(42L)).thenReturn(new ArrayList<>());
+        Assert.assertTrue(templateManager.templateIsDeleteable(42L));
+    }
+
+    @Test
+    public void templateIsDeleteableReturnsFalseWhenPrimarySlotInUse() {
+        Mockito.when(_userVmJoinDao.listActiveByIsoId(42L))
+                .thenReturn(java.util.Collections.singletonList(Mockito.mock(UserVmJoinVO.class)));
+        Assert.assertFalse(templateManager.templateIsDeleteable(42L));
+        // Should not even need to consult vm_iso_map once primary slot in use.
+        Mockito.verify(_vmIsoMapDao, Mockito.never()).listByIsoId(anyLong());
+    }
+
+    @Test
+    public void templateIsDeleteableReturnsFalseWhenAttachedViaVmIsoMapToActiveVm() {
+        Mockito.when(_userVmJoinDao.listActiveByIsoId(42L)).thenReturn(new ArrayList<>());
+        Mockito.when(_vmIsoMapDao.listByIsoId(42L))
+                .thenReturn(java.util.Collections.singletonList(new VmIsoMapVO(1L, 42L, 4)));
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        Mockito.when(vm.getState()).thenReturn(State.Running);
+        Mockito.when(vm.getUuid()).thenReturn("uuid-1");
+        Mockito.when(_userVmDao.findById(1L)).thenReturn(vm);
+        Assert.assertFalse(templateManager.templateIsDeleteable(42L));
+    }
+
+    @Test
+    public void templateIsDeleteableIgnoresVmIsoMapForDestroyedVm() {
+        Mockito.when(_userVmJoinDao.listActiveByIsoId(42L)).thenReturn(new ArrayList<>());
+        Mockito.when(_vmIsoMapDao.listByIsoId(42L))
+                .thenReturn(java.util.Collections.singletonList(new VmIsoMapVO(1L, 42L, 4)));
+        UserVmVO vm = Mockito.mock(UserVmVO.class);
+        Mockito.when(vm.getState()).thenReturn(State.Expunging);
+        Mockito.when(_userVmDao.findById(1L)).thenReturn(vm);
+        Assert.assertTrue(templateManager.templateIsDeleteable(42L));
+    }
+
+
     @Configuration
     @ComponentScan(basePackageClasses = {TemplateManagerImpl.class},
             includeFilters = {@ComponentScan.Filter(value = TestConfiguration.Library.class, type = FilterType.CUSTOM)},
diff --git a/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
index e4bc2096b9d..99f0d7fe294 100644
--- a/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
@@ -904,7 +904,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches
     }
 
     @Override
-    public NicSecondaryIp allocateSecondaryGuestIP(long nicId, IpAddresses requestedIpPair) {
+    public NicSecondaryIp allocateSecondaryGuestIP(long nicId, IpAddresses requestedIpPair, String description) {
         // TODO Auto-generated method stub
         return null;
     }
diff --git a/server/src/test/java/org/apache/cloudstack/schedule/ResourceScheduleManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/schedule/ResourceScheduleManagerImplTest.java
new file mode 100644
index 00000000000..c47cb59c9eb
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/schedule/ResourceScheduleManagerImplTest.java
@@ -0,0 +1,427 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.as.AutoScaleVmGroup;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.User;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ResourceScheduleResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDao;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDetailsDao;
+import org.apache.cloudstack.schedule.autoscale.AutoScaleScheduleAction;
+import org.apache.cloudstack.schedule.autoscale.AutoScaleScheduleWorker;
+import org.apache.cloudstack.schedule.vm.VMScheduleAction;
+import org.apache.cloudstack.schedule.vm.VMScheduleWorker;
+import org.apache.commons.lang.time.DateUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import static org.junit.Assert.assertNotNull;
+
+public class ResourceScheduleManagerImplTest {
+
+    @Spy
+    @InjectMocks
+    ResourceScheduleManagerImpl resourceScheduleManager = new ResourceScheduleManagerImpl();
+
+    @Mock
+    ResourceScheduleDao resourceScheduleDao;
+
+    @Mock
+    ResourceScheduleDetailsDao resourceScheduleDetailsDao;
+
+    @Mock
+    VMScheduleWorker vmScheduleWorker;
+
+    @Mock
+    AutoScaleScheduleWorker autoScaleScheduleWorker;
+
+    @Mock
+    UserVmManager userVmManager;
+
+    @Mock
+    AccountManager accountManager;
+
+    @Mock
+    EntityManager entityManager;
+
+    private AutoCloseable closeable;
+
+    @Before
+    public void setUp() {
+        closeable = MockitoAnnotations.openMocks(this);
+        Account callingAccount = Mockito.mock(Account.class);
+        User callingUser = Mockito.mock(User.class);
+        CallContext.register(callingUser, callingAccount);
+
+        Mockito.when(vmScheduleWorker.getApiResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        Mockito.when(autoScaleScheduleWorker.getApiResourceType()).thenReturn(ApiCommandResourceType.AutoScaleVmGroup);
+        Map<ApiCommandResourceType, BaseScheduleWorker> workerMap = new HashMap<>();
+        workerMap.put(ApiCommandResourceType.VirtualMachine, vmScheduleWorker);
+        workerMap.put(ApiCommandResourceType.AutoScaleVmGroup, autoScaleScheduleWorker);
+        ReflectionTestUtils.setField(resourceScheduleManager, "workerMap", workerMap);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeable.close();
+    }
+
+    private void validateResponse(ResourceScheduleResponse response, ResourceScheduleVO schedule, VirtualMachine vm) {
+        assertNotNull(response);
+        Assert.assertEquals(schedule.getUuid(), ReflectionTestUtils.getField(response, "id"));
+        Assert.assertEquals(schedule.getResourceType(), ReflectionTestUtils.getField(response, "resourceType"));
+        Assert.assertEquals(vm.getUuid(), ReflectionTestUtils.getField(response, "resourceId"));
+        Assert.assertEquals(schedule.getSchedule(), ReflectionTestUtils.getField(response, "schedule"));
+        Assert.assertEquals(schedule.getTimeZone(), ReflectionTestUtils.getField(response, "timeZone"));
+        ResourceSchedule.Action actionField = (ResourceSchedule.Action) ReflectionTestUtils.getField(response, "action");
+        Assert.assertEquals(schedule.getActionName(), actionField == null ? null : actionField.name());
+        Assert.assertEquals(schedule.getStartDate(), ReflectionTestUtils.getField(response, "startDate"));
+        Assert.assertEquals(schedule.getEndDate(), ReflectionTestUtils.getField(response, "endDate"));
+    }
+
+    @Test
+    public void createSchedule() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Account ownerAccount = Mockito.mock(Account.class);
+
+        Mockito.when(vm.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(vm.getId()).thenReturn(1L);
+        Mockito.when(entityManager.findByUuid(VirtualMachine.class, "1")).thenReturn(null);
+        Mockito.when(entityManager.findById(VirtualMachine.class, 1L)).thenReturn(vm);
+        Mockito.when(vmScheduleWorker.isResourceValid(1L)).thenReturn(true);
+        Mockito.when(vmScheduleWorker.getEntityOwnerId(1L)).thenReturn(2L);
+        Mockito.when(vmScheduleWorker.parseAction("START")).thenReturn(VMScheduleAction.START);
+        Mockito.when(accountManager.getAccount(2L)).thenReturn(ownerAccount);
+        Mockito.when(resourceScheduleDao.persist(Mockito.any(ResourceScheduleVO.class))).thenReturn(schedule);
+        Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getActionName()).thenReturn("START");
+        Mockito.when(vmScheduleWorker.parseAction((String) Mockito.isNull())).thenReturn(null);
+
+        ResourceScheduleResponse response = resourceScheduleManager.createSchedule(
+                ApiCommandResourceType.VirtualMachine, "1", null,
+                "0 0 * * *", "UTC", "START",
+                DateUtils.addDays(new Date(), 1), DateUtils.addDays(new Date(), 2),
+                true, null);
+
+        Mockito.verify(resourceScheduleDao, Mockito.times(1)).persist(Mockito.any(ResourceScheduleVO.class));
+        validateResponse(response, schedule, vm);
+    }
+
+    @Test
+    public void createResponse() {
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+
+        Mockito.when(vm.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        Mockito.when(schedule.getActionName()).thenReturn("START");
+        Mockito.when(vmScheduleWorker.parseAction("START")).thenReturn(VMScheduleAction.START);
+        Mockito.when(entityManager.findById(VirtualMachine.class, 1L)).thenReturn(vm);
+
+        ResourceScheduleResponse response = resourceScheduleManager.createResponse(schedule, null);
+        validateResponse(response, schedule, vm);
+    }
+
+    @Test
+    public void listSchedule() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        ResourceScheduleVO schedule1 = Mockito.mock(ResourceScheduleVO.class);
+        ResourceScheduleVO schedule2 = Mockito.mock(ResourceScheduleVO.class);
+        List<ResourceScheduleVO> scheduleList = new ArrayList<>();
+        scheduleList.add(schedule1);
+        scheduleList.add(schedule2);
+
+        Mockito.when(vm.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(vm.getId()).thenReturn(1L);
+        Mockito.when(entityManager.findByUuid(VirtualMachine.class, "1")).thenReturn(null);
+        Mockito.when(entityManager.findById(VirtualMachine.class, 1L)).thenReturn(vm);
+        Mockito.when(vmScheduleWorker.getEntityOwnerId(1L)).thenReturn(2L);
+        Mockito.when(accountManager.getAccount(2L)).thenReturn(Mockito.mock(Account.class));
+
+        Mockito.when(resourceScheduleDao.searchAndCount(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any())
+        ).thenReturn(new Pair<>(scheduleList, scheduleList.size()));
+        for (ResourceScheduleVO schedule : scheduleList) {
+            Mockito.when(schedule.getResourceId()).thenReturn(1L);
+            Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        }
+
+        ListResponse<ResourceScheduleResponse> responseList = resourceScheduleManager.listSchedule(
+                null, null, ApiCommandResourceType.VirtualMachine, "1", null, null, 0L, 100L);
+
+        Mockito.verify(resourceScheduleDao, Mockito.times(1)).searchAndCount(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any());
+        assertNotNull(responseList);
+        Assert.assertEquals(2, (int) responseList.getCount());
+        Assert.assertEquals(2, responseList.getResponses().size());
+
+        for (int i = 0; i < responseList.getResponses().size(); i++) {
+            validateResponse(responseList.getResponses().get(i), scheduleList.get(i), vm);
+        }
+    }
+
+    @Test
+    public void updateSchedule() {
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+
+        Mockito.when(vm.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(resourceScheduleDao.findById(Mockito.anyLong())).thenReturn(schedule);
+        Mockito.when(resourceScheduleDao.update(Mockito.eq(1L), Mockito.any(ResourceScheduleVO.class))).thenReturn(true);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(new Date(), 1));
+        Mockito.when(schedule.getActionName()).thenReturn("START");
+        Mockito.when(vmScheduleWorker.getEntityOwnerId(1L)).thenReturn(2L);
+        Mockito.when(vmScheduleWorker.parseAction("START")).thenReturn(VMScheduleAction.START);
+        Mockito.when(accountManager.getAccount(2L)).thenReturn(Mockito.mock(Account.class));
+        Mockito.when(entityManager.findById(VirtualMachine.class, 1L)).thenReturn(vm);
+
+        ResourceScheduleResponse response = resourceScheduleManager.updateSchedule(
+                1L, null, "0 0 * * *", "UTC",
+                DateUtils.addDays(new Date(), 1), DateUtils.addDays(new Date(), 2), null, null);
+        Mockito.verify(resourceScheduleDao, Mockito.times(1)).update(Mockito.eq(1L), Mockito.any(ResourceScheduleVO.class));
+
+        validateResponse(response, schedule, vm);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void updateScheduleEnableWithPastEndDateThrows() {
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+
+        Mockito.when(resourceScheduleDao.findById(1L)).thenReturn(schedule);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        Mockito.when(schedule.getSchedule()).thenReturn("0 0 * * *");
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(new Date(), 1));
+        Mockito.when(schedule.getEndDate()).thenReturn(DateUtils.addDays(new Date(), -1));
+        Mockito.when(schedule.getTimeZone()).thenReturn("UTC");
+        Mockito.when(schedule.getActionName()).thenReturn("START");
+        Mockito.when(vmScheduleWorker.getEntityOwnerId(1L)).thenReturn(2L);
+        Mockito.when(vmScheduleWorker.parseAction("START")).thenReturn(VMScheduleAction.START);
+        Mockito.when(accountManager.getAccount(2L)).thenReturn(Mockito.mock(Account.class));
+
+        resourceScheduleManager.updateSchedule(1L, null, null, null, null, null, true, null);
+    }
+
+    @Test
+    public void updateScheduleEnableWithFutureEndDateSucceeds() {
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+
+        Mockito.when(vm.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(resourceScheduleDao.findById(1L)).thenReturn(schedule);
+        Mockito.when(resourceScheduleDao.update(Mockito.eq(1L), Mockito.any(ResourceScheduleVO.class))).thenReturn(true);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.VirtualMachine);
+        Mockito.when(schedule.getSchedule()).thenReturn("0 0 * * *");
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(new Date(), 1));
+        Mockito.when(schedule.getEndDate()).thenReturn(DateUtils.addDays(new Date(), 2));
+        Mockito.when(schedule.getTimeZone()).thenReturn("UTC");
+        Mockito.when(schedule.getActionName()).thenReturn("START");
+        Mockito.when(vmScheduleWorker.getEntityOwnerId(1L)).thenReturn(2L);
+        Mockito.when(vmScheduleWorker.parseAction("START")).thenReturn(VMScheduleAction.START);
+        Mockito.when(accountManager.getAccount(2L)).thenReturn(Mockito.mock(Account.class));
+        Mockito.when(entityManager.findById(VirtualMachine.class, 1L)).thenReturn(vm);
+
+        resourceScheduleManager.updateSchedule(1L, null, null, null, null, null, true, null);
+
+        Mockito.verify(resourceScheduleDao, Mockito.times(1)).update(Mockito.eq(1L), Mockito.any(ResourceScheduleVO.class));
+        Mockito.verify(schedule).setEnabled(true);
+    }
+
+    @Test
+    public void createScheduleAutoScale() {
+        AutoScaleVmGroup group = Mockito.mock(AutoScaleVmGroup.class);
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Account ownerAccount = Mockito.mock(Account.class);
+        Map<String, String> details = new HashMap<>();
+        details.put("minmembers", "2");
+        details.put("maxmembers", "5");
+
+        Mockito.when(group.getId()).thenReturn(21L);
+        Mockito.when(group.getUuid()).thenReturn(UUID.randomUUID().toString());
+        Mockito.when(entityManager.findByUuid(AutoScaleVmGroup.class, "asg-uuid")).thenReturn(group);
+        Mockito.when(autoScaleScheduleWorker.isResourceValid(21L)).thenReturn(true);
+        Mockito.when(autoScaleScheduleWorker.getEntityOwnerId(21L)).thenReturn(2L);
+        Mockito.when(autoScaleScheduleWorker.parseAction("UPDATE")).thenReturn(AutoScaleScheduleAction.UPDATE);
+        Mockito.when(accountManager.getAccount(2L)).thenReturn(ownerAccount);
+        Mockito.when(resourceScheduleDao.persist(Mockito.any(ResourceScheduleVO.class))).thenReturn(schedule);
+        Mockito.when(schedule.getId()).thenReturn(99L);
+        Mockito.when(schedule.getResourceType()).thenReturn(ApiCommandResourceType.AutoScaleVmGroup);
+        Mockito.when(schedule.getResourceId()).thenReturn(21L);
+        Mockito.when(schedule.getActionName()).thenReturn("UPDATE");
+        Mockito.when(autoScaleScheduleWorker.parseAction("UPDATE")).thenReturn(AutoScaleScheduleAction.UPDATE);
+        Mockito.when(entityManager.findById(AutoScaleVmGroup.class, 21L)).thenReturn(group);
+
+        ResourceScheduleResponse response = resourceScheduleManager.createSchedule(
+                ApiCommandResourceType.AutoScaleVmGroup, "asg-uuid", null,
+                "0 0 * * *", "UTC", "UPDATE",
+                DateUtils.addDays(new Date(), 1), DateUtils.addDays(new Date(), 2),
+                true, details);
+
+        Assert.assertEquals(ApiCommandResourceType.AutoScaleVmGroup, ReflectionTestUtils.getField(response, "resourceType"));
+        Assert.assertEquals("21", ReflectionTestUtils.getField(response, "resourceId"));
+        Assert.assertEquals("2", ((Map<String, String>) ReflectionTestUtils.getField(response, "details")).get("minmembers"));
+        Assert.assertEquals("5", ((Map<String, String>) ReflectionTestUtils.getField(response, "details")).get("maxmembers"));
+        Mockito.verify(autoScaleScheduleWorker, Mockito.times(1)).validateDetails(Mockito.eq(AutoScaleScheduleAction.UPDATE), Mockito.eq(details));
+    }
+
+    @Test
+    public void removeSchedulesForResource() {
+        ResourceScheduleVO schedule1 = Mockito.mock(ResourceScheduleVO.class);
+        ResourceScheduleVO schedule2 = Mockito.mock(ResourceScheduleVO.class);
+        List<ResourceScheduleVO> scheduleList = new ArrayList<>();
+        scheduleList.add(schedule1);
+        scheduleList.add(schedule2);
+        SearchCriteria<ResourceScheduleVO> sc = Mockito.mock(SearchCriteria.class);
+
+        Mockito.when(resourceScheduleDao.getSearchCriteriaForResource(
+                ApiCommandResourceType.VirtualMachine, 1L)).thenReturn(sc);
+        Mockito.when(resourceScheduleDao.search(sc, null)).thenReturn(scheduleList);
+        Mockito.when(schedule1.getId()).thenReturn(1L);
+        Mockito.when(schedule2.getId()).thenReturn(2L);
+        Mockito.when(resourceScheduleDao.removeAllSchedulesForResource(Mockito.any(), Mockito.anyLong())).thenReturn(2L);
+
+        resourceScheduleManager.removeSchedulesForResource(ApiCommandResourceType.VirtualMachine, 1L);
+
+        Mockito.verify(resourceScheduleDao, Mockito.times(1)).removeAllSchedulesForResource(Mockito.any(), Mockito.anyLong());
+        Mockito.verify(vmScheduleWorker, Mockito.times(1)).removeScheduledJobs(Mockito.anyList());
+    }
+
+    @Test
+    public void removeSchedule() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+
+        Mockito.when(vm.getId()).thenReturn(1L);
+        Mockito.when(entityManager.findByUuid(VirtualMachine.class, "1")).thenReturn(null);
+        Mockito.when(entityManager.findById(VirtualMachine.class, 1L)).thenReturn(vm);
+        Mockito.when(vmScheduleWorker.getEntityOwnerId(1L)).thenReturn(2L);
+        Mockito.when(accountManager.getAccount(2L)).thenReturn(Mockito.mock(Account.class));
+        Mockito.when(resourceScheduleDao.removeSchedulesForResourceAndIds(
+                Mockito.any(), Mockito.anyLong(), Mockito.anyList())).thenReturn(1L);
+
+        ResourceScheduleVO schedule1 = Mockito.mock(ResourceScheduleVO.class);
+        ResourceScheduleVO schedule2 = Mockito.mock(ResourceScheduleVO.class);
+        List<ResourceScheduleVO> scheduleList = new ArrayList<>();
+        scheduleList.add(schedule1);
+        scheduleList.add(schedule2);
+
+        Mockito.when(resourceScheduleDao.searchAndCount(
+                Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+                Mockito.any(), Mockito.any(), Mockito.any())
+        ).thenReturn(new Pair<>(scheduleList, scheduleList.size()));
+
+        Long rowsRemoved = resourceScheduleManager.removeSchedule(
+                ApiCommandResourceType.VirtualMachine, "1", 10L, null);
+
+        Mockito.verify(resourceScheduleDao, Mockito.times(1)).removeSchedulesForResourceAndIds(
+                Mockito.any(), Mockito.anyLong(), Mockito.anyList());
+        Assert.assertEquals(1L, (long) rowsRemoved);
+    }
+
+    @Test
+    public void validateStartDateEndDate() {
+        // Valid scenario 1
+        // Start date is before end date
+        Date startDate = DateUtils.addDays(new Date(), 1);
+        Date endDate = DateUtils.addDays(new Date(), 2);
+        resourceScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
+
+        // Valid Scenario 2
+        // Start date is before current date and end date is null
+        endDate = null;
+        resourceScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
+
+        // Invalid Scenario 2
+        // Start date is before current date
+        startDate = DateUtils.addDays(new Date(), -1);
+        try {
+            resourceScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
+            Assert.fail("Should have thrown InvalidParameterValueException");
+        } catch (InvalidParameterValueException e) {
+            Assert.assertTrue(e.getMessage().contains("Invalid value for start date. Start date") &&
+                    e.getMessage().contains("can't be before current time"));
+        }
+
+        // Invalid Scenario 2
+        // Start date is after end date
+        startDate = DateUtils.addDays(new Date(), 2);
+        endDate = DateUtils.addDays(new Date(), 1);
+        try {
+            resourceScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
+            Assert.fail("Should have thrown InvalidParameterValueException");
+        } catch (InvalidParameterValueException e) {
+            Assert.assertTrue(e.getMessage().contains("Invalid value for end date. End date") &&
+                    e.getMessage().contains("can't be before start date"));
+        }
+
+        // Invalid Scenario 3
+        // End date is before current date
+        startDate = DateUtils.addDays(new Date(), 1);
+        endDate = DateUtils.addDays(new Date(), -1);
+        try {
+            resourceScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
+            Assert.fail("Should have thrown InvalidParameterValueException");
+        } catch (InvalidParameterValueException e) {
+            Assert.assertTrue(e.getMessage().contains("Invalid value for end date. End date") &&
+                    e.getMessage().contains("can't be before current time"));
+        }
+    }
+
+    @Test
+    public void getConfigKeys() {
+        ConfigKey<?>[] configKeys = resourceScheduleManager.getConfigKeys();
+        Assert.assertEquals(1, configKeys.length);
+        Assert.assertEquals(BaseScheduleWorker.ScheduledJobExpireInterval.key(), configKeys[0].key());
+    }
+}
diff --git a/server/src/test/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleWorkerTest.java b/server/src/test/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleWorkerTest.java
new file mode 100644
index 00000000000..83c77099981
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/schedule/autoscale/AutoScaleScheduleWorkerTest.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule.autoscale;
+
+import com.cloud.event.ActionEventUtils;
+import com.cloud.event.EventTypes;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.as.AutoScaleManager;
+import com.cloud.network.as.AutoScaleVmGroup;
+import com.cloud.network.as.AutoScaleVmGroupVO;
+import com.cloud.network.as.dao.AutoScaleVmGroupDao;
+import com.cloud.user.User;
+import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
+import org.apache.cloudstack.schedule.ResourceScheduleVO;
+import org.apache.cloudstack.schedule.ResourceScheduledJobVO;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDao;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDetailsDao;
+import org.apache.cloudstack.schedule.dao.ResourceScheduledJobDao;
+import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.commons.lang.time.DateUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AutoScaleScheduleWorkerTest {
+    @Spy
+    @InjectMocks
+    private AutoScaleScheduleWorker worker = new AutoScaleScheduleWorker();
+
+    @Mock
+    private AutoScaleVmGroupDao autoScaleVmGroupDao;
+    @Mock
+    private ResourceScheduleDetailsDao resourceScheduleDetailsDao;
+    @Mock
+    private ResourceScheduleDao resourceScheduleDao;
+    @Mock
+    private ResourceScheduledJobDao resourceScheduledJobDao;
+    @Mock
+    private AsyncJobManager asyncJobManager;
+    @Mock
+    private AutoScaleManager autoScaleManager;
+
+    private AutoCloseable closeable;
+    private MockedStatic<ActionEventUtils> actionEventUtilsMocked;
+
+    @Before
+    public void setUp() {
+        closeable = MockitoAnnotations.openMocks(this);
+        actionEventUtilsMocked = Mockito.mockStatic(ActionEventUtils.class);
+        Mockito.when(ActionEventUtils.onCompletedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.any(),
+                Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyString(),
+                Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong())).thenReturn(1L);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        actionEventUtilsMocked.close();
+        closeable.close();
+    }
+
+    @Test
+    public void testProcessJobWithValidDetailsSubmitsUpdateAutoScaleVmGroupCmd() {
+        ResourceScheduledJobVO job = Mockito.mock(ResourceScheduledJobVO.class);
+        AutoScaleVmGroupVO group = Mockito.mock(AutoScaleVmGroupVO.class);
+        Map<String, String> details = new HashMap<>();
+        details.put("minmembers", "2");
+        details.put("maxmembers", "5");
+
+        Mockito.when(job.getResourceId()).thenReturn(1L);
+        Mockito.when(job.getScheduleId()).thenReturn(10L);
+        Mockito.when(job.getActionName()).thenReturn(AutoScaleScheduleAction.UPDATE.name());
+        Mockito.when(autoScaleVmGroupDao.findById(1L)).thenReturn(group);
+        Mockito.when(group.getState()).thenReturn(AutoScaleVmGroup.State.ENABLED);
+        Mockito.when(group.getAccountId()).thenReturn(3L);
+        Mockito.when(group.getId()).thenReturn(1L);
+        Mockito.when(group.getUuid()).thenReturn("asg-uuid");
+        Mockito.when(resourceScheduleDetailsDao.listDetailsKeyPairs(10L, true)).thenReturn(details);
+        Mockito.doReturn(11L).when(worker).submitAsyncJob(
+                Mockito.eq(UpdateAutoScaleVmGroupCmd.class), Mockito.eq(3L), Mockito.eq(1L), Mockito.eq(1L), Mockito.anyMap());
+
+        Long asyncJobId = worker.processJob(job);
+
+        Assert.assertEquals(Long.valueOf(11L), asyncJobId);
+        Mockito.verify(worker).submitAsyncJob(Mockito.eq(UpdateAutoScaleVmGroupCmd.class), Mockito.eq(3L), Mockito.eq(1L), Mockito.eq(1L),
+                Mockito.argThat(map -> "2".equals(map.get("minmembers")) && "5".equals(map.get("maxmembers"))));
+    }
+
+    @Test
+    public void testProcessJobWithMissingGroupSkipsExecution() {
+        ResourceScheduledJobVO job = Mockito.mock(ResourceScheduledJobVO.class);
+        Mockito.when(job.getResourceId()).thenReturn(1L);
+        Mockito.when(autoScaleVmGroupDao.findById(1L)).thenReturn(null);
+
+        Long asyncJobId = worker.processJob(job);
+        Assert.assertNull(asyncJobId);
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void testValidateDetailsMissingRequiredKeys() {
+        Map<String, String> details = new HashMap<>();
+        details.put("minmembers", "1");
+        worker.validateDetails(AutoScaleScheduleAction.UPDATE, details);
+    }
+
+    @Test
+    public void testScheduleNextJobDisablesWithEventWhenEndDatePassed() {
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        AutoScaleVmGroupVO group = Mockito.mock(AutoScaleVmGroupVO.class);
+        Date pastDate = DateUtils.addDays(new Date(), -1);
+
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getSchedule()).thenReturn("0 0 * * *");
+        Mockito.when(schedule.getStartDate()).thenReturn(pastDate);
+        Mockito.when(schedule.getEndDate()).thenReturn(pastDate);
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(ZoneId.of("UTC"));
+        Mockito.when(schedule.getUuid()).thenReturn("sched-uuid");
+        Mockito.when(schedule.getDescription()).thenReturn("test schedule");
+        Mockito.when(autoScaleVmGroupDao.findById(1L)).thenReturn(group);
+        Mockito.when(group.getState()).thenReturn(AutoScaleVmGroup.State.ENABLED);
+        Mockito.when(group.getAccountId()).thenReturn(2L);
+
+        worker.scheduleNextJob(schedule, new Date());
+
+        Mockito.verify(schedule).setEnabled(false);
+        Mockito.verify(resourceScheduleDao).persist(schedule);
+        actionEventUtilsMocked.verify(() -> ActionEventUtils.onScheduledActionEvent(
+                Mockito.eq(User.UID_SYSTEM), Mockito.eq(2L),
+                Mockito.eq(EventTypes.EVENT_SCHEDULE_UPDATE),
+                Mockito.contains("end date"),
+                Mockito.eq(1L), Mockito.anyString(), Mockito.eq(true), Mockito.eq(0L)));
+    }
+}
diff --git a/server/src/test/java/org/apache/cloudstack/schedule/vm/VMScheduleWorkerTest.java b/server/src/test/java/org/apache/cloudstack/schedule/vm/VMScheduleWorkerTest.java
new file mode 100644
index 00000000000..7a88c2e0ecb
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/schedule/vm/VMScheduleWorkerTest.java
@@ -0,0 +1,398 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.schedule.vm;
+
+import com.cloud.event.ActionEventUtils;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.network.as.dao.AutoScaleVmGroupVmMapDao;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
+import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
+import org.apache.cloudstack.api.command.user.vm.StopVMCmd;
+import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher;
+import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.schedule.ResourceScheduleVO;
+import org.apache.cloudstack.schedule.ResourceScheduledJobVO;
+import org.apache.cloudstack.schedule.dao.ResourceScheduleDao;
+import org.apache.cloudstack.schedule.dao.ResourceScheduledJobDao;
+import org.apache.commons.lang.time.DateUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import javax.persistence.EntityExistsException;
+import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class VMScheduleWorkerTest {
+    @Spy
+    @InjectMocks
+    private VMScheduleWorker vmScheduleWorker = new VMScheduleWorker();
+
+    @Mock
+    private UserVmManager userVmManager;
+
+    @Mock
+    private AutoScaleVmGroupVmMapDao autoScaleVmGroupVmMapDao;
+
+    @Mock
+    private ResourceScheduleDao resourceScheduleDao;
+
+    @Mock
+    private ResourceScheduledJobDao resourceScheduledJobDao;
+
+    @Mock
+    private AsyncJobManager asyncJobManager;
+
+    @Mock
+    private AsyncJobDispatcher asyncJobDispatcher;
+
+    private AutoCloseable closeable;
+
+    private MockedStatic<ActionEventUtils> actionEventUtilsMocked;
+
+    @Before
+    public void setUp() throws Exception {
+        closeable = MockitoAnnotations.openMocks(this);
+        actionEventUtilsMocked = Mockito.mockStatic(ActionEventUtils.class);
+        Mockito.when(ActionEventUtils.onScheduledActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(),
+                        Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyBoolean(),
+                        Mockito.anyLong()))
+                .thenReturn(1L);
+        Mockito.when(ActionEventUtils.onCompletedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.any(),
+                Mockito.anyString(), Mockito.anyBoolean(),
+                Mockito.anyString(),
+                Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong())).thenReturn(1L);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        actionEventUtilsMocked.close();
+        closeable.close();
+    }
+
+    @Test
+    public void testProcessJobRunning() {
+        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMScheduleAction.STOP);
+        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMScheduleAction.FORCE_STOP);
+        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMScheduleAction.REBOOT);
+        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMScheduleAction.FORCE_REBOOT);
+        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Stopped, VMScheduleAction.START);
+    }
+
+    private void executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State state, VMScheduleAction action) {
+        ResourceScheduledJobVO job = Mockito.mock(ResourceScheduledJobVO.class);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        Mockito.when(job.getResourceId()).thenReturn(1L);
+        Mockito.when(job.getActionName()).thenReturn(action.name());
+        Mockito.when(vm.getState()).thenReturn(state);
+        Mockito.when(userVmManager.getUserVm(1L)).thenReturn(vm);
+        Mockito.doReturn(1L).when(vmScheduleWorker).submitAsyncJob(
+                Mockito.any(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.any());
+
+        Long jobId = vmScheduleWorker.processJob(job);
+
+        Assert.assertNotNull(jobId);
+        Assert.assertEquals(1L, (long) jobId);
+    }
+
+    @Test
+    public void testProcessJobInvalidAction() {
+        ResourceScheduledJobVO job = Mockito.mock(ResourceScheduledJobVO.class);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        Mockito.when(job.getResourceId()).thenReturn(1L);
+        Mockito.when(job.getActionName()).thenReturn(VMScheduleAction.START.name());
+        Mockito.when(vm.getState()).thenReturn(VirtualMachine.State.Running);
+        Mockito.when(userVmManager.getUserVm(1L)).thenReturn(vm);
+
+        Long jobId = vmScheduleWorker.processJob(job);
+
+        Assert.assertNull(jobId);
+    }
+
+    @Test
+    public void testProcessJobVMInInvalidState() {
+        ResourceScheduledJobVO job = Mockito.mock(ResourceScheduledJobVO.class);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        Mockito.when(job.getResourceId()).thenReturn(1L);
+        Mockito.when(job.getActionName()).thenReturn(VMScheduleAction.START.name());
+        Mockito.when(vm.getState()).thenReturn(VirtualMachine.State.Unknown);
+        Mockito.when(userVmManager.getUserVm(1L)).thenReturn(vm);
+
+        Long jobId = vmScheduleWorker.processJob(job);
+
+        Assert.assertNull(jobId);
+    }
+
+    @Test
+    public void testScheduleNextJobScheduleScheduleExists() {
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        Date startDate = DateUtils.addDays(now, 1);
+        Date expectedScheduledTime = DateUtils.round(DateUtils.addMinutes(startDate, 1), Calendar.MINUTE);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn("* * * * *");
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
+        Mockito.when(schedule.getStartDate()).thenReturn(startDate);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getActionName()).thenReturn(VMScheduleAction.START.name());
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
+        Mockito.when(resourceScheduledJobDao.persist(Mockito.any())).thenThrow(EntityExistsException.class);
+        Date actualScheduledTime = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+
+        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
+    }
+
+    @Test
+    public void testScheduleNextJobScheduleFutureSchedule() {
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        Date startDate = DateUtils.addDays(now, 1);
+        Date expectedScheduledTime = DateUtils.round(DateUtils.addMinutes(startDate, 1), Calendar.MINUTE);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn("* * * * *");
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
+        Mockito.when(schedule.getStartDate()).thenReturn(startDate);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getActionName()).thenReturn(VMScheduleAction.START.name());
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
+        Date actualScheduledTime = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+
+        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
+    }
+
+    @Test
+    public void testScheduleNextJobScheduleFutureScheduleWithTimeZoneChecks() throws Exception {
+        String cron = "30 5 * * *";
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        Date startDate = DateUtils.addDays(now, 1);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn(cron);
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("EST").toZoneId());
+        Mockito.when(schedule.getStartDate()).thenReturn(startDate);
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getActionName()).thenReturn(VMScheduleAction.START.name());
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
+
+        ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(startDate.toInstant(), schedule.getTimeZoneId());
+        zonedDateTime = zonedDateTime.withHour(5).withMinute(30).withSecond(0).withNano(0);
+        Date expectedScheduledTime = Date.from(zonedDateTime.toInstant());
+        if (expectedScheduledTime.before(startDate)) {
+            expectedScheduledTime = Date.from(zonedDateTime.plusDays(1).toInstant());
+        }
+
+        Date actualScheduledTime = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
+    }
+
+    @Test
+    public void testScheduleNextJobScheduleCurrentSchedule() {
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        Date expectedScheduledTime = DateUtils.round(DateUtils.addMinutes(now, 1), Calendar.MINUTE);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn("* * * * *");
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(now, -1));
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getActionName()).thenReturn(VMScheduleAction.START.name());
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
+        Date actualScheduledTime = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+
+        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
+    }
+
+    @Test
+    public void testScheduleNextJobScheduleCurrentScheduleWithTimeZoneChecks() throws Exception {
+        String cron = "30 5 * * *";
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        UserVm vm = Mockito.mock(UserVm.class);
+
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn(cron);
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("EST").toZoneId());
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(now, -1));
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(schedule.getActionName()).thenReturn(VMScheduleAction.START.name());
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
+
+        ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(now.toInstant(), schedule.getTimeZoneId());
+        zonedDateTime = zonedDateTime.withHour(5).withMinute(30).withSecond(0).withNano(0);
+        Date expectedScheduledTime = Date.from(zonedDateTime.toInstant());
+        if (expectedScheduledTime.before(now)) {
+            expectedScheduledTime = DateUtils.addDays(expectedScheduledTime, 1);
+        }
+
+        Date actualScheduledTime = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
+    }
+
+    @Test
+    public void testScheduleNextJobScheduleExpired() {
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn("* * * * *");
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(now, -1));
+        Mockito.when(schedule.getEndDate()).thenReturn(DateUtils.addMinutes(now, -5));
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(Mockito.mock(UserVm.class));
+        Date actualDate = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+        Assert.assertNull(actualDate);
+    }
+
+    @Test
+    public void testScheduleNextJobNextOccurrenceAfterEndDate() {
+        Date now = DateUtils.setSeconds(new Date(), 0);
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(true);
+        Mockito.when(schedule.getSchedule()).thenReturn("* * * * *");
+        Mockito.when(schedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
+        // endDate is in the future (now < endDate), but the first occurrence (>= startDate)
+        // falls after endDate, so no further jobs can ever be scheduled. The schedule's
+        // declared lifetime hasn't ended yet though, so it must remain enabled until
+        // endDate actually passes (handled separately by the "end time has passed" branch).
+        Mockito.when(schedule.getStartDate()).thenReturn(DateUtils.addDays(now, 10));
+        Mockito.when(schedule.getEndDate()).thenReturn(DateUtils.addDays(now, 5));
+        Mockito.when(schedule.getResourceId()).thenReturn(1L);
+        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(Mockito.mock(UserVm.class));
+
+        Date actualDate = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+
+        Assert.assertNull(actualDate);
+        Mockito.verify(schedule, Mockito.never()).setEnabled(Mockito.anyBoolean());
+        Mockito.verify(resourceScheduleDao, Mockito.never()).persist(Mockito.any());
+    }
+
+    @Test
+    public void testScheduleNextJobScheduleDisabled() {
+        ResourceScheduleVO schedule = Mockito.mock(ResourceScheduleVO.class);
+        Mockito.when(schedule.getEnabled()).thenReturn(false);
+        Date actualDate = vmScheduleWorker.scheduleNextJob(schedule, new Date());
+        Assert.assertNull(actualDate);
+    }
+
+    @Test
+    public void testExecuteJobs() {
+        ResourceScheduledJobVO job1 = Mockito.mock(ResourceScheduledJobVO.class);
+        ResourceScheduledJobVO job2 = Mockito.mock(ResourceScheduledJobVO.class);
+
+        Mockito.doReturn(null).when(vmScheduleWorker).processJob(job2);
+
+        Mockito.when(resourceScheduledJobDao.acquireInLockTable(job1.getId())).thenReturn(job1);
+        Mockito.when(resourceScheduledJobDao.acquireInLockTable(job2.getId())).thenReturn(job2);
+
+        Map<Long, ResourceScheduledJobVO> jobs = new HashMap<>();
+        jobs.put(1L, job1);
+        jobs.put(2L, job2);
+
+        ReflectionTestUtils.setField(vmScheduleWorker, "currentTimestamp", new Date());
+
+        vmScheduleWorker.executeJobs(jobs);
+
+        Mockito.verify(vmScheduleWorker, Mockito.times(2)).processJob(Mockito.any());
+        Mockito.verify(resourceScheduledJobDao, Mockito.times(2)).acquireInLockTable(Mockito.anyLong());
+    }
+
+    @Test
+    public void testSubmitStopVMJob() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        Mockito.when(asyncJobManager.submitAsyncJob(Mockito.any(AsyncJobVO.class))).thenReturn(1L);
+        Mockito.when(asyncJobDispatcher.getName()).thenReturn("ApiAsyncJobDispatcher");
+        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
+            when(ComponentContext.inject(Mockito.any(StopVMCmd.class))).thenReturn(Mockito.mock(StopVMCmd.class));
+            long jobId = vmScheduleWorker.submitAsyncJob(StopVMCmd.class, vm.getAccountId(), vm.getId(), 1L,
+                    Map.of("forced", "false"));
+            Assert.assertEquals(1L, jobId);
+        }
+    }
+
+    @Test
+    public void testSubmitRebootVMJob() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        Mockito.when(asyncJobManager.submitAsyncJob(Mockito.any(AsyncJobVO.class))).thenReturn(1L);
+        Mockito.when(asyncJobDispatcher.getName()).thenReturn("ApiAsyncJobDispatcher");
+        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
+            when(ComponentContext.inject(Mockito.any(RebootVMCmd.class))).thenReturn(Mockito.mock(RebootVMCmd.class));
+            long jobId = vmScheduleWorker.submitAsyncJob(RebootVMCmd.class, vm.getAccountId(), vm.getId(), 1L,
+                    Map.of("forced", "false"));
+            Assert.assertEquals(1L, jobId);
+        }
+    }
+
+    @Test
+    public void testSubmitStartVMJob() {
+        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
+        Mockito.when(asyncJobManager.submitAsyncJob(Mockito.any(AsyncJobVO.class))).thenReturn(1L);
+        Mockito.when(asyncJobDispatcher.getName()).thenReturn("ApiAsyncJobDispatcher");
+        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
+            when(ComponentContext.inject(Mockito.any(StartVMCmd.class))).thenReturn(Mockito.mock(StartVMCmd.class));
+            long jobId = vmScheduleWorker.submitAsyncJob(StartVMCmd.class, vm.getAccountId(), vm.getId(), 1L,
+                    Map.of());
+            Assert.assertEquals(1L, jobId);
+        }
+    }
+
+    @Test
+    public void parseActionResolvesEnum() {
+        Assert.assertEquals(VMScheduleAction.START, vmScheduleWorker.parseAction("start"));
+        Assert.assertEquals(VMScheduleAction.STOP, vmScheduleWorker.parseAction("STOP"));
+        Assert.assertEquals(VMScheduleAction.FORCE_REBOOT, vmScheduleWorker.parseAction("Force_Reboot"));
+    }
+
+    @Test(expected = InvalidParameterValueException.class)
+    public void parseActionThrowsOnUnknown() {
+        vmScheduleWorker.parseAction("BOGUS");
+    }
+}
diff --git a/server/src/test/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImplTest.java
deleted file mode 100644
index 84b1c577f6a..00000000000
--- a/server/src/test/java/org/apache/cloudstack/vm/schedule/VMScheduleManagerImplTest.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.vm.schedule;
-
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.user.Account;
-import com.cloud.user.AccountManager;
-import com.cloud.user.User;
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.Pair;
-import com.cloud.utils.db.SearchCriteria;
-import com.cloud.vm.UserVmManager;
-import com.cloud.vm.VirtualMachine;
-import org.apache.cloudstack.api.command.user.vm.CreateVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.DeleteVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.ListVMScheduleCmd;
-import org.apache.cloudstack.api.command.user.vm.UpdateVMScheduleCmd;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.api.response.VMScheduleResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.vm.schedule.dao.VMScheduleDao;
-import org.apache.commons.lang.time.DateUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import static org.junit.Assert.assertNotNull;
-
-public class VMScheduleManagerImplTest {
-
-    @Spy
-    @InjectMocks
-    VMScheduleManagerImpl vmScheduleManager = new VMScheduleManagerImpl();
-
-    @Mock
-    VMScheduleDao vmScheduleDao;
-
-    @Mock
-    VMScheduler vmScheduler;
-
-    @Mock
-    UserVmManager userVmManager;
-
-    @Mock
-    AccountManager accountManager;
-
-    private AutoCloseable closeable;
-
-    @Before
-    public void setUp() {
-        closeable = MockitoAnnotations.openMocks(this);
-        Account callingAccount = Mockito.mock(Account.class);
-        User callingUser = Mockito.mock(User.class);
-        CallContext.register(callingUser, callingAccount);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        closeable.close();
-    }
-
-    private void validateResponse(VMScheduleResponse response, VMSchedule vmSchedule, VirtualMachine vm) {
-        assertNotNull(response);
-        Assert.assertEquals(ReflectionTestUtils.getField(response, "id"), vmSchedule.getUuid());
-        Assert.assertEquals(ReflectionTestUtils.getField(response, "vmId"), vm.getUuid());
-        Assert.assertEquals(ReflectionTestUtils.getField(response, "schedule"), vmSchedule.getSchedule());
-        Assert.assertEquals(ReflectionTestUtils.getField(response, "timeZone"), vmSchedule.getTimeZone());
-        Assert.assertEquals(ReflectionTestUtils.getField(response, "action"), vmSchedule.getAction());
-        Assert.assertEquals(ReflectionTestUtils.getField(response, "startDate"), vmSchedule.getStartDate());
-        Assert.assertEquals(ReflectionTestUtils.getField(response, "endDate"), vmSchedule.getEndDate());
-    }
-
-    @Test
-    public void createSchedule() {
-        UserVm vm = Mockito.mock(UserVm.class);
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        CreateVMScheduleCmd cmd = Mockito.mock(CreateVMScheduleCmd.class);
-
-        Mockito.when(cmd.getVmId()).thenReturn(1L);
-        Mockito.when(cmd.getSchedule()).thenReturn("0 0 * * *");
-        Mockito.when(cmd.getTimeZone()).thenReturn("UTC");
-        Mockito.when(cmd.getAction()).thenReturn("start");
-        Mockito.when(cmd.getStartDate()).thenReturn(DateUtils.addDays(new Date(), 1));
-        Mockito.when(cmd.getEndDate()).thenReturn(DateUtils.addDays(new Date(), 2));
-        Mockito.when(vm.getUuid()).thenReturn(UUID.randomUUID().toString());
-        Mockito.when(vmScheduleDao.persist(Mockito.any(VMScheduleVO.class))).thenReturn(vmSchedule);
-        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
-        Mockito.doNothing().when(accountManager).checkAccess(Mockito.any(Account.class), Mockito.isNull(), Mockito.eq(false), Mockito.eq(vm));
-        VMScheduleResponse response = vmScheduleManager.createSchedule(cmd);
-        Mockito.verify(vmScheduleDao, Mockito.times(1)).persist(Mockito.any(VMScheduleVO.class));
-
-        validateResponse(response, vmSchedule, vm);
-    }
-
-    @Test
-    public void createResponse() {
-        VMSchedule vmSchedule = Mockito.mock(VMSchedule.class);
-        UserVm vm = Mockito.mock(UserVm.class);
-        Mockito.when(vmSchedule.getVmId()).thenReturn(1L);
-        Mockito.when(userVmManager.getUserVm(vmSchedule.getVmId())).thenReturn(vm);
-
-        VMScheduleResponse response = vmScheduleManager.createResponse(vmSchedule);
-        validateResponse(response, vmSchedule, vm);
-    }
-
-    @Test
-    public void listSchedule() {
-        UserVm vm = Mockito.mock(UserVm.class);
-        VMScheduleVO vmSchedule1 = Mockito.mock(VMScheduleVO.class);
-        VMScheduleVO vmSchedule2 = Mockito.mock(VMScheduleVO.class);
-        List<VMScheduleVO> vmScheduleList = new ArrayList<>();
-        vmScheduleList.add(vmSchedule1);
-        vmScheduleList.add(vmSchedule2);
-
-        Mockito.when(vm.getUuid()).thenReturn(UUID.randomUUID().toString());
-        Mockito.when(userVmManager.getUserVm(1L)).thenReturn(vm);
-        Mockito.when(
-                vmScheduleDao.searchAndCount(Mockito.anyLong(), Mockito.anyLong(), Mockito.any(),
-                        Mockito.anyBoolean(), Mockito.anyLong(), Mockito.anyLong())
-        ).thenReturn(new Pair<>(vmScheduleList, vmScheduleList.size()));
-        Mockito.when(vmSchedule1.getVmId()).thenReturn(1L);
-        Mockito.when(vmSchedule2.getVmId()).thenReturn(1L);
-
-        ListVMScheduleCmd cmd = Mockito.mock(ListVMScheduleCmd.class);
-        Mockito.when(cmd.getVmId()).thenReturn(1L);
-
-        ListResponse<VMScheduleResponse> responseList = vmScheduleManager.listSchedule(cmd);
-        Mockito.verify(vmScheduleDao, Mockito.times(1)).searchAndCount(Mockito.anyLong(), Mockito.anyLong(), Mockito.any(),
-                Mockito.anyBoolean(), Mockito.anyLong(), Mockito.anyLong());
-        assertNotNull(responseList);
-        Assert.assertEquals(2, (int) responseList.getCount());
-        Assert.assertEquals(2, responseList.getResponses().size());
-
-        for (int i = 0; i < responseList.getResponses().size(); i++) {
-            VMScheduleResponse response = responseList.getResponses().get(i);
-            VMScheduleVO vmSchedule = vmScheduleList.get(i);
-            validateResponse(response, vmSchedule, vm);
-        }
-    }
-
-    @Test
-    public void updateSchedule() {
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        UpdateVMScheduleCmd cmd = Mockito.mock(UpdateVMScheduleCmd.class);
-        UserVm vm = Mockito.mock(UserVm.class);
-        Mockito.when(cmd.getId()).thenReturn(1L);
-        Mockito.when(cmd.getSchedule()).thenReturn("0 0 * * *");
-        Mockito.when(cmd.getTimeZone()).thenReturn("UTC");
-        Mockito.when(cmd.getStartDate()).thenReturn(DateUtils.addDays(new Date(), 1));
-        Mockito.when(cmd.getEndDate()).thenReturn(DateUtils.addDays(new Date(), 2));
-        Mockito.when(vmScheduleDao.findById(Mockito.anyLong())).thenReturn(vmSchedule);
-        Mockito.when(vmScheduleDao.update(Mockito.eq(cmd.getId()), Mockito.any(VMScheduleVO.class))).thenReturn(true);
-        Mockito.when(vmSchedule.getVmId()).thenReturn(1L);
-        Mockito.when(vmSchedule.getStartDate()).thenReturn(DateUtils.addDays(new Date(), 1));
-        Mockito.when(userVmManager.getUserVm(vmSchedule.getVmId())).thenReturn(vm);
-
-        VMScheduleResponse response = vmScheduleManager.updateSchedule(cmd);
-        Mockito.verify(vmScheduleDao, Mockito.times(1)).update(Mockito.eq(cmd.getId()), Mockito.any(VMScheduleVO.class));
-
-        validateResponse(response, vmSchedule, vm);
-    }
-
-    @Test
-    public void removeScheduleByVmId() {
-        UserVm vm = Mockito.mock(UserVm.class);
-        VMScheduleVO vmSchedule1 = Mockito.mock(VMScheduleVO.class);
-        VMScheduleVO vmSchedule2 = Mockito.mock(VMScheduleVO.class);
-        List<VMScheduleVO> vmScheduleList = new ArrayList<>();
-        vmScheduleList.add(vmSchedule1);
-        vmScheduleList.add(vmSchedule2);
-        SearchCriteria<VMScheduleVO> sc = Mockito.mock(SearchCriteria.class);
-
-        Mockito.when(vm.getId()).thenReturn(1L);
-        Mockito.when(vmScheduleDao.getSearchCriteriaForVMId(vm.getId())).thenReturn(sc);
-        Mockito.when(vmScheduleDao.search(sc, null)).thenReturn(vmScheduleList);
-        Mockito.when(vmSchedule1.getId()).thenReturn(1L);
-        Mockito.when(vmSchedule2.getId()).thenReturn(2L);
-        Mockito.when(vmScheduleDao.remove(sc)).thenReturn(2);
-
-        long rowsRemoved = vmScheduleManager.removeScheduleByVmId(vm.getId(), false);
-
-        Mockito.verify(vmScheduleDao, Mockito.times(1)).remove(sc);
-        Assert.assertEquals(2, rowsRemoved);
-    }
-
-    @Test
-    public void removeSchedule() {
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        UserVm vm = Mockito.mock(UserVm.class);
-        DeleteVMScheduleCmd cmd = Mockito.mock(DeleteVMScheduleCmd.class);
-
-        Mockito.when(cmd.getId()).thenReturn(1L);
-        Mockito.when(cmd.getVmId()).thenReturn(1L);
-        Mockito.when(vmSchedule.getVmId()).thenReturn(1L);
-        Mockito.when(userVmManager.getUserVm(cmd.getVmId())).thenReturn(vm);
-        Mockito.when(vmScheduleDao.findById(Mockito.anyLong())).thenReturn(vmSchedule);
-        Mockito.when(vmScheduleDao.removeSchedulesForVmIdAndIds(Mockito.anyLong(), Mockito.anyList())).thenReturn(1L);
-
-        Long rowsRemoved = vmScheduleManager.removeSchedule(cmd);
-
-        Mockito.verify(vmScheduleDao, Mockito.times(1)).removeSchedulesForVmIdAndIds(Mockito.anyLong(), Mockito.anyList());
-        Assert.assertEquals(1L, (long) rowsRemoved);
-    }
-
-    @Test
-    public void validateStartDateEndDate() {
-        // Valid scenario 1
-        // Start date is before end date
-        Date startDate = DateUtils.addDays(new Date(), 1);
-        Date endDate = DateUtils.addDays(new Date(), 2);
-        vmScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
-
-        // Valid Scenario 2
-        // Start date is before current date and end date is null
-        endDate = null;
-        vmScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
-
-        // Invalid Scenario 2
-        // Start date is before current date
-        startDate = DateUtils.addDays(new Date(), -1);
-        try {
-            vmScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
-            Assert.fail("Should have thrown InvalidParameterValueException");
-        } catch (InvalidParameterValueException e) {
-            Assert.assertTrue(e.getMessage().contains("Invalid value for start date. Start date") &&
-                    e.getMessage().contains("can't be before current time"));
-        }
-
-        // Invalid Scenario 2
-        // Start date is after end date
-        startDate = DateUtils.addDays(new Date(), 2);
-        endDate = DateUtils.addDays(new Date(), 1);
-        try {
-            vmScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
-            Assert.fail("Should have thrown InvalidParameterValueException");
-        } catch (InvalidParameterValueException e) {
-            Assert.assertTrue(e.getMessage().contains("Invalid value for end date. End date") &&
-                    e.getMessage().contains("can't be before start date"));
-        }
-
-        // Invalid Scenario 3
-        // End date is before current date
-        startDate = DateUtils.addDays(new Date(), 1);
-        endDate = DateUtils.addDays(new Date(), -1);
-        try {
-            vmScheduleManager.validateStartDateEndDate(startDate, endDate, TimeZone.getDefault());
-            Assert.fail("Should have thrown InvalidParameterValueException");
-        } catch (InvalidParameterValueException e) {
-            Assert.assertTrue(e.getMessage().contains("Invalid value for end date. End date") &&
-                    e.getMessage().contains("can't be before current time"));
-        }
-    }
-}
diff --git a/server/src/test/java/org/apache/cloudstack/vm/schedule/VMSchedulerImplTest.java b/server/src/test/java/org/apache/cloudstack/vm/schedule/VMSchedulerImplTest.java
deleted file mode 100644
index 3f9ffc714a1..00000000000
--- a/server/src/test/java/org/apache/cloudstack/vm/schedule/VMSchedulerImplTest.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.vm.schedule;
-
-import com.cloud.event.ActionEventUtils;
-import com.cloud.user.User;
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.component.ComponentContext;
-import com.cloud.vm.UserVmManager;
-import com.cloud.vm.VirtualMachine;
-import org.apache.cloudstack.api.ApiCommandResourceType;
-import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
-import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
-import org.apache.cloudstack.api.command.user.vm.StopVMCmd;
-import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher;
-import org.apache.cloudstack.framework.jobs.AsyncJobManager;
-import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
-import org.apache.cloudstack.vm.schedule.dao.VMScheduleDao;
-import org.apache.cloudstack.vm.schedule.dao.VMScheduledJobDao;
-import org.apache.commons.lang.time.DateUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import javax.persistence.EntityExistsException;
-import java.time.ZonedDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimeZone;
-
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class VMSchedulerImplTest {
-    @Spy
-    @InjectMocks
-    private VMSchedulerImpl vmScheduler = new VMSchedulerImpl();
-
-    @Mock
-    private UserVmManager userVmManager;
-
-    @Mock
-    private VMScheduleDao vmScheduleDao;
-
-    @Mock
-    private VMScheduledJobDao vmScheduledJobDao;
-
-    @Mock
-    private EnumMap<VMSchedule.Action, String> actionEventMap;
-
-    @Mock
-    private AsyncJobManager asyncJobManager;
-
-    @Mock
-    private AsyncJobDispatcher asyncJobDispatcher;
-
-    private AutoCloseable closeable;
-
-    private MockedStatic<ActionEventUtils> actionEventUtilsMocked;
-
-    @Before
-    public void setUp() throws Exception {
-        closeable = MockitoAnnotations.openMocks(this);
-        actionEventUtilsMocked = Mockito.mockStatic(ActionEventUtils.class);
-        Mockito.when(ActionEventUtils.onScheduledActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(),
-                       Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyBoolean(),
-                       Mockito.anyLong()))
-               .thenReturn(1L);
-        Mockito.when(ActionEventUtils.onCompletedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.any(),
-                Mockito.anyString(), Mockito.anyBoolean(),
-                Mockito.anyString(),
-                Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong())).thenReturn(1L);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        actionEventUtilsMocked.close();
-        closeable.close();
-    }
-
-    @Test
-    public void testProcessJobRunning() {
-        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMSchedule.Action.STOP);
-        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMSchedule.Action.FORCE_STOP);
-        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMSchedule.Action.REBOOT);
-        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Running, VMSchedule.Action.FORCE_REBOOT);
-        executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State.Stopped, VMSchedule.Action.START);
-    }
-
-    private void executeProcessJobWithVMStateAndActionNonSkipped(VirtualMachine.State state, VMSchedule.Action action) {
-        VMScheduledJob vmScheduledJob = Mockito.mock(VMScheduledJob.class);
-        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
-
-        Long expectedValue = 1L;
-
-        prepareMocksForProcessJob(vm, vmScheduledJob, state, action, expectedValue);
-
-        Long jobId = vmScheduler.processJob(vmScheduledJob, vm);
-
-        actionEventUtilsMocked.verify(() -> ActionEventUtils.onCompletedActionEvent(User.UID_SYSTEM, vm.getAccountId(), null,
-                actionEventMap.get(action), true,
-                String.format("Executing action (%s) for VM: %s", vmScheduledJob.getAction(), vm),
-                vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), 0));
-        Assert.assertEquals(expectedValue, jobId);
-    }
-
-    private void prepareMocksForProcessJob(VirtualMachine vm, VMScheduledJob vmScheduledJob,
-                                           VirtualMachine.State vmState, VMSchedule.Action action,
-                                           Long executeJobReturnValue) {
-        Mockito.when(vm.getState()).thenReturn(vmState);
-        Mockito.when(vmScheduledJob.getAction()).thenReturn(action);
-
-        if (executeJobReturnValue != null) {
-            Mockito.doReturn(executeJobReturnValue).when(vmScheduler).executeStartVMJob(
-                    Mockito.any(VirtualMachine.class), Mockito.anyLong());
-            Mockito.doReturn(executeJobReturnValue).when(vmScheduler).executeStopVMJob(
-                    Mockito.any(VirtualMachine.class), Mockito.anyBoolean(), Mockito.anyLong());
-            Mockito.doReturn(executeJobReturnValue).when(vmScheduler).executeRebootVMJob(
-                    Mockito.any(VirtualMachine.class), Mockito.anyBoolean(), Mockito.anyLong());
-        }
-    }
-
-    @Test
-    public void testProcessJobInvalidAction() {
-        VMScheduledJob vmScheduledJob = Mockito.mock(VMScheduledJob.class);
-        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
-
-        prepareMocksForProcessJob(vm, vmScheduledJob, VirtualMachine.State.Running, VMSchedule.Action.START, null);
-
-        Long jobId = vmScheduler.processJob(vmScheduledJob, vm);
-
-        Assert.assertNull(jobId);
-    }
-
-    @Test
-    public void testProcessJobVMInInvalidState() {
-        VMScheduledJob vmScheduledJob = Mockito.mock(VMScheduledJob.class);
-        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
-
-        prepareMocksForProcessJob(vm, vmScheduledJob, VirtualMachine.State.Unknown, VMSchedule.Action.START, null);
-
-        Long jobId = vmScheduler.processJob(vmScheduledJob, vm);
-
-        Assert.assertNull(jobId);
-    }
-
-    @Test
-    public void testScheduleNextJobScheduleScheduleExists() {
-        Date now = DateUtils.setSeconds(new Date(), 0);
-        Date startDate = DateUtils.addDays(now, 1);
-        Date expectedScheduledTime = DateUtils.round(DateUtils.addMinutes(startDate, 1), Calendar.MINUTE);
-        UserVm vm = Mockito.mock(UserVm.class);
-
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        Mockito.when(vmSchedule.getEnabled()).thenReturn(true);
-        Mockito.when(vmSchedule.getSchedule()).thenReturn("* * * * *");
-        Mockito.when(vmSchedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
-        Mockito.when(vmSchedule.getStartDate()).thenReturn(startDate);
-        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
-        Mockito.when(vmScheduledJobDao.persist(Mockito.any())).thenThrow(EntityExistsException.class);
-        Date actualScheduledTime = vmScheduler.scheduleNextJob(vmSchedule, new Date());
-
-        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
-    }
-
-    @Test
-    public void testScheduleNextJobScheduleFutureSchedule() {
-        Date now = DateUtils.setSeconds(new Date(), 0);
-        Date startDate = DateUtils.addDays(now, 1);
-        Date expectedScheduledTime = DateUtils.round(DateUtils.addMinutes(startDate, 1), Calendar.MINUTE);
-        UserVm vm = Mockito.mock(UserVm.class);
-
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        Mockito.when(vmSchedule.getEnabled()).thenReturn(true);
-        Mockito.when(vmSchedule.getSchedule()).thenReturn("* * * * *");
-        Mockito.when(vmSchedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
-        Mockito.when(vmSchedule.getStartDate()).thenReturn(startDate);
-        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
-        Date actualScheduledTime = vmScheduler.scheduleNextJob(vmSchedule, new Date());
-
-        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
-    }
-
-    @Test
-    public void testScheduleNextJobScheduleFutureScheduleWithTimeZoneChecks() throws Exception {
-        // Ensure that Date vmSchedulerImpl.scheduleNextJob(VMScheduleVO vmSchedule) generates
-        // the correct scheduled time on basis of schedule(cron), start date
-        // and the timezone of the user. The system running the test can have any timezone.
-        String cron = "30 5 * * *";
-
-        Date now = DateUtils.setSeconds(new Date(), 0);
-        Date startDate = DateUtils.addDays(now, 1);
-
-        UserVm vm = Mockito.mock(UserVm.class);
-
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        Mockito.when(vmSchedule.getEnabled()).thenReturn(true);
-        Mockito.when(vmSchedule.getSchedule()).thenReturn(cron);
-        Mockito.when(vmSchedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("EST").toZoneId());
-        Mockito.when(vmSchedule.getStartDate()).thenReturn(startDate);
-        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
-
-        // The timezone of the user is EST. The cron expression is 30 5 * * *.
-        // The start date is 1 day from now. The expected scheduled time is 5:30 AM EST.
-        // The actual scheduled time is 10:30 AM UTC.
-        // The actual scheduled time is 5:30 AM EST.
-        ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(startDate.toInstant(), vmSchedule.getTimeZoneId());
-        zonedDateTime = zonedDateTime.withHour(5).withMinute(30).withSecond(0).withNano(0);
-        Date expectedScheduledTime = Date.from(zonedDateTime.toInstant());
-
-        if (expectedScheduledTime.before(startDate)) {
-            expectedScheduledTime = Date.from(zonedDateTime.plusDays(1).toInstant());
-        }
-
-        Date actualScheduledTime = vmScheduler.scheduleNextJob(vmSchedule, new Date());
-        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
-    }
-
-    @Test
-    public void testScheduleNextJobScheduleCurrentSchedule() {
-        Date now = DateUtils.setSeconds(new Date(), 0);
-        Date expectedScheduledTime = DateUtils.round(DateUtils.addMinutes(now, 1), Calendar.MINUTE);
-        UserVm vm = Mockito.mock(UserVm.class);
-
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        Mockito.when(vmSchedule.getEnabled()).thenReturn(true);
-        Mockito.when(vmSchedule.getSchedule()).thenReturn("* * * * *");
-        Mockito.when(vmSchedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("UTC").toZoneId());
-        Mockito.when(vmSchedule.getStartDate()).thenReturn(DateUtils.addDays(now, -1));
-        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
-        Date actualScheduledTime = vmScheduler.scheduleNextJob(vmSchedule, new Date());
-
-        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
-    }
-
-    @Test
-    public void testScheduleNextJobScheduleCurrentScheduleWithTimeZoneChecks() throws Exception {
-        // Ensure that Date vmSchedulerImpl.scheduleNextJob(VMScheduleVO vmSchedule) generates
-        // the correct scheduled time on basis of schedule(cron), start date
-        // and the timezone of the user. The system running the test can have any timezone.
-        String cron = "30 5 * * *";
-
-        Date now = DateUtils.setSeconds(new Date(), 0);
-
-        UserVm vm = Mockito.mock(UserVm.class);
-
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        Mockito.when(vmSchedule.getEnabled()).thenReturn(true);
-        Mockito.when(vmSchedule.getSchedule()).thenReturn(cron);
-        Mockito.when(vmSchedule.getTimeZoneId()).thenReturn(TimeZone.getTimeZone("EST").toZoneId());
-        Mockito.when(vmSchedule.getStartDate()).thenReturn(DateUtils.addDays(now, -1));
-        Mockito.when(userVmManager.getUserVm(Mockito.anyLong())).thenReturn(vm);
-
-        // The timezone of the user is EST. The cron expression is 30 5 * * *.
-        // The start date is 1 day ago. The expected scheduled time is 5:30 AM EST.
-        // The actual scheduled time is 10:30 AM UTC.
-        // The actual scheduled time is 5:30 AM EST.
-        ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(now.toInstant(), vmSchedule.getTimeZoneId());
-        zonedDateTime = zonedDateTime.withHour(5).withMinute(30).withSecond(0).withNano(0);
-        Date expectedScheduledTime = Date.from(zonedDateTime.toInstant());
-
-        if (expectedScheduledTime.before(now)) {
-            expectedScheduledTime = DateUtils.addDays(expectedScheduledTime, 1);
-        }
-
-        Date actualScheduledTime = vmScheduler.scheduleNextJob(vmSchedule, new Date());
-        Assert.assertEquals(expectedScheduledTime, actualScheduledTime);
-    }
-
-    @Test
-    public void testScheduleNextJobScheduleExpired() {
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        Mockito.when(vmSchedule.getEndDate()).thenReturn(DateUtils.addMinutes(new Date(), -5));
-        Mockito.when(vmSchedule.getEnabled()).thenReturn(true);
-        Date actualDate = vmScheduler.scheduleNextJob(vmSchedule, new Date());
-        Assert.assertNull(actualDate);
-    }
-
-    @Test
-    public void testScheduleNextJobScheduleDisabled() {
-        VMScheduleVO vmSchedule = Mockito.mock(VMScheduleVO.class);
-        Mockito.when(vmSchedule.getEnabled()).thenReturn(false);
-        Date actualDate = vmScheduler.scheduleNextJob(vmSchedule, new Date());
-        Assert.assertNull(actualDate);
-    }
-
-
-    @Test
-    public void testExecuteJobs() {
-        /*
-         Test VMSchedulerImpl.executeJobs() method with a map of VMScheduledJob objects
-         covering all the possible scenarios
-         1. When the job is executed successfully
-         2. When the job is skipped (processJob returns null)
-        */
-
-        VMScheduledJobVO job1 = Mockito.mock(VMScheduledJobVO.class);
-        VMScheduledJobVO job2 = Mockito.mock(VMScheduledJobVO.class);
-
-        UserVm vm1 = Mockito.mock(UserVm.class);
-        UserVm vm2 = Mockito.mock(UserVm.class);
-
-        Mockito.when(job2.getVmId()).thenReturn(2L);
-
-        Mockito.when(userVmManager.getUserVm(2L)).thenReturn(vm2);
-
-        Mockito.doReturn(null).when(vmScheduler).processJob(job2, vm2);
-
-        Mockito.when(vmScheduledJobDao.acquireInLockTable(job1.getId())).thenReturn(job1);
-        Mockito.when(vmScheduledJobDao.acquireInLockTable(job2.getId())).thenReturn(job2);
-
-        Map<Long, VMScheduledJob> jobs = new HashMap<>();
-        jobs.put(1L, job1);
-        jobs.put(2L, job2);
-
-        ReflectionTestUtils.setField(vmScheduler, "currentTimestamp", new Date());
-
-        vmScheduler.executeJobs(jobs);
-
-        Mockito.verify(vmScheduler, Mockito.times(2)).processJob(Mockito.any(), Mockito.any());
-        Mockito.verify(vmScheduledJobDao, Mockito.times(2)).acquireInLockTable(Mockito.anyLong());
-    }
-
-    @Test
-    public void testExecuteStopVMJob() {
-        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
-        Mockito.when(asyncJobManager.submitAsyncJob(Mockito.any(AsyncJobVO.class))).thenReturn(1L);
-        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
-            when(ComponentContext.inject(StopVMCmd.class)).thenReturn(Mockito.mock(StopVMCmd.class));
-            long jobId = vmScheduler.executeStopVMJob(vm, false, 1L);
-
-            Assert.assertEquals(1L, jobId);
-        }
-    }
-
-    @Test
-    public void testExecuteRebootVMJob() {
-        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
-        Mockito.when(asyncJobManager.submitAsyncJob(Mockito.any(AsyncJobVO.class))).thenReturn(1L);
-        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
-            when(ComponentContext.inject(RebootVMCmd.class)).thenReturn(Mockito.mock(RebootVMCmd.class));
-            long jobId = vmScheduler.executeRebootVMJob(vm, false, 1L);
-
-            Assert.assertEquals(1L, jobId);
-        }
-    }
-
-    @Test
-    public void testExecuteStartVMJob() {
-        VirtualMachine vm = Mockito.mock(VirtualMachine.class);
-        Mockito.when(asyncJobManager.submitAsyncJob(Mockito.any(AsyncJobVO.class))).thenReturn(1L);
-        try (MockedStatic<ComponentContext> ignored = Mockito.mockStatic(ComponentContext.class)) {
-            when(ComponentContext.inject(StartVMCmd.class)).thenReturn(Mockito.mock(StartVMCmd.class));
-            long jobId = vmScheduler.executeStartVMJob(vm, 1L);
-
-            Assert.assertEquals(1L, jobId);
-        }
-    }
-}
diff --git a/test/integration/smoke/test_vm_autoscaling.py b/test/integration/smoke/test_vm_autoscaling.py
index 782d2bce3ad..dd507ece039 100644
--- a/test/integration/smoke/test_vm_autoscaling.py
+++ b/test/integration/smoke/test_vm_autoscaling.py
@@ -38,6 +38,7 @@ from marvin.lib.base import (Account,
                              DiskOffering,
                              Domain,
                              Project,
+                             ResourceSchedule,
                              ServiceOffering,
                              Template,
                              VirtualMachine,
@@ -65,6 +66,7 @@ DEFAULT_DURATION = 120
 DEFAULT_INTERVAL = 30
 DEFAULT_QUIETTIME = 60
 NAME_PREFIX = "AS-VmGroup-"
+SCHEDULED_RESOURCE_TYPE_ASG = "AutoScaleVmGroup"
 
 CONFIG_NAME_DISK_CONTROLLER = "vmware.root.disk.controller"
 OS_DEFAULT = "osdefault"
@@ -860,13 +862,81 @@ class TestVmAutoScaling(cloudstackTestCase):
 
         VirtualMachine.delete(vm, self.apiclient, expunge=True)
 
-    @attr(tags=["advanced"], required_hardware="false")
-    def test_05_remove_vmgroup(self):
-        """ Verify removal of AutoScaling VM Group"""
-        self.message("Running test_05_remove_vmgroup")
+    @attr(tags=["advanced", "vj", "smoke"], required_hardware="false")
+    def test_05_autoscaling_vmgroup_schedule_update(self):
+        """Verify resource scheduling updates AutoScale VM Group min/max members"""
+        self.message("Running test_05_autoscaling_vmgroup_schedule_update")
 
-        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=False, expected=False)
-        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=True, expected=True)
+        vmgroups = AutoScaleVmGroup.list(
+            self.regular_user_apiclient,
+            id=self.autoscaling_vmgroup.id
+        )
+        self.assertEqual(
+            isinstance(vmgroups, list),
+            True,
+            "List autoscale vm groups should return a valid list"
+        )
+        self.assertEqual(
+            len(vmgroups) > 0,
+            True,
+            "Expected autoscale vm group to exist"
+        )
+        vmgroup = vmgroups[0]
+
+        current_min_members = int(vmgroup.minmembers)
+        current_max_members = int(vmgroup.maxmembers)
+        new_min_members = current_min_members + 1
+        new_max_members = current_max_members + 1
+
+        schedule = ResourceSchedule.create(
+            self.regular_user_apiclient,
+            SCHEDULED_RESOURCE_TYPE_ASG,
+            self.autoscaling_vmgroup.id,
+            "update",
+            "* * * * *",
+            datetime.datetime.now().astimezone().tzinfo,
+            (datetime.datetime.now() + datetime.timedelta(seconds=5)).strftime(
+                "%Y-%m-%d %H:%M:%S"
+            ),
+            enabled=True,
+            details=[{
+                "minmembers": str(new_min_members)},
+                {
+                "maxmembers": str(new_max_members)
+            }]
+        )
+        self.cleanup.append(schedule)
+        self.message("Created AutoScale VM Group schedule with ID: %s" % schedule.id)
+
+        schedules = ResourceSchedule.list(
+            self.regular_user_apiclient,
+            SCHEDULED_RESOURCE_TYPE_ASG,
+            self.autoscaling_vmgroup.id,
+            id=schedule.id
+        )
+        self.assertEqual(
+            isinstance(schedules, list),
+            True,
+            "Check list response returns a valid list for ASG schedules",
+        )
+        self.assertNotEqual(len(schedules), 0, "Check ASG schedule list")
+
+        # Poll for up to 4 minutes to allow the scheduler worker to run and apply update
+        schedule_worked = False
+        for _ in range(0, 24):
+            time.sleep(10)
+            updated_group = AutoScaleVmGroup.list(
+                self.regular_user_apiclient,
+                id=self.autoscaling_vmgroup.id
+            )[0]
+            if int(updated_group.minmembers) == new_min_members and int(updated_group.maxmembers) == new_max_members:
+                schedule_worked = True
+                break
+
+        self.assertTrue(
+            schedule_worked,
+            "Expected scheduled action to update AutoScale VM Group min/max members"
+        )
 
     @attr(tags=["advanced"], required_hardware="false")
     def test_06_autoscaling_vmgroup_on_project_network(self):
@@ -1211,3 +1281,11 @@ class TestVmAutoScaling(cloudstackTestCase):
 
         self.delete_vmgroup(autoscaling_vmgroup_vpc, self.regular_user_apiclient, cleanup=False, expected=False)
         self.delete_vmgroup(autoscaling_vmgroup_vpc, self.regular_user_apiclient, cleanup=True, expected=True)
+
+    @attr(tags=["advanced", "vj"], required_hardware="false")
+    def test_05_remove_vmgroup(self):
+        """ Verify removal of AutoScaling VM Group"""
+        self.message("Running test_05_remove_vmgroup")
+
+        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=False, expected=False)
+        self.delete_vmgroup(self.autoscaling_vmgroup, self.regular_user_apiclient, cleanup=True, expected=True)
diff --git a/test/integration/smoke/test_vm_schedule.py b/test/integration/smoke/test_vm_schedule.py
index ee1354ff80e..1e476c55fc8 100644
--- a/test/integration/smoke/test_vm_schedule.py
+++ b/test/integration/smoke/test_vm_schedule.py
@@ -17,7 +17,7 @@
 """ P1 tests for VM Schedule
 """
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.lib.base import Account, ServiceOffering, VirtualMachine, VMSchedule
+from marvin.lib.base import Account, ServiceOffering, VirtualMachine, ResourceSchedule
 from marvin.lib.common import get_domain, get_zone, get_template
 from marvin.lib.utils import cleanup_resources
 
@@ -28,6 +28,8 @@ import datetime
 import time
 
 
+RESOURCE_TYPE = "VirtualMachine"
+
 class Services:
     """Test Snapshots Services"""
 
@@ -148,8 +150,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule
         schedule = "0 0 1 * *"
-        vmschedule = VMSchedule.create(
+        vmschedule = ResourceSchedule.create(
             self.apiclient,
+            RESOURCE_TYPE,
             self.virtual_machine.id,
             "start",
             schedule,
@@ -166,8 +169,8 @@ class TestVMSchedule(cloudstackTestCase):
         self.debug("Created VM Schedule with ID: %s" % vmschedule.id)
 
         # List VM Schedule
-        vmschedules = VMSchedule.list(
-            self.apiclient, self.virtual_machine.id, id=vmschedule.id
+        vmschedules = ResourceSchedule.list(
+            self.apiclient, RESOURCE_TYPE, self.virtual_machine.id, id=vmschedule.id
         )
 
         self.assertEqual(
@@ -187,9 +190,15 @@ class TestVMSchedule(cloudstackTestCase):
         )
 
         self.assertEqual(
-            vmschedules[0].virtualmachineid,
+            vmschedules[0].resourceid,
             self.virtual_machine.id,
-            "Check VM ID in list resources call",
+            "Check resource ID in list resources call",
+        )
+
+        self.assertEqual(
+            vmschedules[0].resourcetype,
+            RESOURCE_TYPE,
+            "Check resource type in list resources call",
         )
 
         self.assertEqual(
@@ -204,9 +213,9 @@ class TestVMSchedule(cloudstackTestCase):
             "Check VM Schedule timezone in list resources call",
         )
 
-        # Check for entry in vm_scheduled_job in db
+        # Check for entry in resource_scheduled_job in db
         vmscheduled_job = self.dbclient.execute(
-            "select * from vm_scheduled_job where vm_schedule_id IN (SELECT id FROM vm_schedule WHERE uuid = '%s')"
+            "select * from resource_scheduled_job where schedule_id IN (SELECT id FROM resource_schedule WHERE uuid = '%s')"
             % vmschedule.id,
             db="cloud",
         )
@@ -214,13 +223,13 @@ class TestVMSchedule(cloudstackTestCase):
         self.assertIsInstance(
             vmscheduled_job,
             list,
-            "Check if VM Schedule exists in vm_scheduled_job table",
+            "Check if VM Schedule exists in resource_scheduled_job table",
         )
 
         self.assertGreater(
             len(vmscheduled_job),
             0,
-            "Check if VM Schedule exists in vm_scheduled_job table",
+            "Check if VM Schedule exists in resource_scheduled_job table",
         )
         return
 
@@ -237,8 +246,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule with invalid virtual machine ID
         with self.assertRaises(Exception):
-            VMSchedule.create(
+            ResourceSchedule.create(
                 self.apiclient,
+                RESOURCE_TYPE,
                 "invalid",
                 "start",
                 "0 0 1 * *",
@@ -251,8 +261,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule with invalid schedule
         with self.assertRaises(Exception):
-            VMSchedule.create(
+            ResourceSchedule.create(
                 self.apiclient,
+                RESOURCE_TYPE,
                 self.virtual_machine.id,
                 "start",
                 "invalid",
@@ -265,8 +276,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule with invalid start date
         with self.assertRaises(Exception):
-            VMSchedule.create(
+            ResourceSchedule.create(
                 self.apiclient,
+                RESOURCE_TYPE,
                 self.virtual_machine.id,
                 "start",
                 "0 0 1 * *",
@@ -277,8 +289,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule with invalid action
         with self.assertRaises(Exception):
-            VMSchedule.create(
+            ResourceSchedule.create(
                 self.apiclient,
+                RESOURCE_TYPE,
                 self.virtual_machine.id,
                 "invalid",
                 "0 0 1 * *",
@@ -291,8 +304,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # test invalid end date
         with self.assertRaises(Exception):
-            VMSchedule.create(
+            ResourceSchedule.create(
                 self.apiclient,
+                RESOURCE_TYPE,
                 self.virtual_machine.id,
                 "start",
                 "0 0 1 * *",
@@ -315,8 +329,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule
         schedule = "0 0 1 * *"
-        vmschedule = VMSchedule.create(
+        vmschedule = ResourceSchedule.create(
             self.apiclient,
+            RESOURCE_TYPE,
             self.virtual_machine.id,
             "start",
             schedule,
@@ -351,8 +366,8 @@ class TestVMSchedule(cloudstackTestCase):
         self.debug("Updated VM Schedule with ID: %s" % vmschedule.id)
 
         # List VM Schedule
-        vmschedules = VMSchedule.list(
-            self.apiclient, self.virtual_machine.id, id=vmschedule.id
+        vmschedules = ResourceSchedule.list(
+            self.apiclient, RESOURCE_TYPE, self.virtual_machine.id, id=vmschedule.id
         )
         self.assertEqual(
             isinstance(vmschedules, list),
@@ -371,11 +386,17 @@ class TestVMSchedule(cloudstackTestCase):
         )
 
         self.assertEqual(
-            vmschedules[0].virtualmachineid,
+            vmschedules[0].resourceid,
             self.virtual_machine.id,
             "Check VM ID in list resources call",
         )
 
+        self.assertEqual(
+            vmschedules[0].resourcetype,
+            RESOURCE_TYPE,
+            "Check VM ID in list resources call",
+        )
+
         self.assertEqual(
             vmschedules[0].schedule,
             new_schedule,
@@ -395,8 +416,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule
         schedule = "0 0 1 * *"
-        vmschedule = VMSchedule.create(
+        vmschedule = ResourceSchedule.create(
             self.apiclient,
+            RESOURCE_TYPE,
             self.virtual_machine.id,
             "start",
             schedule,
@@ -486,8 +508,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule - start
         start_schedule = "*/2 * * * *"
-        start_vmschedule = VMSchedule.create(
+        start_vmschedule = ResourceSchedule.create(
             self.apiclient,
+            RESOURCE_TYPE,
             self.virtual_machine.id,
             "start",
             start_schedule,
@@ -503,8 +526,9 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Create VM Schedule - stop
         stop_schedule = "*/1 * * * *"
-        stop_vmschedule = VMSchedule.create(
+        stop_vmschedule = ResourceSchedule.create(
             self.apiclient,
+            RESOURCE_TYPE,
             self.virtual_machine.id,
             "stop",
             stop_schedule,
@@ -519,8 +543,8 @@ class TestVMSchedule(cloudstackTestCase):
         self.debug("Created VM Schedule with ID: %s" % stop_vmschedule.id)
 
         # Verify VM Schedule is created
-        vmschedules = VMSchedule.list(
-            self.apiclient, self.virtual_machine.id, id=start_vmschedule.id
+        vmschedules = ResourceSchedule.list(
+            self.apiclient, RESOURCE_TYPE, self.virtual_machine.id, id=start_vmschedule.id
         )
 
         self.assertEqual(
@@ -575,15 +599,15 @@ class TestVMSchedule(cloudstackTestCase):
 
         # Verify VM Schedule is deleted
         self.assertEqual(
-            VMSchedule.list(
-                self.apiclient, self.virtual_machine.id, id=start_vmschedule.id
+            ResourceSchedule.list(
+                self.apiclient, RESOURCE_TYPE, self.virtual_machine.id, id=start_vmschedule.id
             ),
             None,
             "Check VM Schedule is deleted",
         )
         self.assertEqual(
-            VMSchedule.list(
-                self.apiclient, self.virtual_machine.id, id=stop_vmschedule.id
+            ResourceSchedule.list(
+                self.apiclient, RESOURCE_TYPE, self.virtual_machine.id, id=stop_vmschedule.id
             ),
             None,
             "Check VM Schedule is deleted",
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index ead8f0620ba..67e55247817 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -242,6 +242,7 @@ known_categories = {
     'removeQuarantinedIp': 'IP Quarantine',
     'Shutdown': 'Maintenance',
     'Maintenance': 'Maintenance',
+    'ResourceSchedule': 'Resource Schedule',
     'addObjectStoragePool': 'Object Store',
     'listObjectStoragePools': 'Object Store',
     'deleteObjectStoragePool': 'Object Store',
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 636c73209a3..a78fe4eab4a 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -7052,6 +7052,51 @@ class VMSchedule:
         cmd.virtualmachineid = self.virtualmachineid
         return (apiclient.deleteVMSchedule(cmd))
 
+
+class ResourceSchedule:
+
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+    @classmethod
+    def create(cls, apiclient, resourcetype, resourceid, action, schedule, timezone, startdate, enddate=None, enabled=False, description=None, details=None):
+        cmd = createResourceSchedule.createResourceScheduleCmd()
+        cmd.resourcetype = resourcetype
+        cmd.resourceid = resourceid
+        cmd.description = description
+        cmd.action = action
+        cmd.schedule = schedule
+        cmd.timezone = timezone
+        cmd.startdate = startdate
+        cmd.enddate = enddate
+        cmd.enabled = enabled
+        cmd.details = details
+        return ResourceSchedule(apiclient.createResourceSchedule(cmd).__dict__)
+
+    @classmethod
+    def list(cls, apiclient, resourcetype, resourceid, id=None, enabled=None, action=None):
+        cmd = listResourceSchedule.listResourceScheduleCmd()
+        cmd.resourcetype = resourcetype
+        cmd.resourceid = resourceid
+        cmd.id = id
+        cmd.enabled = enabled
+        cmd.action = action
+        return apiclient.listResourceSchedule(cmd)
+
+    def update(self, apiclient, **kwargs):
+        cmd = updateResourceSchedule.updateResourceScheduleCmd()
+        cmd.id = self.id
+        [setattr(cmd, k, v) for k, v in list(kwargs.items())]
+        return apiclient.updateResourceSchedule(cmd)
+
+    def delete(self, apiclient):
+        cmd = deleteResourceSchedule.deleteResourceScheduleCmd()
+        cmd.id = self.id
+        cmd.resourcetype = self.resourcetype
+        cmd.resourceid = self.resourceid
+        return apiclient.deleteResourceSchedule(cmd)
+
+
 class VnfTemplate:
     """Manage VNF template life cycle"""
 
diff --git a/ui/public/assets/keycloak.svg b/ui/public/assets/keycloak.svg
new file mode 100644
index 00000000000..3e8115efc16
--- /dev/null
+++ b/ui/public/assets/keycloak.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 512 512"><style>.st9{fill:#d0d0d0}.st11{fill:#d9d9d9}.st13{fill:#d8d8d8}.st14{fill:#e2e2e2}.st16{fill:#dedede}.st21{fill:#00b8e3}.st22{fill:#33c6e9}.st23{fill:#008aaa}</style><g id="g2460" transform="translate(.714 .07)"><path id="path1588" d="M432.9 149.2c-1.4 0-2.7-.7-3.4-2L370.1 44.1c-.7-1.2-2-2-3.5-2H124.2c-1.4 0-2.7.7-3.4 2L58.9 150.9l23.9 34.9c-.7 1.2-6.2 24-5.5 25.2L58.9 360.9l61.9 106.9c.7 1.2 2 2 3.4 2h242.4c1.4 0 2.7-.7 3.5-2l59.4-103.2c.7-1.2 2-2 3.4-2h73.8c2.4 0 4.4-2 4.4-4.4V153.6c0-2.4-2-4.4-4.4-4.4z" style="fill:#4d4d4d"/><path id="path1594" d="M72.7 245.3 6.4 269.4l-6.6-11.3c-.7-1.2-.7-2.7 0-3.9l30-52z" style="fill:#e1e1e1"/><path id="polygon1794" d="M511.3 258.3V309l-43.7-44.5z" style="fill:#c8c8c8"/><path id="path1798" d="m467.5 264.5 43.7 44.5v49.6c0 2.4-2 4.4-4.4 4.4H456z" style="fill:#c2c2c2"/><path id="polygon1802" d="M467.5 264.5 456 362.9h-61.2l-18.5-44.7z" style="fill:#c7c7c7"/><path id="polygon1804" d="M511.3 211.2v47l-43.7 6.2z" style="fill:#cecece"/><path id="path1808" d="M511.3 153.6v57.6l-43.7 53.2-33.1-115.3h72.2c2.4-.1 4.5 1.8 4.6 4.3z" style="fill:#d3d3d3"/><path id="polygon1812" d="M394.8 362.9h-32.3l-8.4-12 22.1-32.7z" style="fill:#c6c6c6"/><path id="polygon1814" d="m467.5 264.5-121.1-51.2 63.7-64.1h24.4z" style="fill:#d5d5d5"/><path id="path1816" d="m346.5 213.3 29.8 105 91.2-53.8z" class="st9"/><path id="polygon1818" d="m353.8 362.9.4-12 8.4 12z" style="fill:#bfbfbf"/><path id="polygon1820" d="m410.1 149.2-63.7 64.1-11.4-57.4 24.6-6.8h50.5z" class="st11"/><path id="path1822" d="m346.5 213.3-147 33.9 154.7 103.7z" style="fill:#d4d4d4"/><path id="path1824" d="m346.5 213.3 7.7 137.6 22.1-32.7z" class="st9"/><path id="path1826" d="m335 155.9-135.5 91.2 147-33.9z" class="st11"/><path id="polygon1828" d="m199.5 247.2-63.7 115.7H99.6L72.7 245.3z" class="st13"/><path id="path1830" d="m134.3 149.2-61.5 96.1L57.3 155l2.2-3.8c.7-1.2 2-1.9 3.4-1.9z" class="st14"/><path id="path1832" d="M99.6 362.9H62.7c-1.4 0-2.8-.8-3.5-2L6.4 269.4l66.4-24.1z" class="st13"/><path id="polygon1834" d="M29.9 202.1 57.1 155l15.7 90.3z" style="fill:#e4e4e4"/><path id="polygon1836" d="m335 155.9-40.8-6.8H159.4l40.1 98z" class="st16"/><path id="polygon1838" d="m199.5 247.2-40.1-98h-25.1l-61.5 96.1z" class="st16"/><path id="polygon1840" d="M324.7 362.9h29.1l.4-12z" style="fill:#c5c5c5"/><path id="polygon1842" d="M266.7 362.9h58l29.5-12-154.7-103.7 27.9 115.7z" class="st9"/><path id="polygon1844" d="m227.4 362.9-27.9-115.7-63.7 115.7z" style="fill:#d1d1d1"/><path id="polygon1856" d="m335.4 149.2-.4 6.8 24.6-6.8z" style="fill:#ddd"/><path id="polygon1858" d="m335 155.9-3.8-6.8h-37z" style="fill:#e3e3e3"/><path id="polygon1860" d="m335 155.9.4-6.8h-4.2z" class="st14"/><path id="path1862" d="m223.9 151-59.7 103.4c-.3.5-.4 1.1-.4 1.7h-41.7l82-142q.75.45 1.2 1.2l18.6 32.3c.5 1.1.5 2.4 0 3.4" class="st21"/><path id="path1864" d="M223.8 364.9 205.3 397q-.45.75-1.2 1.2l-82-142.2h41.7c0 .6.1 1.1.4 1.6l59.6 103.2c.8 1.2.9 2.9 0 4.1" class="st22"/><path id="path1866" d="m204 114.2-82 141.9-20.6 35.6-19.6-34c-.3-.5-.4-1-.4-1.6s.1-1.2.4-1.7l19.9-34.4 60.4-104.5c.6-1.1 1.8-1.8 3-1.8h37.2c.6 0 1.2.2 1.7.5" class="st23"/><path id="path1868" d="M204 398.2c-.5.3-1.1.5-1.8.5h-37.1c-1.3 0-2.4-.7-3-1.8l-55.2-95.6-5.5-9.5 20.6-35.6z" class="st21"/><path id="path1870" d="m368.9 256.1-82 142q-.75-.45-1.2-1.2L267 364.7c-.5-1-.5-2.3 0-3.3L326.7 258c.3-.5.5-1.2.5-1.8z" class="st23"/><path id="path1872" d="M409.4 256.1c0 .6-.2 1.3-.5 1.8l-80.3 139.3c-.6 1-1.8 1.7-3 1.6h-37c-.6 0-1.2-.2-1.8-.5L368.9 256l20.6-35.6 19.5 33.8c.3.7.4 1.3.4 1.9" class="st21"/><path id="path1874" d="M368.9 256.1h-41.7c0-.6-.2-1.2-.5-1.8L267 151.2c-.6-1.1-.6-2.5 0-3.6l18.6-32.2q.45-.75 1.2-1.2z" class="st21"/><path id="path1876" d="m389.4 220.5-20.6 35.6-82-142c.6-.3 1.2-.5 1.8-.5h37.1c1.2 0 2.3.6 3 1.6z" class="st22"/></g></svg>
\ No newline at end of file
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 95356389d0e..4215bf5b1c0 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -62,6 +62,7 @@
 "label.action.attach.disk": "Attach Disk",
 "label.action.attach.iso": "Attach ISO",
 "label.action.attach.to.instance": "Attach to Instance",
+"label.action.bulk.delete.api.keys": "Bulk delete API key pairs",
 "label.action.bulk.delete.egress.firewall.rules": "Bulk delete egress firewall rules",
 "label.action.bulk.delete.firewall.rules": "Bulk delete firewall rules",
 "label.action.bulk.delete.ip.v6.firewall.rules": "Bulk remove IPv6 firewall rules",
@@ -82,6 +83,7 @@
 "label.action.copy.iso": "Copy ISO",
 "label.action.copy.snapshot": "Copy Snapshot",
 "label.action.copy.template": "Copy Template",
+"label.action.create.api.key": "Create API key pair for user",
 "label.action.create.backup.schedule": "Create Backup Schedule",
 "label.action.create.recurring.snapshot": "Create Recurring Snapshot",
 "label.action.create.snapshot.from.vmsnapshot": "Create Snapshot from Instance Snapshot",
@@ -116,6 +118,7 @@
 "label.action.delete.snapshot": "Delete Snapshot",
 "label.action.delete.template": "Delete Template",
 "label.action.delete.tungsten.router.table": "Remove Tungsten Fabric route table from Network",
+"label.action.delete.keypair": "Delete API key pair",
 "label.action.delete.user": "Delete User",
 "label.action.delete.vgpu.profile": "Delete vGPU profile",
 "label.action.delete.volume": "Delete Volume",
@@ -410,6 +413,11 @@
 "label.api.docs.count": "APIs available for your account",
 "label.api.version": "API version",
 "label.apikey": "API key",
+"label.apikeypairs": "API Key Pairs",
+"label.apikeypair.description": "Description of the API key pair",
+"label.apikeypair.name": "Name of the API key pair",
+"label.apikeypair.startdate": "API key pair valid from",
+"label.apikeypair.enddate": "API key pair valid until",
 "label.app.cookie": "AppCookie",
 "label.app.name": "CloudStack",
 "label.application.policy.set": "Application Policy Set",
@@ -439,6 +447,7 @@
 "label.attaching": "Attaching",
 "label.authentication.method": "Authentication Method",
 "label.authentication.sshkey": "System SSH Key",
+"label.authorizeurl": "Authorize URL",
 "label.use.existing.vcenter.credentials.from.zone": "Use existing vCenter credentials from the Zone",
 "label.autoscale": "AutoScale",
 "label.autoscalevmgroupname": "AutoScaling Group",
@@ -625,6 +634,7 @@
 "label.configure.ldap": "Configure LDAP",
 "label.configure.ovs": "Configure Ovs",
 "label.configure.sticky.policy": "Configure sticky policy",
+"label.confirm.delete.api.keys": "Please confirm you wish to delete the selected API key pairs",
 "label.confirm.delete.egress.firewall.rules": "Please confirm you wish to delete the selected egress firewall rules.",
 "label.confirm.delete.firewall.rules": "Please confirm you wish to delete the selected firewall rules.",
 "label.confirm.delete.ip.v6.firewall.rules": "Please confirm you wish to delete the selected IPv6 firewall rules",
@@ -790,6 +800,7 @@
 "label.delete.alerts": "Delete alerts",
 "label.delete.asnrange": "Delete AS Range",
 "label.delete.autoscale.vmgroup": "Delete AutoScaling Group",
+"label.delete.all.rules": "Delete all API key pair rules",
 "label.delete.backup": "Delete backup",
 "label.delete.backup.schedule": "Delete backup schedule",
 "label.delete.bgp.peer": "Delete BGP peer",
@@ -847,6 +858,7 @@
 "label.deleting": "Deleting",
 "label.deleting.failed": "Deleting failed",
 "label.deleting.iso": "Deleting ISO",
+"label.deleting.keypair": "Deleting API key pair",
 "label.deleting.snapshot": "Deleting Snapshot",
 "label.deleting.template": "Deleting Template",
 "label.deleteprotection": "Delete protection",
@@ -1227,6 +1239,8 @@
 "label.guestnetwork": "Guest Network",
 "label.guestnetworkid": "Network ID",
 "label.guestnetworkname": "Network name",
+"label.guestosasrule": "Guest OS as rule",
+"label.guestosrule": "Guest OS rule",
 "label.gueststartip": "Guest start IP",
 "label.guest.vlan": "Guest VLAN",
 "label.guestvlanrange": "VLAN range(s)",
@@ -1649,6 +1663,7 @@
 "message.memory.usage.info.hypervisor.additionals": "The data shown may not reflect the actual memory usage if the Instance does not have the additional hypervisor tools installed",
 "message.memory.usage.info.negative.value": "If the Instance's memory usage cannot be obtained from the hypervisor, the lines for free memory in the raw data graph and memory usage in the percentage graph will be disabled",
 "message.migrate.volume.tooltip": "Volume can be migrated to any suitable storage pool. Admin has to choose the appropriate disk offering to replace, that supports the new storage pool",
+"message.register.keypair.failed": "Failed to register API key pair",
 "label.migrate.with.storage": "Migrate with storage",
 "label.migrating": "Migrating",
 "label.migrating.data": "Migrating data",
@@ -1750,6 +1765,7 @@
 "label.new.password": "New password",
 "label.new.project": "New Project",
 "label.new.secondaryip.description": "Enter new secondary IP address",
+"label.new.secondaryip.description.description": "Enter a description for the new secondary IP address",
 "label.new.tag": "New tag",
 "label.new.vm": "New Instance",
 "label.new.version.available": "New version available",
@@ -2103,12 +2119,14 @@
 "label.redundantvpcrouter": "Redundant VPC",
 "label.refresh": "Refresh",
 "label.region": "Region",
+"label.register.api.key": "Register API key pair",
 "label.register.extension": "Register Extension",
 "label.register.oauth": "Register OAuth",
 "label.register.template": "Register Template",
 "label.register.user.data": "Register User Data",
 "label.register.cni.config": "Register CNI Configuration",
 "label.register.user.data.details": "Enter the User Data in plain text or in Base64 encoding. Up to 32KB of Base64 encoded User Data can be sent by default. The setting vm.userdata.max.length can be used to increase the limit to upto 1MB.",
+"label.registering.keypair": "Registering API key pair for user \"{user}\"",
 "label.reinstall.vm": "Reinstall Instance",
 "label.reject": "Reject",
 "label.related": "Related",
@@ -2265,6 +2283,7 @@
 "label.schedule": "Schedule",
 "label.scheduled": "Scheduled",
 "label.schedule.add": "Add schedule",
+"label.update.members": "Update members",
 "label.scheduled.backups": "Scheduled backups",
 "label.schedules": "Schedules",
 "label.scope": "Scope",
@@ -2275,6 +2294,7 @@
 "label.secondary.storage": "Secondary Storage",
 "label.secondary.storage.vm": "Secondary Storage VM",
 "label.secondaryips": "Secondary IPs",
+"label.secondaryip.description": "Description",
 "label.secondarystoragelimit": "Secondary Storage limits (GiB)",
 "label.secretkey": "Secret key",
 "label.secured": "Secured",
@@ -2423,6 +2443,7 @@
 "label.unregister.extension": "Unregister Extension",
 "label.usediops": "IOPS used",
 "label.userdata": "User Data",
+"label.user.api.key.rules": "API key pair rules",
 "label.user.data.id": "User Data ID",
 "label.user.data.name": "User Data name",
 "label.user.data.details": "User Data details",
@@ -2608,6 +2629,7 @@
 "label.to": "to",
 "label.token": "Token",
 "label.token.for.dashboard.login": "Token for dashboard login can be retrieved using following command",
+"label.tokenurl": "Token URL",
 "label.tools": "Tools",
 "label.total": "Total",
 "label.total.network": "Total Networks",
@@ -2804,7 +2826,8 @@
 "label.vmlimit": "Instance limits",
 "label.vmname": "Instance name",
 "label.vms": "Instances",
-"label.vmscheduleactions": "Actions",
+"label.scheduleactions": "Actions",
+
 "label.vmstate": "Instance state",
 "label.vmtotal": "Total of Instances",
 "label.vmware": "VMware",
@@ -2956,7 +2979,7 @@
 "label.versioning": "Versioning",
 "label.objectlocking": "Object Lock",
 "label.bucket.policy": "Bucket Policy",
-"label.usersecretkey": "Secret Key",
+"label.usersecretkey": "API Secret Key",
 "label.create.bucket": "Create Bucket",
 "label.cniconfiguration": "CNI Configuration",
 "label.cniconfigname": "Associated CNI Configuration",
@@ -3374,6 +3397,8 @@
 "message.delete.failed": "Delete fail",
 "message.delete.gateway": "Please confirm you want to delete the gateway.",
 "message.delete.ip.v6.prefix.processing": "Deleting IPv6 prefix...",
+"message.delete.keypair": "Please confirm that you would like to delete this API key pair.",
+"message.delete.keypair.failed": "Failed to delete API key pair",
 "message.delete.port.forward.processing": "Deleting port forwarding rule...",
 "message.delete.project": "Are you sure you want to delete this project?",
 "message.delete.rule.processing": "Deleting rule...",
@@ -3565,7 +3590,7 @@
 "message.error.remove.nic": "There was an error",
 "message.error.remove.secondary.ipaddress": "There was an error removing the secondary IP Address",
 "message.error.remove.tungsten.routing.policy": "Removing Tungsten-Fabric Routing Policy from Network failed",
-"message.error.remove.vm.schedule": "Removing Instance Schedule failed",
+"message.error.remove.resource.schedule": "Removing Schedule for the resource failed",
 "message.error.required.input": "Please enter input",
 "message.error.reset.config": "Unable to reset config to default value",
 "message.error.retrieve.kubeconfig": "Unable to retrieve Kubernetes Cluster config",
@@ -3779,6 +3804,8 @@
 "message.new.version.available": "A new version of CloudStack is available. Click here to check the details",
 "message.no.data.to.show.for.period": "No data to show for the selected period.",
 "message.no.description": "No description entered.",
+"message.note.about.keypair.permissions.title": "Note about API key pair rule permissions",
+"message.note.about.keypair.permissions.body": "During the creation of API key pairs, it is possible to define a corresponding set of rule permissions. If a rule set is defined, the API key pair will only have access to APIs for which access has been explicitly granted (i.e., APIs whose corresponding rules are marked as allowed). On the other hand, if no rule set is specified, the API key pair permissions will follow and adapt to the permission set of the user's account role.",
 "message.offering.internet.protocol.warning": "WARNING: IPv6 supported Networks use static routing and will require upstream routes to be configured manually.",
 "message.offering.ipv6.warning": "Please refer documentation for creating IPv6 enabled Network/VPC offering <a href='http://docs.cloudstack.apache.org/en/latest/plugins/ipv6.html#isolated-network-and-vpc-tier'>IPv6 support in CloudStack - Isolated Networks and VPC Network Tiers</a>",
 "message.oobm.configured": "Successfully configured out-of-band management for host",
@@ -3961,7 +3988,7 @@
 "message.success.config.backup.schedule": "Successfully configured Instance backup schedule",
 "message.success.config.health.monitor": "Successfully Configure Health Monitor",
 "message.success.config.sticky.policy": "Successfully configured sticky policy",
-"message.success.config.vm.schedule": "Successfully configured Instance schedule",
+"message.success.config.resource.schedule": "Successfully configured schedule for the resource",
 "message.success.copy.clipboard": "Successfully copied to clipboard",
 "message.success.create.account": "Successfully created Account",
 "message.success.create.asnrange": "Successfully created AS Range",
@@ -3989,6 +4016,7 @@
 "message.success.delete.gpu.devices": "Successfully deleted GPU device(s)",
 "message.success.delete.icon": "Successfully deleted icon of",
 "message.success.delete.interface.static.route": "Successfully removed interface Static Route",
+"message.success.delete.keypair": "Success deleting API key pair",
 "message.success.delete.ipv4.subnet": "Successfully removed IPv4 subnet",
 "message.success.delete.network.static.route": "Successfully removed Network Static Route",
 "message.success.delete.node": "Successfully deleted node",
@@ -4020,6 +4048,7 @@
 "message.success.register.keypair": "Successfully registered SSH key pair",
 "message.success.register.template": "Successfully registered Template",
 "message.success.register.user.data": "Successfully registered User Data",
+"message.success.register.user.keypair": "Successfully registered API key pair for user \"{user}\"",
 "message.success.release.ip": "Successfully released IP",
 "message.success.release.dedicated.bgp.peer": "Successfully released dedicated BGP peer",
 "message.success.release.dedicated.ipv4.subnet": "Successfully released dedicated IPv4 subnet",
diff --git a/ui/public/locales/pt_BR.json b/ui/public/locales/pt_BR.json
index c4e773de88e..170bdf4ed98 100644
--- a/ui/public/locales/pt_BR.json
+++ b/ui/public/locales/pt_BR.json
@@ -51,6 +51,7 @@
 "label.action": "A\u00e7\u00e3o",
 "label.action.attach.disk": "Anexar disco",
 "label.action.attach.iso": "Anexar ISO",
+"label.action.bulk.delete.api.keys": "Apagar em massa as chaves de acesso \u00e0 API.",
 "label.action.bulk.delete.egress.firewall.rules": "Apagar em massa as regras de sa\u00edda do firewall.",
 "label.action.bulk.delete.firewall.rules": "Apagar em massa as regras do firewall.",
 "label.action.bulk.delete.ip.v6.firewall.rules": "Apagar em massa as regras de firewall IPv6.",
@@ -70,6 +71,7 @@
 "label.action.copy.iso": "Copiar ISO",
 "label.action.copy.snapshot": "Copiar Snapshot",
 "label.action.copy.template": "Copiar template",
+"label.action.create.api.key": "Criar um par de chaves de API para usu\u00e1rio",
 "label.action.create.snapshot.from.vmsnapshot": "Criar snapshot a partir de uma snapshot de VM",
 "label.action.create.template.from.volume": "Criar template a partir do disco",
 "label.action.create.volume": "Criar disco",
@@ -86,6 +88,7 @@
 "label.action.delete.interface.static.route": "Remover rota est\u00e1tica da interface Tungsten Fabric",
 "label.action.delete.ip.range": "Remover intervalo de IPs",
 "label.action.delete.iso": "Remover ISO",
+"label.action.delete.keypair": "Remover par de chaves",
 "label.action.delete.load.balancer": "Remover regra do balanceador de carga",
 "label.action.delete.network": "Remover rede",
 "label.action.delete.network.permission": "Excluir permiss\u00e3o de Rede",
@@ -380,6 +383,11 @@
 "label.api.docs.count": "APIs dispon\u00edveis para sua conta",
 "label.api.version": "Vers\u00e3o da API",
 "label.apikey": "Chave da API",
+"label.apikeypairs": "Par de chaves de API",
+"label.apikeypair.description": "Descri\u00e7\u00e3o do par de chaves de API",
+"label.apikeypair.name": "Nome do par de chaves de API",
+"label.apikeypair.startdate": "Data de in\u00edcio da validade do par de chaves de API",
+"label.apikeypair.enddate": "Data de expira\u00e7\u00e3o do par de chaves de API",
 "label.app.cookie": "AppCookie",
 "label.app.name": "CloudStack",
 "label.application.policy.set": "Conjunto de Pol\u00edticas de Aplica\u00e7\u00e3o",
@@ -565,6 +573,7 @@
 "label.configure.ldap": "Configurar LDAP",
 "label.configure.ovs": "Configure Ovs",
 "label.configure.sticky.policy": "Configurar sticky policy",
+"label.confirm.delete.api.keys": "Por favor, confirme se deseja apagar as chaves de acesso \u00e0 API selecionadas",
 "label.confirm.delete.egress.firewall.rules": "Por favor, confirme se deseja apagar as regras de firewall de sa\u00edda selecionadas",
 "label.confirm.delete.firewall.rules": "Por favor, confirme se deseja apagar as regras de firewall selecionadas",
 "label.confirm.delete.ip.v6.firewall.rules": "Por favor, confirme que deseja excluir as regras de firewall IPv6 selecionadas",
@@ -713,6 +722,7 @@
 "label.delete.acl": "Apagar lista ACL",
 "label.delete.affinity.group": "Apagar grupo de afinidade",
 "label.delete.alerts": "Remover alertas",
+"label.delete.all.rules": "Apagar todas as regras",
 "label.delete.asnrange": "Excluir Faixa AS",
 "label.delete.autoscale.vmgroup": "Excluir grupo de auto escalonamento horizontal",
 "label.delete.backup": "Apagar backup",
@@ -767,6 +777,7 @@
 "label.deleteconfirm": "Por favor, confirme que voc\u00ea deseja apagar isto",
 "label.deleting": "Removendo",
 "label.deleting.failed": "Falha ao remover",
+"label.deleting.keypair": "Deletando uma chave de API",
 "label.deleting.iso": "Removendo ISO",
 "label.deleting.template": "Remover template",
 "label.deleting.snapshot": "Excluindo Snapshot",
@@ -1095,6 +1106,8 @@
 "label.guestnetwork": "Rede guest",
 "label.guestnetworkid": "ID de rede",
 "label.guestnetworkname": "Nome da rede",
+"label.guestosasrule": "SO guest como regra JS",
+"label.guestosrule": "Regra SO guest",
 "label.gueststartip": "IP de in\u00edcio do guest",
 "label.guestvlanrange": "Intervalo(s) de VLAN",
 "label.guestvmcidr": "CIDR",
@@ -1574,6 +1587,7 @@
 "label.new.password": "Nova senha",
 "label.new.project": "Novo projeto",
 "label.new.secondaryip.description": "Insira um novo endere\u00e7o IP secund\u00e1rio",
+"label.new.secondaryip.description.description": "Insira uma descri\u00e7\u00e3o para o novo endere\u00e7o IP secund\u00e1rio",
 "label.new.tag": "Nova etiqueta",
 "label.new.version.available": "Nova vers\u00e3o dispon\u00edvel",
 "label.new.vm": "Nova VM",
@@ -1908,6 +1922,7 @@
 "label.register.oauth": "Registrar OAuth",
 "label.register.user.data": "Registrar dados de usu\u00e1rio",
 "label.register.template": "Registrar template",
+"label.registering.keypair": "Registrando par de chaves de API para o usu\u00e1rio \"{user}\"",
 "label.reinstall.vm": "Reinstalar VM",
 "label.reject": "Rejeitar",
 "label.related": "Relacionado",
@@ -2064,9 +2079,11 @@
 "label.secondary.storage": "Armazenamento secund\u00e1rio",
 "label.secondary.storage.vm": "VM de armazenamento secund\u00e1rio",
 "label.secondaryips": "IPs secund\u00e1rios",
+"label.secondaryip.description": "Descri\u00e7\u00e3o",
 "label.secondarystoragelimit": "Limites do armazenamento secund\u00e1rio (GiB)",
 "label.secretkey": "Chave secreta",
 "label.secret.key": "Chave secreta",
+"label.apikeyaccess": "Acesso a pares de chaves de API",
 "label.secured": "Protegido",
 "label.security.groups": "Grupos de seguran\u00e7a",
 "label.securitygroup": "Grupo de seguran\u00e7a",
@@ -2481,10 +2498,12 @@
 "label.usenewdiskoffering": "Substituir a oferta de disco?",
 "label.user": "Usu\u00e1rio",
 "label.user.conflict": "Conflito",
+"label.usersecretkey": "Chave Secreta de API",
 "label.user.data": "Dados de usu\u00e1rio",
 "label.username": "Nome de usu\u00e1rio",
 "label.users": "Usu\u00e1rios",
 "label.usersource": "Tipo de usu\u00e1rio",
+"label.user.api.key.rules": "Regras do par de chaves de API",
 "label.using.cli": "Usando CLI",
 "label.utilization": "Utiliza\u00e7\u00e3o",
 "label.uuid": "ID",
@@ -3384,6 +3403,8 @@
 "message.nfs.mount.options.description": "Lista separada por v\u00edrgulas de op\u00e7\u00f5es de montagem NFS para hosts KVM. Op\u00e7\u00f5es suportadas : vers=[3,4.0,4.1,4.2], nconnect=[1...16]",
 "message.no.data.to.show.for.period": "Nenhum dado para mostrar no per\u00edodo selecionado.",
 "message.no.description": "Nenhuma descri\u00e7\u00e3o inserida.",
+"message.note.about.keypair.permissions.title": "Observa\u00e7\u00e3o sobre as permiss\u00f5es de regras de pares de chaves de API",
+"message.note.about.keypair.permissions.body": "Durante a cria\u00e7\u00e3o de pares de chaves de API, é possível definir um conjunto correspondente de permiss\u00f5es de regras. Se um conjunto de regras for definido, o par de chaves de API terá acesso apenas às APIs para as quais o acesso foi explicitamente concedido (ou seja, APIs cujas regras correspondentes estejam marcadas como permitidas). Por outro lado, se nenhum conjunto de regras for especificado, as permiss\u00f5es do par de chaves de API seguir\u00e3o e se adaptar\u00e3o ao conjunto de permiss\u00f5es da role da conta do usu\u00e1rio.",
 "message.offering.internet.protocol.warning": "AVISO: Redes suportadas por IPv6 usam roteamento est\u00e1tico e exigir\u00e3o que rotas upstream sejam configuradas manualmente.",
 "message.offering.ipv6.warning": "Por favor, consulte a documenta\u00e7\u00e3o para criar oferta de Rede/VPC habilitada para IPv6 <a href='http://docs.cloudstack.apache.org/en/latest/plugins/ipv6.html#isolated-network-and-vpc-tier'>Suporte IPv6 no CloudStack - Redes Isoladas e Camadas de VPC</a>",
 "message.ovf.configurations": "H\u00e1 propriedades OVF dispon\u00edveis para a personaliza\u00e7\u00e3o do aparelho selecionado. Por favor, edite os valores de forma apropriada.As ofertas incompat\u00edveis de computa\u00e7\u00e3o ser\u00e3o desativadas.",
@@ -3411,6 +3432,7 @@
 "message.read.accept.license.agreements": "Leia e aceite os termos dos contratos de licen\u00e7a.",
 "message.read.admin.guide.scaling.up": "Por favor leia a sess\u00e3o sobre escalonamento din\u00e2mico no guia do administrador antes de escalonar.",
 "message.recover.vm": "Por favor, confirme a recupera\u00e7\u00e3o desta VM.",
+"message.register.keypair.failed": "Falha ao registrar par de chave de API",
 "message.reinstall.vm": "NOTA: proceda com cuidado. Isso far\u00e1 com que a m\u00e1quina virtual seja re-instalada a partir do template. Todos os dados do disco root ser\u00e3o perdidos. Se houver volumes de dados adicionais, eles n\u00e3o ser\u00e3o alterados.",
 "message.release.ip.failed": "Falha ao liberar IP",
 "message.releasing.dedicated.cluster": "Liberando cluster dedicado...",
@@ -3563,7 +3585,6 @@
 "message.success.create.keypair": "Par de chaves SSH criado com sucesso",
 "message.success.create.kubernetes.cluster": "Cluster Kubernetes criado com sucesso",
 "message.success.create.l2.network": "Rede L2 criada com sucesso",
-"message.success.create.password": "Par de chave de acesso \u00e0 API criada com sucesso",
 "message.success.create.sharedfs": "Sistema de Arquivos Compartilhado criado com sucesso",
 "message.success.create.snapshot.from.vmsnapshot": "Snapshot de volume a partir da snapshot de VM criada com sucesso",
 "message.success.create.template": "Template criado com sucesso",
@@ -3607,7 +3628,7 @@
 "message.success.register.keypair": "Par de chaves SSH registrado com sucesso",
 "message.success.register.template": "Template cadastrado com sucesso",
 "message.success.register.user.data": "Userdata registrado com sucesso",
-"message.success.register.user.keypair": "Novo par de chave de API criado com sucesso",
+"message.success.register.user.keypair": "Novo par de chaves de API registrado com sucesso para o usu\u00e1rio \"{user}\"",
 "message.success.release.dedicated.bgp.peer": "Par BGP dedicado liberado com sucesso",
 "message.success.release.dedicated.ipv4.subnet": "Sub-rede IPv4 dedicada liberada com sucesso",
 "message.success.release.ip": "IP liberado com sucesso",
diff --git a/ui/public/locales/te.json b/ui/public/locales/te.json
index f3b4c70ca2e..dbbda2d99c0 100644
--- a/ui/public/locales/te.json
+++ b/ui/public/locales/te.json
@@ -2466,7 +2466,7 @@
   "label.vmlimit": "ఉదాహరణ పరిమితులు",
   "label.vmname": "ఉదాహరణ పేరు",
   "label.vms": "సందర్భాలు",
-  "label.vmscheduleactions": "చర్యలు",
+  "label.scheduleactions": "చర్యలు",
   "label.vmstate": "ఉదాహరణ స్థితి",
   "label.vmtotal": "మొత్తం సందర్భాలు",
   "label.vmware": "VMware",
@@ -3107,7 +3107,7 @@
   "message.error.remove.nic": "లోపం ఏర్పడింది",
   "message.error.remove.secondary.ipaddress": "ద్వితీయ IP చిరునామాను తీసివేయడంలో లోపం ఏర్పడింది",
   "message.error.remove.tungsten.routing.policy": "నెట్‌వర్క్ నుండి టంగ్‌స్టన్-ఫాబ్రిక్ రూటింగ్ విధానాన్ని తీసివేయడం విఫలమైంది",
-  "message.error.remove.vm.schedule": "ఉదాహరణ షెడ్యూల్‌ని తీసివేయడం విఫలమైంది",
+  "message.error.remove.resource.schedule": "వనరు కోసం షెడ్యూల్‌ను తొలగించడం విఫలమైంది",
   "message.error.required.input": "దయచేసి ఇన్‌పుట్‌ని నమోదు చేయండి",
   "message.error.reset.config": "కాన్ఫిగర్‌ని డిఫాల్ట్ విలువకు రీసెట్ చేయడం సాధ్యపడలేదు",
   "message.error.retrieve.kubeconfig": "Kubernetes క్లస్టర్ కాన్ఫిగరేషన్‌ని తిరిగి పొందడం సాధ్యం కాలేదు",
@@ -3461,7 +3461,7 @@
   "message.success.config.backup.schedule": "ఉదాహరణ బ్యాకప్ షెడ్యూల్ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
   "message.success.config.health.monitor": "హెల్త్ మానిటర్‌ని విజయవంతంగా కాన్ఫిగర్ చేయండి",
   "message.success.config.sticky.policy": "స్టిక్కీ పాలసీ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
-  "message.success.config.vm.schedule": "ఉదాహరణ షెడ్యూల్ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
+  "message.success.config.resource.schedule": "వనరు కోసం షెడ్యూల్ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
   "message.success.copy.clipboard": "క్లిప్‌బోర్డ్‌కి విజయవంతంగా కాపీ చేయబడింది",
   "message.success.create.account": "ఖాతా విజయవంతంగా సృష్టించబడింది",
   "message.success.create.asnrange": "AS పరిధి విజయవంతంగా సృష్టించబడింది",
diff --git a/ui/src/components/view/ApiKeyPairsTab.vue b/ui/src/components/view/ApiKeyPairsTab.vue
new file mode 100644
index 00000000000..87feda59d99
--- /dev/null
+++ b/ui/src/components/view/ApiKeyPairsTab.vue
@@ -0,0 +1,451 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+<template>
+  <div>
+    <a-spin :spinning="fetchLoading">
+      <a-button
+        v-if="'registerUserKeys' in $store.getters.apis"
+        type="dashed"
+        style="width: 100%; margin-bottom: 15px"
+        @click="onShowAddKeyPair()">
+        <template #icon><plus-outlined /></template>
+        {{ $t('label.register.api.key') }}
+      </a-button>
+      <a-button
+        v-if="this.selectedRowKeys.length > 0 && ('deleteUserKeys' in $store.getters.apis)"
+        type="primary"
+        danger
+        style="width: 100%; margin-bottom: 15px"
+        @click="bulkActionConfirmation()">
+        <template #icon><delete-outlined /></template>
+        {{ $t('label.action.bulk.delete.api.keys') }}
+      </a-button>
+      <a-table
+        size="small"
+        style="overflow-y: auto"
+        :columns="columns"
+        :dataSource="keypairs"
+        :rowKey="item => item.id"
+        :rowSelection="rowSelection()"
+        :pagination="false" >
+        <template #name="{ record }">
+          <div>
+            <router-link :to="{ path: '/keypair/' + record.id }" >
+              {{ record.name }}
+            </router-link>
+          </div>
+        </template>
+        <template #apikey="{ record }">
+          <strong>
+            <tooltip-button
+              tooltipPlacement="right"
+              :tooltip="$t('label.copy')"
+              icon="CopyOutlined"
+              type="dashed"
+              size="small"
+              @onClick="$message.success($t('label.copied.clipboard'))"
+              :copyResource="record.apikey" />
+          </strong>
+          <div>
+            {{ record.apikey.substring(0, 20) }}...
+          </div>
+        </template>
+
+        <template #secretkey="{ record }">
+          <strong>
+            <tooltip-button
+              tooltipPlacement="right"
+              :tooltip="$t('label.copy')"
+              icon="CopyOutlined"
+              type="dashed"
+              size="small"
+              @onClick="$message.success($t('label.copied.clipboard'))"
+              :copyResource="record.secretkey" />
+          </strong>
+          <div>
+            {{ record.secretkey.substring(0, 20) }}...
+          </div>
+        </template>
+
+        <template #startdate="{ record }">
+          <div> {{ $toLocaleDate(record.startdate) }} </div>
+        </template>
+
+        <template #enddate="{ record }">
+          <div> {{ $toLocaleDate(record.enddate)}} </div>
+        </template>
+
+        <template #created="{ record }">
+          <div> {{ $toLocaleDate(record.created) }} </div>
+        </template>
+
+      </a-table>
+      <a-divider/>
+      <a-pagination
+        class="row-element pagination"
+        size="small"
+        :current="page"
+        :pageSize="pageSize"
+        :total="totalKeypairs"
+        :showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
+        :pageSizeOptions="['10', '20', '40', '80', '100']"
+        @change="changePage"
+        @showSizeChange="changePageSize"
+        showSizeChanger>
+        <template #buildOptionText="props">
+          <span>{{ props.value }} / {{ $t('label.page') }}</span>
+        </template>
+      </a-pagination>
+    </a-spin>
+    <bulk-action-view
+      v-if="(showConfirmationAction || showGroupActionModal)"
+      :showConfirmationAction="showConfirmationAction"
+      :showGroupActionModal="showGroupActionModal"
+      :items="keypairs"
+      :selectedRowKeys="selectedRowKeys"
+      :selectedItems="selectedItems"
+      :columns="columns"
+      :selectedColumns="selectedColumns"
+      action="eraseKeypairs"
+      :loading="loading"
+      :message="bulkDeleteMessage"
+      @group-action="eraseKeypairs"
+      @handle-cancel="handleCancelBulk"
+      @close-modal="closeModalBulk" />
+    <generate-api-key-pair
+      :showAddKeyPair="showAddKeyPair"
+      :resource="resource"
+      @fetch-data="fetchData"
+      @refresh-data="handleRefreshData"
+      @close-modal="closeModalAddKeyPair" />
+  </div>
+</template>
+<script>
+import { getAPI, postAPI } from '@/api'
+import TooltipButton from '@/components/widgets/TooltipButton'
+import BulkActionView from '@/components/view/BulkActionView.vue'
+import eventBus from '@/config/eventBus'
+import GenerateApiKeyPair from '@/views/iam/GenerateApiKeyPair.vue'
+
+export default {
+  name: 'ApiKeyPairsTab',
+  components: {
+    TooltipButton,
+    BulkActionView,
+    GenerateApiKeyPair
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      fetchLoading: false,
+      keypairs: [],
+      page: 1,
+      pageSize: 10,
+      totalKeypairs: 0,
+      selectedRowKeys: [],
+      selectedItems: [],
+      selectedColumns: [],
+      filterColumns: ['Action'],
+      showConfirmationAction: false,
+      showAddKeyPair: false,
+      showGroupActionModal: false,
+      bulkDeleteMessage: {
+        title: this.$t('label.action.bulk.delete.api.keys'),
+        confirmMessage: this.$t('label.confirm.delete.api.keys')
+      },
+      columns: [
+        {
+          title: this.$t('label.name'),
+          dataIndex: 'name',
+          slots: { customRender: 'name' }
+        },
+        {
+          title: this.$t('label.apikey'),
+          dataIndex: 'apikey',
+          slots: { customRender: 'apikey' }
+        },
+        {
+          title: this.$t('label.secretkey'),
+          dataIndex: 'secretkey',
+          slots: { customRender: 'secretkey' }
+        },
+        {
+          title: this.$t('label.start.date'),
+          dataIndex: 'startdate',
+          slots: { customRender: 'startdate' }
+        },
+        {
+          title: this.$t('label.end.date'),
+          dataIndex: 'enddate',
+          slots: { customRender: 'enddate' }
+        },
+        {
+          title: this.$t('label.created'),
+          dataIndex: 'created',
+          slots: { customRender: 'created' }
+        }
+      ]
+    }
+  },
+  created () {
+    this.fetchData()
+  },
+  watch: {
+    resource: {
+      deep: true,
+      handler (newItem) {
+        if (!newItem || !newItem.id) {
+          return
+        }
+        this.fetchData()
+      }
+    }
+  },
+  inject: ['parentFetchData'],
+  methods: {
+    fetchData () {
+      const params = {
+        listall: true,
+        page: this.page,
+        pagesize: this.pageSize,
+        userid: this.resource.id
+      }
+      this.fetchLoading = true
+      getAPI('listUserKeys', params).then(json => {
+        this.totalKeypairs = json.listuserkeysresponse.count || 0
+        this.keypairs = json.listuserkeysresponse.userapikey || []
+      }).finally(() => {
+        this.fetchLoading = false
+      })
+    },
+    setSelection (selection) {
+      this.selectedRowKeys = selection
+      this.$emit('selection-change', this.selectedRowKeys)
+      this.selectedItems = (this.keypairs.filter(function (item) {
+        return selection.indexOf(item.id) !== -1
+      }))
+    },
+    changePage (page, pageSize) {
+      this.page = page
+      this.pageSize = pageSize
+      this.fetchData()
+    },
+    changePageSize (currentPage, pageSize) {
+      this.page = currentPage
+      this.pageSize = pageSize
+      this.fetchData()
+    },
+    onShowAddKeyPair () {
+      this.showAddKeyPair = true
+    },
+    eraseKeypairs () {
+      this.selectedColumns.splice(0, 0, {
+        dataIndex: 'status',
+        title: this.$t('label.operation.status'),
+        slots: { customRender: 'status' },
+        filters: [
+          { text: this.$t('state.inprogress'), value: 'InProgress' },
+          { text: this.$t('label.success'), value: 'success' },
+          { text: this.$t('label.failed'), value: 'failed' }
+        ]
+      })
+      if (this.selectedRowKeys.length > 0) {
+        this.showGroupActionModal = true
+      }
+      this.deleteKeypairs(this.selectedItems)
+    },
+    async deleteKeypairs (keypairs) {
+      if (!keypairs || keypairs.length === 0) {
+        this.fetchLoading = false
+        return
+      }
+
+      this.fetchLoading = true
+      try {
+        await Promise.all(keypairs.map(async keypair => {
+          try {
+            const jobId = await this.deleteKeyPair({
+              keypairid: keypair.id
+            })
+            await this.$pollJob({
+              jobId,
+              action: {
+                isFetchData: false
+              },
+              successMethod: () => {
+                eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'success' })
+              },
+              catchMethod: () => {
+                eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
+              }
+            })
+          } catch (e) {
+            eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: keypair.id, state: 'failed' })
+          }
+        }))
+      } finally {
+        this.fetchLoading = false
+      }
+    },
+    async deleteKeyPair (args) {
+      const response = await postAPI('deleteUserKeys', args)
+      return response.deleteuserkeysresponse.jobid
+    },
+    bulkActionConfirmation () {
+      this.showConfirmationAction = true
+      this.selectedColumns = this.columns.filter(column => {
+        return !this.filterColumns.includes(column.title)
+      })
+      this.selectedItems = this.selectedItems.map(v => ({ ...v, status: 'InProgress' }))
+    },
+    handleCancelBulk () {
+      eventBus.emit('update-bulk-job-status', { items: this.selectedItems, action: false })
+      this.showGroupActionModal = false
+      this.selectedItems = []
+      this.selectedColumns = []
+      this.selectedRowKeys = []
+      this.parentFetchData()
+    },
+    closeModalBulk () {
+      this.showConfirmationAction = false
+    },
+    closeModalAddKeyPair () {
+      this.showAddKeyPair = false
+    },
+    handleRefreshData () {
+      this.$emit('refresh-data')
+    },
+    rowSelection () {
+      if ('deleteUserKeys' in this.$store.getters.apis) {
+        return {
+          selectedRowKeys: this.selectedRowKeys,
+          onChange: this.setSelection
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.list {
+  max-height: 95vh;
+  width: 95vw;
+  overflow-y: scroll;
+  margin: -24px;
+
+  @media (min-width: 1000px) {
+    max-height: 70vh;
+    width: 900px;
+  }
+
+  &__header,
+  &__footer {
+    padding: 20px;
+  }
+
+  &__header {
+    display: flex;
+
+    .ant-select {
+      min-width: 200px;
+    }
+
+    &__col {
+
+      &:not(:last-child) {
+        margin-right: 20px;
+      }
+
+      &--full {
+        flex: 1;
+      }
+
+    }
+
+  }
+
+  &__footer {
+    display: flex;
+    justify-content: flex-end;
+
+    button {
+      &:not(:last-child) {
+        margin-right: 10px;
+      }
+    }
+  }
+
+  &__item {
+    padding-right: 20px;
+    padding-left: 20px;
+
+    &--selected {
+      background-color: #e6f7ff;
+    }
+
+  }
+
+  &__title {
+    font-weight: bold;
+  }
+
+  &__outer-container {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    cursor: pointer;
+
+    @media (min-width: 760px) {
+      flex-direction: row;
+      align-items: center;
+    }
+
+  }
+
+  &__row {
+    margin-bottom: 10px;
+
+    @media (min-width: 760px) {
+      margin-right: 20px;
+      margin-bottom: 0;
+    }
+  }
+
+  &__radio {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+}
+</style>
diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue
index 97dbac230a2..73e3cf07516 100644
--- a/ui/src/components/view/DetailsTab.vue
+++ b/ui/src/components/view/DetailsTab.vue
@@ -97,7 +97,7 @@
             <span v-if="['USER.LOGIN', 'USER.LOGOUT', 'ROUTER.HEALTH.CHECKS', 'FIREWALL.CLOSE', 'ALERT.SERVICE.DOMAINROUTER'].includes(dataResource[item])">{{ $t(dataResource[item].toLowerCase()) }}</span>
             <span v-else>{{ dataResource[item] }}</span>
           </div>
-          <div v-else-if="['created', 'sent', 'lastannotated', 'collectiontime', 'lastboottime', 'lastserverstart', 'lastserverstop', 'removed', 'effectiveDate', 'endDate'].includes(item)">
+          <div v-else-if="['created', 'sent', 'lastannotated', 'collectiontime', 'lastboottime', 'lastserverstart', 'lastserverstop', 'removed', 'effectiveDate', 'endDate', 'startdate', 'enddate'].includes(item)">
             {{ $toLocaleDate(dataResource[item]) }}
           </div>
           <code-highlight v-else-if="['activationRule'].includes(item)" language="javascript">
@@ -171,7 +171,7 @@
           <div>{{ dataResource[item] }}</div>
         </div>
       </a-list-item>
-      <a-list-item v-else-if="['startdate', 'enddate'].includes(item)">
+      <a-list-item v-else-if="['startdate', 'enddate'].includes(item) && dataResource[item]">
         <div>
           <strong>{{ $t('label.' + item.replace('date', '.date.and.time'))}}</strong>
           <br/>
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index fef25bd0b4a..e85a1966714 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -120,12 +120,18 @@
 
             <a-divider/>
 
-            <div class="resource-detail-item" v-if="(resource.state || resource.status) && $route.meta.name !== 'zone'">
+            <div class="resource-detail-item" v-if="(resource.state || resource.status) && !['zone', 'keypair'].includes($route.meta.name)">
               <div class="resource-detail-item__label">{{ $t('label.status') }}</div>
               <div class="resource-detail-item__details">
                 <status class="status" :text="resource.state || resource.status" displayText/>
               </div>
             </div>
+            <div class="resource-detail-item" v-if="resource.apikeyaccess && $route.meta.name === 'accountuser'">
+              <div class="resource-detail-item__label">{{ $t('label.apikeyaccess') }}</div>
+              <div class="resource-detail-item__details">
+                <status class="status" :text="resource.apikeyaccess" displayText/>
+              </div>
+            </div>
             <div class="resource-detail-item" v-if="resource.allocationstate">
               <div class="resource-detail-item__label">{{ $t('label.allocationstate') }}</div>
               <div class="resource-detail-item__details">
@@ -159,6 +165,42 @@
                 <span style="margin-left: 10px;"><copy-label :label="resource.id" /></span>
               </div>
             </div>
+            <div class="resource-detail-item" v-if="resource.apikey && resource.secretkey">
+              <div class="user-keys">
+                <key-outlined />
+                <strong>
+                  {{ $t('label.apikey') }}
+                  <tooltip-button
+                    tooltipPlacement="right"
+                    :tooltip="$t('label.copy') + ' ' + $t('label.apikey')"
+                    icon="CopyOutlined"
+                    type="dashed"
+                    size="small"
+                    @onClick="$message.success($t('label.copied.clipboard'))"
+                    :copyResource="resource.apikey" />
+                </strong>
+                <div>
+                  {{ resource.apikey.substring(0, 20) }}...
+                </div>
+              </div> <br/>
+              <div class="user-keys">
+                <lock-outlined />
+                <strong>
+                  {{ $t('label.secretkey') }}
+                  <tooltip-button
+                    tooltipPlacement="right"
+                    :tooltip="$t('label.copy') + ' ' + $t('label.secretkey')"
+                    icon="CopyOutlined"
+                    type="dashed"
+                    size="small"
+                    @onClick="$message.success($t('label.copied.clipboard'))"
+                    :copyResource="resource.secretkey" />
+                </strong>
+                <div>
+                  {{ resource.secretkey.substring(0, 20) }}...
+                </div>
+              </div>
+            </div>
             <div class="resource-detail-item" v-if="(resource.ostypename || resource.osdisplayname) && resource.ostypeid">
               <div class="resource-detail-item__label">{{ $t('label.ostypename') }}</div>
               <div class="resource-detail-item__details">
@@ -796,6 +838,14 @@
                 <span v-else>{{ resource.account }}</span>
               </div>
             </div>
+            <div class="resource-detail-item" v-if="resource.userid && $route.meta.name === 'keypair'">
+              <div class="resource-detail-item__label">{{ $t('label.user') }}</div>
+              <div class="resource-detail-item__details">
+                <user-outlined />
+                <router-link v-if="!isStatic && $router.resolve('/accountuser/' + resource.userid).matched[0].redirect !== '/exception/404'" :to="{ path: '/accountuser/' + resource.userid }">{{ resource.username }}</router-link>
+                <span v-else>{{ resource.username }}</span>
+              </div>
+            </div>
             <div class="resource-detail-item" v-if="resource.roleid">
               <div class="resource-detail-item__label">{{ $t('label.role') }}</div>
               <div class="resource-detail-item__details">
@@ -895,54 +945,6 @@
               :osCategoryId="osCategoryId" />
           </div>
 
-          <div class="account-center-tags" v-if="showKeys || resource.apikeyaccess">
-            <a-divider/>
-          </div>
-          <div class="account-center-tags" v-if="resource.apikeyaccess && resource.account">
-            <div class="resource-detail-item">
-              <div class="resource-detail-item__label">{{ $t('label.apikeyaccess') }}</div>
-              <div class="resource-detail-item__details">
-                <status class="status" :text="resource.apikeyaccess" displayText/>
-              </div>
-            </div>
-          </div>
-          <div class="account-center-tags" v-if="showKeys">
-            <div class="user-keys">
-              <key-outlined />
-              <strong>
-                {{ $t('label.apikey') }}
-                <tooltip-button
-                  tooltipPlacement="right"
-                  :tooltip="$t('label.copy') + ' ' + $t('label.apikey')"
-                  icon="CopyOutlined"
-                  type="dashed"
-                  size="small"
-                  @onClick="$message.success($t('label.copied.clipboard'))"
-                  :copyResource="resource.apikey" />
-              </strong>
-              <div>
-                {{ resource.apikey.substring(0, 20) }}...
-              </div>
-            </div> <br/>
-            <div class="user-keys">
-              <lock-outlined />
-              <strong>
-                {{ $t('label.secretkey') }}
-                <tooltip-button
-                  tooltipPlacement="right"
-                  :tooltip="$t('label.copy') + ' ' + $t('label.secretkey')"
-                  icon="CopyOutlined"
-                  type="dashed"
-                  size="small"
-                  @onClick="$message.success($t('label.copied.clipboard'))"
-                  :copyResource="resource.secretkey" />
-              </strong>
-              <div>
-                {{ resource.secretkey.substring(0, 20) }}...
-              </div>
-            </div>
-          </div>
-
           <div class="account-center-tags" v-if="!isStatic && resourceType && tagsSupportingResourceTypes.includes(this.resourceType) && 'listTags' in $store.getters.apis">
             <a-divider/>
             <a-spin :spinning="loadingTags">
@@ -1089,7 +1091,7 @@ export default {
         this.setData()
         this.validLinks = await validateLinksAsync(this.$router, this.isStatic, this.resource)
 
-        if ('apikey' in this.resource) {
+        if (this.$route.meta.name === 'accountuser' && 'apikey' in this.resource) {
           this.getUserKeys()
         }
         this.updateResourceAdditionalData()
@@ -1268,8 +1270,6 @@ export default {
         return
       }
       getAPI('getUserKeys', { id: this.resource.id }).then(json => {
-        this.showKeys = true
-        this.newResource.secretkey = json.getuserkeysresponse.userkeys.secretkey
         if (!this.isAdmin()) {
           this.newResource.apikeyaccess = json.getuserkeysresponse.userkeys.apikeyaccess ? 'Enabled' : 'Disabled'
         }
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 1b69cc65b9e..d0e499f4d23 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -794,12 +794,12 @@
         {{ record.enabled ? 'Enabled' : 'Disabled' }}
       </template>
       <template
-        v-if="['created', 'sent', 'removed', 'effectiveDate', 'endDate', 'allocated'].includes(column.key) || (['startdate'].includes(column.key) && ['webhook'].includes($route.path.split('/')[1])) || (column.key === 'allocated' && ['asnumbers', 'publicip', 'ipv4subnets'].includes($route.meta.name) && text)"
+        v-if="['created', 'sent', 'removed', 'effectiveDate', 'endDate', 'allocated', 'startdate', 'enddate'].includes(column.key) || (['startdate'].includes(column.key) && ['webhook'].includes($route.path.split('/')[1])) || (column.key === 'allocated' && ['asnumbers', 'publicip', 'ipv4subnets'].includes($route.meta.name) && text)"
       >
         {{ text && $toLocaleDate(text) }}
       </template>
       <template
-        v-if="['startdate', 'enddate'].includes(column.key) && ['vm', 'vnfapp'].includes($route.path.split('/')[1])"
+        v-if="['startdate', 'enddate'].includes(column.key) && ['vm', 'vnfapp', 'autoscalevmgroup'].includes($route.path.split('/')[1])"
       >
         {{ getDateAtTimeZone(text, record.timezone) }}
       </template>
@@ -1026,21 +1026,11 @@
         />
         <slot></slot>
       </template>
-      <template v-if="column.key === 'vmScheduleActions'">
-        <tooltip-button
-          :tooltip="$t('label.edit')"
-          :disabled="!('updateVMSchedule' in $store.getters.apis)"
-          icon="edit-outlined"
-          @onClick="updateVMSchedule(record)"
-        />
-        <tooltip-button
-          :tooltip="$t('label.remove')"
-          :disabled="!('deleteVMSchedule' in $store.getters.apis)"
-          icon="delete-outlined"
-          :danger="true"
-          type="primary"
-          @onClick="removeVMSchedule(record)"
-        />
+      <template v-if="column.key === 'scheduleActions'">
+        <slot
+          name="scheduleActions"
+          :record="record"
+        ></slot>
       </template>
       <template v-if="column.key === 'vgpuActions'">
         <slot name="actionButtons" :record="record" :actions="actions"></slot>
@@ -1383,12 +1373,6 @@ export default {
       data.push(data.splice(index, 1)[0])
       this.updateOrder(data)
     },
-    updateVMSchedule (record) {
-      this.$emit('update-vm-schedule', record)
-    },
-    removeVMSchedule (record) {
-      this.$emit('remove-vm-schedule', record)
-    },
     ipV6Address (text, record) {
       if (!record || !record.nic || record.nic.length === 0) {
         return ''
diff --git a/ui/src/config/router.js b/ui/src/config/router.js
index 43e8efd7b5d..78346d13cac 100644
--- a/ui/src/config/router.js
+++ b/ui/src/config/router.js
@@ -31,6 +31,7 @@ import image from '@/config/section/image'
 import project from '@/config/section/project'
 import event from '@/config/section/event'
 import user from '@/config/section/user'
+import keyPair from '@/config/section/keypair'
 import account from '@/config/section/account'
 import domain from '@/config/section/domain'
 import role from '@/config/section/role'
@@ -221,6 +222,7 @@ export function asyncRouterMap () {
       generateRouterMap(event),
       generateRouterMap(project),
       generateRouterMap(user),
+      generateRouterMap(keyPair),
       generateRouterMap(role),
       generateRouterMap(account),
       generateRouterMap(domain),
diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index 6b7a5428b1f..9262664d448 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -22,6 +22,15 @@ import { getAPI, postAPI, getBaseUrl } from '@/api'
 import { getLatestKubernetesIsoParams } from '@/utils/acsrepo'
 import kubernetesIcon from '@/assets/icons/kubernetes.svg?inline'
 
+const attachedIsoCount = (record) => (record.isos && record.isos.length) || (record.isoid ? 1 : 0)
+// Server pre-computes the effective cap (cluster-scoped vm.iso.max.count clamped to the
+// hypervisor's own limit). Fall back to the hypervisor floor for older servers.
+const isoMaxCount = (record) => record.isomaxcount != null
+  ? record.isomaxcount
+  : (record.hypervisor === 'KVM' ? 2 : 1)
+const isoActionAvailable = (record) =>
+  record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && record.vmtype !== 'sharedfsvm'
+
 export default {
   name: 'compute',
   title: 'label.compute',
@@ -299,7 +308,7 @@ export default {
           docHelp: 'adminguide/templates.html#attaching-an-iso-to-a-vm',
           dataView: true,
           popup: true,
-          show: (record) => { return record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && !record.isoid && record.vmtype !== 'sharedfsvm' },
+          show: (record) => isoActionAvailable(record) && attachedIsoCount(record) < isoMaxCount(record),
           disabled: (record) => { return record.hostcontrolstate === 'Offline' || record.hostcontrolstate === 'Maintenance' },
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/AttachIso.vue')))
         },
@@ -307,22 +316,11 @@ export default {
           api: 'detachIso',
           icon: 'link-outlined',
           label: 'label.action.detach.iso',
-          message: 'message.detach.iso.confirm',
           dataView: true,
-          args: (record, store) => {
-            var args = ['virtualmachineid']
-            if (record && record.hypervisor && record.hypervisor === 'VMware') {
-              args.push('forced')
-            }
-            return args
-          },
-          show: (record) => { return record.hypervisor !== 'External' && ['Running', 'Stopped'].includes(record.state) && 'isoid' in record && record.isoid && record.vmtype !== 'sharedfsvm' },
+          popup: true,
+          show: (record) => isoActionAvailable(record) && attachedIsoCount(record) > 0,
           disabled: (record) => { return record.hostcontrolstate === 'Offline' || record.hostcontrolstate === 'Maintenance' },
-          mapping: {
-            virtualmachineid: {
-              value: (record, params) => { return record.id }
-            }
-          }
+          component: shallowRef(defineAsyncComponent(() => import('@/views/compute/DetachIso.vue')))
         },
         {
           api: 'updateVMAffinityGroup',
@@ -914,6 +912,12 @@ export default {
           name: 'scaledown.policy',
           component: shallowRef(defineAsyncComponent(() => import('@/views/compute/AutoScaleDownPolicyTab.vue')))
         },
+        {
+          name: 'schedules',
+          resourceType: 'AutoScaleVmGroup',
+          component: shallowRef(defineAsyncComponent(() => import('@/views/compute/ResourceSchedules.vue'))),
+          show: () => { return 'listResourceSchedule' in store.getters.apis }
+        },
         {
           name: 'events',
           resourceType: 'AutoScaleVmGroup',
@@ -963,9 +967,9 @@ export default {
           dataView: true,
           args: (record, store) => {
             var args = ['name']
+            args.push('maxmembers')
+            args.push('minmembers')
             if (record.state === 'DISABLED') {
-              args.push('maxmembers')
-              args.push('minmembers')
               args.push('interval')
             }
             return args
diff --git a/ui/src/config/section/config.js b/ui/src/config/section/config.js
index e190515855e..2a83b25c002 100644
--- a/ui/src/config/section/config.js
+++ b/ui/src/config/section/config.js
@@ -80,7 +80,7 @@ export default {
       docHelp: 'adminguide/accounts.html#using-an-ldap-server-for-user-authentication',
       permission: ['listOauthProvider'],
       columns: ['provider', 'enabled', 'description', 'clientid', 'secretkey', 'redirecturi'],
-      details: ['provider', 'description', 'enabled', 'clientid', 'secretkey', 'redirecturi'],
+      details: ['provider', 'description', 'enabled', 'clientid', 'secretkey', 'redirecturi', 'authorizeurl', 'tokenurl'],
       actions: [
         {
           api: 'registerOauthProvider',
@@ -89,11 +89,11 @@ export default {
           listView: true,
           dataView: false,
           args: [
-            'provider', 'description', 'clientid', 'redirecturi', 'secretkey'
+            'provider', 'description', 'clientid', 'redirecturi', 'secretkey', 'authorizeurl', 'tokenurl'
           ],
           mapping: {
             provider: {
-              options: ['google', 'github']
+              options: ['google', 'github', 'keycloak']
             }
           }
         },
@@ -103,7 +103,7 @@ export default {
           label: 'label.edit',
           dataView: true,
           popup: true,
-          args: ['description', 'clientid', 'redirecturi', 'secretkey']
+          args: ['description', 'clientid', 'redirecturi', 'secretkey', 'authorizeurl', 'tokenurl']
         },
         {
           api: 'updateOauthProvider',
diff --git a/ui/src/config/section/keypair.js b/ui/src/config/section/keypair.js
new file mode 100644
index 00000000000..86486db19c3
--- /dev/null
+++ b/ui/src/config/section/keypair.js
@@ -0,0 +1,69 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import { shallowRef, defineAsyncComponent } from 'vue'
+import store from '@/store'
+
+export default {
+  name: 'keypair',
+  identifier: 'keypairid',
+  title: 'label.apikeypairs',
+  icon: 'key-outlined',
+  hidden: true,
+  docHelp: 'adminguide/accounts.html#keypairs',
+  permission: ['listUserKeys'],
+  columns: [
+    'name',
+    { field: 'startdate', customTitle: 'apikeypair.startdate' },
+    { field: 'enddate', customTitle: 'apikeypair.enddate' },
+    'username', 'rolename'
+  ],
+  details: [
+    'id', 'name', 'description',
+    'domain', 'role', 'roletype',
+    { field: 'accountname', customTitle: 'account' }, 'username',
+    { field: 'startdate', customTitle: 'apikeypair.startdate' },
+    { field: 'enddate', customTitle: 'apikeypair.enddate' },
+    'created'
+  ],
+  tabs: [{
+    name: 'details',
+    component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))
+  }, {
+    name: 'rules',
+    component: shallowRef(defineAsyncComponent(() => import('@/views/iam/ApiKeyPairPermissionTable.vue'))),
+    show: () => { return 'listUserKeyRules' in store.getters.apis }
+  }],
+  actions: [
+    {
+      api: 'deleteUserKeys',
+      icon: 'delete-outlined',
+      label: 'label.action.delete.keypair',
+      message: 'message.delete.keypair',
+      dataView: true,
+      args: ['keypairid'],
+      mapping: {
+        keypairid: {
+          value: (record) => { return record.id }
+        }
+      },
+      show: () => {
+        return 'deleteUserKeys' in store.getters.apis
+      }
+    }
+  ]
+}
diff --git a/ui/src/config/section/user.js b/ui/src/config/section/user.js
index eaaca983dc0..a2808356233 100644
--- a/ui/src/config/section/user.js
+++ b/ui/src/config/section/user.js
@@ -63,6 +63,12 @@ export default {
       resourceType: 'User',
       component: shallowRef(defineAsyncComponent(() => import('@/components/view/EventsTab.vue'))),
       show: () => { return 'listEvents' in store.getters.apis }
+    },
+    {
+      name: 'apikeypairs',
+      resourceType: 'User',
+      component: shallowRef(defineAsyncComponent(() => import('@/components/view/ApiKeyPairsTab.vue'))),
+      show: () => { return 'listUserKeys' in store.getters.apis }
     }
   ],
   actions: [
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index aa647ecfbee..53329a508e5 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -1124,7 +1124,6 @@ export default {
       this.loading = true
       if (this.$route.path.startsWith('/cniconfiguration')) {
         params.forcks = true
-        console.log('here')
       }
       if (this.$route.params && this.$route.params.id) {
         params.id = this.$route.params.id
@@ -1137,6 +1136,10 @@ export default {
             params.name = this.$route.params.id
           }
         }
+        if (['listUserKeys'].includes(this.apiName)) {
+          delete params.listall
+          params.keypairid = this.$route.params.id
+        }
         if (['listPublicIpAddresses'].includes(this.apiName)) {
           params.allocatedonly = false
         }
@@ -1262,7 +1265,7 @@ export default {
         if (this.items.length <= 0 && this.dataView) {
           this.$router.push({ path: '/exception/404' })
         }
-        if (!this.showAction || this.dataView) {
+        if (!this.showAction || this.dataView || (this.items.length === 1 && this.apiName === 'getUserKeys')) {
           this.resource = this.items?.[0] || {}
           this.$emit('change-resource', this.resource)
         }
diff --git a/ui/src/views/auth/Login.vue b/ui/src/views/auth/Login.vue
index 24065f47b1a..acb874dc75b 100644
--- a/ui/src/views/auth/Login.vue
+++ b/ui/src/views/auth/Login.vue
@@ -186,8 +186,8 @@
           :href="getGitHubUrl(from)"
           class="auth-btn github-auth"
           style="height: 38px; width: 185px; padding: 0; margin-bottom: 5px;" >
-          <img src="/assets/github.svg" style="width: 32px; padding: 5px" />
-          <a-typography-text>Sign in with Github</a-typography-text>
+          <img src="/assets/github.svg" alt="GitHub" style="width: 32px; padding: 5px" />
+          <a-typography-text>Sign in with GitHub</a-typography-text>
         </a-button>
       </div>
       <div class="social-auth" v-if="googleprovider">
@@ -198,10 +198,22 @@
           :href="getGoogleUrl(from)"
           class="auth-btn google-auth"
           style="height: 38px; width: 185px; padding: 0" >
-          <img src="/assets/google.svg" style="width: 32px; padding: 5px" />
+          <img src="/assets/google.svg" alt="Google" style="width: 32px; padding: 5px" />
           <a-typography-text>Sign in with Google</a-typography-text>
         </a-button>
       </div>
+      <div class="social-auth" v-if="keycloakprovider">
+        <a-button
+          @click="handleKeycloakProviderAndDomain"
+          tag="a"
+          color="primary"
+          :href="getKeycloakUrl(from)"
+          class="auth-btn keycloak-auth"
+          style="height: 38px; width: 185px; padding: 0" >
+          <img src="/assets/keycloak.svg" alt="Keycloak" style="width: 32px; padding: 5px" />
+          <a-typography-text>Sign in with Keycloak</a-typography-text>
+        </a-button>
+      </div>
     </div>
   </a-form>
 </template>
@@ -231,10 +243,14 @@ export default {
       socialLogin: false,
       googleprovider: false,
       githubprovider: false,
+      keycloakprovider: false,
       googleredirecturi: '',
       githubredirecturi: '',
+      keycloakredirecturi: '',
       googleclientid: '',
       githubclientid: '',
+      keycloakclientid: '',
+      keycloakauthorizeurl: '',
       loginType: 0,
       state: {
         time: 60,
@@ -325,8 +341,14 @@ export default {
               this.githubclientid = item.clientid
               this.githubredirecturi = item.redirecturi
             }
+            if (item.provider === 'keycloak') {
+              this.keycloakprovider = item.enabled
+              this.keycloakclientid = item.clientid
+              this.keycloakredirecturi = item.redirecturi
+              this.keycloakauthorizeurl = item.authorizeurl
+            }
           })
-          this.socialLogin = this.googleprovider || this.githubprovider
+          this.socialLogin = this.googleprovider || this.githubprovider || this.keycloakprovider
         }
       })
       postAPI('forgotPassword', {}).then(response => {
@@ -362,6 +384,10 @@ export default {
       this.handleDomain()
       this.$store.commit('SET_OAUTH_PROVIDER_USED_TO_LOGIN', 'google')
     },
+    handleKeycloakProviderAndDomain () {
+      this.handleDomain()
+      this.$store.commit('SET_OAUTH_PROVIDER_USED_TO_LOGIN', 'keycloak')
+    },
     handleDomain () {
       const values = toRaw(this.form)
       if (!values.domain) {
@@ -401,6 +427,20 @@ export default {
 
       return `${rootUrl}?${qs.toString()}`
     },
+    getKeycloakUrl (from) {
+      const rootURl = this.keycloakauthorizeurl
+      const options = {
+        redirect_uri: this.keycloakredirecturi,
+        client_id: this.keycloakclientid,
+        response_type: 'code',
+        scope: 'openid email',
+        state: 'cloudstack'
+      }
+
+      const qs = new URLSearchParams(options)
+
+      return `${rootURl}?${qs.toString()}`
+    },
     handleSubmit (e) {
       e.preventDefault()
       if (this.state.loginBtn) return
diff --git a/ui/src/views/compute/AttachIso.vue b/ui/src/views/compute/AttachIso.vue
index 60694cb8f57..daa555c4538 100644
--- a/ui/src/views/compute/AttachIso.vue
+++ b/ui/src/views/compute/AttachIso.vue
@@ -17,23 +17,38 @@
 <template>
   <div class="form-layout" v-ctrl-enter="handleSubmit">
     <a-spin :spinning="loading">
+      <a-alert
+        v-if="!loading && maxSelections === 0"
+        type="warning"
+        showIcon
+        :message="$t('label.iso.name') + ': max reached'"
+        style="margin-bottom: 12px;" />
       <a-form
         :ref="formRef"
         :model="form"
         :rules="rules"
         layout="vertical"
         @finish="handleSubmit">
-        <a-form-item :label="$t('label.iso.name')" ref="id" name="id">
+        <a-form-item
+          :label="$t('label.iso.name') + ' (' + form.ids.length + ' / ' + maxSelections + ')'"
+          ref="ids"
+          name="ids">
           <a-select
+            mode="multiple"
             :loading="loading"
-            v-model:value="form.id"
+            v-model:value="form.ids"
             v-focus="true"
+            :disabled="maxSelections === 0"
             showSearch
             optionFilterProp="label"
             :filterOption="(input, option) => {
               return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
             }">
-            <a-select-option v-for="iso in isos" :key="iso.id" :label="iso.displaytext || iso.name">
+            <a-select-option
+              v-for="iso in isos"
+              :key="iso.id"
+              :label="iso.displaytext || iso.name"
+              :disabled="form.ids.length >= maxSelections && !form.ids.includes(iso.id)">
               {{ iso.displaytext || iso.name }}
             </a-select-option>
           </a-select>
@@ -69,19 +84,44 @@ export default {
   data () {
     return {
       loading: false,
-      isos: []
+      isos: [],
+      maxSelections: 1
     }
   },
   created () {
     this.initForm()
+    this.computeMaxSelections()
     this.fetchData()
   },
+  watch: {
+    'form.ids' (newVal) {
+      if (newVal && newVal.length > this.maxSelections) {
+        this.form.ids = newVal.slice(0, this.maxSelections)
+        this.$message.warning(this.$t('label.iso.name') + ': max ' + this.maxSelections)
+      }
+    }
+  },
   methods: {
+    computeMaxSelections () {
+      // Server pre-computes the effective cap (cluster-scoped vm.iso.max.count clamped to
+      // the hypervisor's own limit) and exposes it on the VM as isomaxcount.
+      const effectiveCap = this.resource.isomaxcount != null
+        ? this.resource.isomaxcount
+        : (this.resource.hypervisor === 'KVM' ? 2 : 1)
+      const alreadyAttached = (this.resource.isos && this.resource.isos.length) ||
+        (this.resource.isoid ? 1 : 0)
+      this.maxSelections = Math.max(0, effectiveCap - alreadyAttached)
+    },
     initForm () {
       this.formRef = ref()
-      this.form = reactive({})
+      this.form = reactive({ ids: [] })
       this.rules = reactive({
-        id: [{ required: true, message: `${this.$t('label.required')}` }]
+        ids: [{
+          required: true,
+          type: 'array',
+          min: 1,
+          message: `${this.$t('label.required')}`
+        }]
       })
     },
     fetchData () {
@@ -93,9 +133,6 @@ export default {
       })
       Promise.all(promises).then(() => {
         this.isos = _.uniqBy(this.isos, 'id')
-        if (this.isos.length > 0) {
-          this.form.id = this.isos[0].id
-        }
       }).catch((error) => {
         console.log(error)
       }).finally(() => {
@@ -127,35 +164,42 @@ export default {
       if (this.loading) return
       this.formRef.value.validate().then(() => {
         const values = toRaw(this.form)
-        const params = {
-          id: values.id,
-          virtualmachineid: this.resource.id
-        }
-
-        if (values.forced) {
-          params.forced = values.forced
-        }
+        const ids = values.ids || []
+        if (ids.length === 0) return
 
         this.loading = true
         const title = this.$t('label.action.attach.iso')
-        postAPI('attachIso', params).then(json => {
-          const jobId = json.attachisoresponse.jobid
-          if (jobId) {
-            this.$pollJob({
-              jobId,
-              title,
-              description: values.id,
-              successMessage: `${this.$t('label.action.attach.iso')} ${this.$t('label.success')}`,
-              loadingMessage: `${title} ${this.$t('label.in.progress')}`,
-              catchMessage: this.$t('error.fetching.async.job.result')
-            })
+        // attachIso is single-ISO server-side; fan out one call per selection.
+        const sendOne = (isoId) => {
+          const params = {
+            id: isoId,
+            virtualmachineid: this.resource.id
           }
-          this.closeAction()
-        }).catch(error => {
-          this.$notifyError(error)
-        }).finally(() => {
-          this.loading = false
-        })
+          if (values.forced) {
+            params.forced = values.forced
+          }
+          return new Promise((resolve, reject) => {
+            postAPI('attachIso', params).then(json => {
+              const jobId = json.attachisoresponse && json.attachisoresponse.jobid
+              if (jobId) {
+                this.$pollJob({
+                  jobId,
+                  title,
+                  description: isoId,
+                  successMessage: `${this.$t('label.action.attach.iso')} ${this.$t('label.success')}`,
+                  loadingMessage: `${title} ${this.$t('label.in.progress')}`,
+                  catchMessage: this.$t('error.fetching.async.job.result')
+                })
+              }
+              resolve()
+            }).catch(reject)
+          })
+        }
+
+        ids.reduce((p, id) => p.then(() => sendOne(id)), Promise.resolve())
+          .then(() => { this.closeAction() })
+          .catch(error => { this.$notifyError(error) })
+          .finally(() => { this.loading = false })
       }).catch(error => {
         this.formRef.value.scrollToField(error.errorFields[0].name)
       })
diff --git a/ui/src/views/compute/DetachIso.vue b/ui/src/views/compute/DetachIso.vue
new file mode 100644
index 00000000000..1e9f3cf1bc0
--- /dev/null
+++ b/ui/src/views/compute/DetachIso.vue
@@ -0,0 +1,178 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-spin :spinning="loading">
+      <a-form
+        :ref="formRef"
+        :model="form"
+        :rules="rules"
+        layout="vertical"
+        @finish="handleSubmit">
+        <a-form-item
+          :label="$t('label.iso.name') + ' (' + form.ids.length + ' / ' + attached.length + ')'"
+          ref="ids"
+          name="ids">
+          <a-select
+            mode="multiple"
+            :loading="loading"
+            v-model:value="form.ids"
+            v-focus="true">
+            <a-select-option
+              v-for="iso in attached"
+              :key="iso.id"
+              :label="iso.displaytext || iso.name">
+              {{ (iso.displaytext || iso.name) + ' (' + slotLabel(iso.deviceseq) + ')' }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item
+          :label="$t('label.forced')"
+          v-if="resource && resource.hypervisor === 'VMware'"
+          ref="forced"
+          name="forced">
+          <a-switch v-model:checked="form.forced" v-focus="true" />
+        </a-form-item>
+      </a-form>
+      <div :span="24" class="action-button">
+        <a-button @click="closeAction">{{ $t('label.cancel') }}</a-button>
+        <a-button :loading="loading" type="primary" @click="handleSubmit" ref="submit">{{ $t('label.ok') }}</a-button>
+      </div>
+    </a-spin>
+  </div>
+</template>
+<script>
+import { ref, reactive, toRaw } from 'vue'
+import { postAPI } from '@/api'
+
+export default {
+  name: 'DetachIso',
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      loading: false,
+      attached: []
+    }
+  },
+  created () {
+    this.initForm()
+    this.populateAttached()
+  },
+  methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({ ids: [] })
+      this.rules = reactive({
+        ids: [{
+          required: true,
+          type: 'array',
+          min: 1,
+          message: `${this.$t('label.required')}`
+        }]
+      })
+    },
+    populateAttached () {
+      if (this.resource.isos && this.resource.isos.length > 0) {
+        this.attached = [...this.resource.isos].sort((a, b) => (a.deviceseq || 0) - (b.deviceseq || 0))
+      } else if (this.resource.isoid) {
+        this.attached = [{
+          id: this.resource.isoid,
+          name: this.resource.isoname,
+          displaytext: this.resource.isodisplaytext,
+          deviceseq: 3
+        }]
+      }
+      if (this.attached.length === 1) {
+        this.form.ids = [this.attached[0].id]
+      }
+    },
+    slotLabel (deviceseq) {
+      // 3 -> hdc, 4 -> hdd, ... matches LibvirtVMDef.getDevLabel for the IDE bus on KVM.
+      if (typeof deviceseq !== 'number') return ''
+      return 'hd' + String.fromCharCode('a'.charCodeAt(0) + deviceseq - 1)
+    },
+    closeAction () {
+      this.$emit('close-action')
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const values = toRaw(this.form)
+        const ids = values.ids || []
+        if (ids.length === 0) return
+
+        this.loading = true
+        const title = this.$t('label.action.detach.iso')
+        // detachIso is single-ISO server-side; fan out one call per selection.
+        const sendOne = (isoId) => {
+          const params = {
+            virtualmachineid: this.resource.id
+          }
+          // Single-attached: omit id so older servers (without the id parameter) still accept the call.
+          if (this.attached.length > 1 || ids.length > 1) {
+            params.id = isoId
+          }
+          if (values.forced) {
+            params.forced = values.forced
+          }
+          return new Promise((resolve, reject) => {
+            postAPI('detachIso', params).then(json => {
+              const jobId = json.detachisoresponse && json.detachisoresponse.jobid
+              if (jobId) {
+                this.$pollJob({
+                  jobId,
+                  title,
+                  description: isoId,
+                  successMessage: `${this.$t('label.action.detach.iso')} ${this.$t('label.success')}`,
+                  loadingMessage: `${title} ${this.$t('label.in.progress')}`,
+                  catchMessage: this.$t('error.fetching.async.job.result')
+                })
+              }
+              resolve()
+            }).catch(reject)
+          })
+        }
+
+        ids.reduce((p, id) => p.then(() => sendOne(id)), Promise.resolve())
+          .then(() => { this.closeAction() })
+          .catch(error => { this.$notifyError(error) })
+          .finally(() => { this.loading = false })
+      }).catch(error => {
+        this.formRef.value.scrollToField(error.errorFields[0].name)
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.form-layout {
+  width: 80vw;
+  @media (min-width: 700px) {
+    width: 600px;
+  }
+}
+
+.form {
+  margin: 10px 0;
+}
+</style>
diff --git a/ui/src/views/compute/InstanceTab.vue b/ui/src/views/compute/InstanceTab.vue
index 9576e70c8d5..5550d95349d 100644
--- a/ui/src/views/compute/InstanceTab.vue
+++ b/ui/src/views/compute/InstanceTab.vue
@@ -28,10 +28,15 @@
       <a-tab-pane :tab="$t('label.metrics')" key="stats">
         <StatsTab :resource="resource"/>
       </a-tab-pane>
-      <a-tab-pane :tab="$t('label.iso')" key="cdrom" v-if="vm.isoid">
-        <usb-outlined />
-        <router-link :to="{ path: '/iso/' + vm.isoid }">{{ vm.isoname }}</router-link> <br/>
-        <barcode-outlined /> {{ vm.isoid }}
+      <a-tab-pane :tab="$t('label.iso')" key="cdrom" v-if="attachedIsos.length > 0">
+        <div v-for="iso in attachedIsos" :key="iso.id" style="margin-bottom: 12px;">
+          <usb-outlined />
+          <router-link :to="{ path: '/iso/' + iso.id }">{{ iso.displaytext || iso.name }}</router-link>
+          <a-tag style="margin-left: 8px;">{{ slotLabel(iso.deviceseq) }}</a-tag>
+          <a-tag v-if="iso.bootable" color="blue" style="margin-left: 4px;">{{ $t('label.bootable') }}</a-tag>
+          <br/>
+          <barcode-outlined /> {{ iso.id }}
+        </div>
       </a-tab-pane>
       <a-tab-pane :tab="$t('label.volumes')" key="volumes" v-if="'listVolumes' in $store.getters.apis">
         <a-button
@@ -87,9 +92,14 @@
           :routerlinks="(record) => { return { name: '/securitygroups/' + record.id } }"
           :showSearch="false"/>
       </a-tab-pane>
-      <a-tab-pane :tab="$t('label.schedules')" key="schedules" v-if="'listVMSchedule' in $store.getters.apis">
-        <InstanceSchedules
-          :virtualmachine="vm"
+      <a-tab-pane
+        :tab="$t('label.schedules')"
+        key="schedules"
+        v-if="'listResourceSchedule' in $store.getters.apis && !dataResource.autoscalevmgroupid"
+      >
+        <ResourceSchedules
+          :resource="vm"
+          resourceType="VirtualMachine"
           :loading="loading"/>
       </a-tab-pane>
       <a-tab-pane :tab="$t('label.settings')" key="settings">
@@ -145,7 +155,7 @@ import EventsTab from '@/components/view/EventsTab'
 import DetailSettings from '@/components/view/DetailSettings'
 import CreateVolume from '@/views/storage/CreateVolume'
 import NicsTab from '@/views/network/NicsTab'
-import InstanceSchedules from '@/views/compute/InstanceSchedules.vue'
+import ResourceSchedules from '@/views/compute/ResourceSchedules.vue'
 import ListResourceTable from '@/components/view/ListResourceTable'
 import TooltipButton from '@/components/widgets/TooltipButton'
 import ResourceIcon from '@/components/view/ResourceIcon'
@@ -165,7 +175,7 @@ export default {
     CreateVolume,
     NicsTab,
     GPUTab,
-    InstanceSchedules,
+    ResourceSchedules,
     ListResourceTable,
     SecurityGroupSelection,
     TooltipButton,
@@ -226,7 +236,28 @@ export default {
   mounted () {
     this.setCurrentTab()
   },
+  computed: {
+    attachedIsos () {
+      if (this.vm.isos && this.vm.isos.length > 0) {
+        return [...this.vm.isos].sort((a, b) => (a.deviceseq || 0) - (b.deviceseq || 0))
+      }
+      if (this.vm.isoid) {
+        return [{
+          id: this.vm.isoid,
+          name: this.vm.isoname,
+          displaytext: this.vm.isodisplaytext,
+          deviceseq: 3
+        }]
+      }
+      return []
+    }
+  },
   methods: {
+    slotLabel (deviceseq) {
+      // 3 -> hdc, 4 -> hdd, ... matches LibvirtVMDef.getDevLabel for the IDE bus on KVM.
+      if (typeof deviceseq !== 'number') return ''
+      return 'hd' + String.fromCharCode('a'.charCodeAt(0) + deviceseq - 1)
+    },
     setCurrentTab () {
       this.currentTab = this.$route.query.tab ? this.$route.query.tab : 'details'
     },
diff --git a/ui/src/views/compute/InstanceSchedules.vue b/ui/src/views/compute/ResourceSchedules.vue
similarity index 71%
rename from ui/src/views/compute/InstanceSchedules.vue
rename to ui/src/views/compute/ResourceSchedules.vue
index 30c545ccd06..0e7711b456f 100644
--- a/ui/src/views/compute/InstanceSchedules.vue
+++ b/ui/src/views/compute/ResourceSchedules.vue
@@ -22,7 +22,7 @@
       style="width: 100%; margin-bottom: 10px"
       @click="showAddModal"
       :loading="loading"
-      :disabled="!('createVMSchedule' in $store.getters.apis)"
+      :disabled="!('createResourceSchedule' in $store.getters.apis)"
     >
       <template #icon><plus-outlined /></template> {{ $t('label.schedule.add') }}
     </a-button>
@@ -34,10 +34,31 @@
       :selectedColumns="selectedColumnKeys"
       ref="listview"
       @update-selected-columns="updateSelectedColumns"
-      @update-vm-schedule="updateVMSchedule"
-      @remove-vm-schedule="removeVMSchedule"
       @refresh="this.fetchData"
-    />
+    >
+      <template #scheduleActions="{ record }">
+        <tooltip-button
+          :tooltip="$t('label.edit')"
+          :disabled="!('updateResourceSchedule' in $store.getters.apis)"
+          icon="edit-outlined"
+          @onClick="updateSchedule(record)"
+        />
+        <a-popconfirm
+          :title="$t('label.delete') + ' ' + $t('label.schedule') + '?'"
+          :okText="$t('label.yes')"
+          :cancelText="$t('label.no')"
+          @confirm="removeSchedule(record)"
+        >
+          <tooltip-button
+            :tooltip="$t('label.remove')"
+            :disabled="!('deleteResourceSchedule' in $store.getters.apis)"
+            icon="delete-outlined"
+            :danger="true"
+            type="primary"
+          />
+        </a-popconfirm>
+      </template>
+    </list-view>
     <a-pagination
       class="row-element"
       style="margin-top: 10px"
@@ -91,6 +112,7 @@
         />
       </a-form-item>
       <a-form-item
+        v-if="actions.length > 1"
         name="action"
         ref="action"
         :wrapperCol="{ span: 24 }"
@@ -115,6 +137,41 @@
           </a-radio-button>
         </a-radio-group>
       </a-form-item>
+      <a-row
+        v-if="resourceType === 'AutoScaleVmGroup'"
+        justify="space-between"
+      >
+        <a-col :span="11">
+          <a-form-item
+            name="minMembers"
+            ref="minMembers"
+          >
+            <template #label>
+              <tooltip-label :title="$t('label.minmembers')" />
+            </template>
+            <a-input-number
+              v-model:value="form.minMembers"
+              :min="1"
+              style="width: 100%"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="11">
+          <a-form-item
+            name="maxMembers"
+            ref="maxMembers"
+          >
+            <template #label>
+              <tooltip-label :title="$t('label.maxmembers')" />
+            </template>
+            <a-input-number
+              v-model:value="form.maxMembers"
+              :min="1"
+              style="width: 100%"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-form-item
         name="timezone"
         ref="timezone"
@@ -256,6 +313,7 @@ import { reactive, ref, toRaw } from 'vue'
 import { getAPI, postAPI } from '@/api'
 import ListView from '@/components/view/ListView'
 import Status from '@/components/widgets/Status'
+import TooltipButton from '@/components/widgets/TooltipButton'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
 import { mixinForm } from '@/utils/mixin'
 import { timeZone } from '@/utils/timezone'
@@ -269,39 +327,49 @@ dayjs.extend(utc)
 dayjs.extend(timezone)
 
 export default {
-  name: 'InstanceSchedules',
+  name: 'ResourceSchedules',
   mixins: [mixinForm],
   components: {
     Status,
     ListView,
+    TooltipButton,
     TooltipLabel
   },
   props: {
-    virtualmachine: {
+    resource: {
       type: Object,
       required: true
     },
+    resourceType: {
+      type: String,
+      required: true
+    },
     loading: {
       type: Boolean,
-      required: true
+      default: false
     }
   },
   data () {
     this.fetchTimeZone = debounce(this.fetchTimeZone, 800)
     return {
       tabLoading: false,
-      columnKeys: ['action', 'enabled', 'description', 'schedule', 'timezone', 'startdate', 'enddate', 'created', 'vmScheduleActions'],
+      columnKeys: ['action', 'enabled', 'description', 'schedule', 'timezone', 'startdate', 'enddate', 'created', 'scheduleActions'],
       selectedColumnKeys: [],
       columns: [],
       schedules: [],
       timeZoneMap: [],
-      actions: [
-        { value: 'START', label: 'label.start' },
-        { value: 'STOP', label: 'label.stop' },
-        { value: 'REBOOT', label: 'label.reboot' },
-        { value: 'FORCE_STOP', label: 'label.force.stop' },
-        { value: 'FORCE_REBOOT', label: 'label.force.reboot' }
-      ],
+      resourceActionsMap: {
+        VirtualMachine: [
+          { value: 'START', label: 'label.start' },
+          { value: 'STOP', label: 'label.stop' },
+          { value: 'REBOOT', label: 'label.reboot' },
+          { value: 'FORCE_STOP', label: 'label.force.stop' },
+          { value: 'FORCE_REBOOT', label: 'label.force.reboot' }
+        ],
+        AutoScaleVmGroup: [
+          { value: 'UPDATE', label: 'label.update.members' }
+        ]
+      },
       periods: [
         { id: 'year', value: ['month', 'day', 'dayOfWeek', 'hour', 'minute'] },
         { id: 'month', value: ['day', 'dayOfWeek', 'hour', 'minute'] },
@@ -319,7 +387,7 @@ export default {
     }
   },
   beforeCreate () {
-    this.apiParams = this.$getApiParams('createVMSchedule')
+    this.apiParams = this.$getApiParams('createResourceSchedule')
   },
   computed: {
     pageSizeOptions () {
@@ -330,10 +398,19 @@ export default {
       return [...new Set(sizes)].sort(function (a, b) {
         return a - b
       }).map(String)
+    },
+    actions () {
+      return this.resourceActionsMap[this.resourceType] || []
     }
   },
   created () {
     this.selectedColumnKeys = this.columnKeys
+    if (this.resourceType === 'AutoScaleVmGroup') {
+      this.columnKeys = ['enabled', 'description', 'schedule', 'minmembers',
+        'maxmembers', 'timezone', 'startdate', 'enddate', 'created',
+        'scheduleActions']
+      this.selectedColumnKeys = [...this.columnKeys]
+    }
     this.updateColumns()
     this.pageSize = this.pageSizeOptions[0] * 1
     this.initForm()
@@ -341,7 +418,8 @@ export default {
     this.fetchTimeZone()
   },
   watch: {
-    virtualmachine: {
+    resource: {
+      deep: true,
       handler () {
         this.fetchSchedules()
       }
@@ -351,10 +429,12 @@ export default {
     initForm () {
       this.formRef = ref()
       this.form = reactive({
-        action: 'START',
+        action: this.actions.length > 0 ? this.actions[0].value : null,
         schedule: '* * * * *',
         description: '',
         timezone: 'UTC',
+        minMembers: null,
+        maxMembers: null,
         startDate: '',
         endDate: '',
         enabled: true,
@@ -363,19 +443,22 @@ export default {
       this.rules = reactive({
         schedule: [{ type: 'string', required: true, message: this.$t('message.error.required.input') }],
         action: [{ type: 'string', required: true, message: this.$t('message.error.required.input') }],
+        minMembers: [{ required: this.resourceType === 'AutoScaleVmGroup', message: this.$t('message.error.required.input') }],
+        maxMembers: [{ required: this.resourceType === 'AutoScaleVmGroup', message: this.$t('message.error.required.input') }],
         timezone: [{ required: true, message: `${this.$t('message.error.select')}` }],
         startDate: [{ required: false, message: `${this.$t('message.error.select')}` }],
         endDate: [{ required: false, message: `${this.$t('message.error.select')}` }]
       })
     },
-    createVMSchedule (schedule) {
+    createSchedule (schedule) {
       this.resetForm()
       this.showAddModal()
     },
-    removeVMSchedule (schedule) {
-      postAPI('deleteVMSchedule', {
+    removeSchedule (schedule) {
+      postAPI('deleteResourceSchedule', {
         id: schedule.id,
-        virtualmachineid: this.virtualmachine.id
+        resourceid: this.resource.id,
+        resourcetype: this.resourceType
       }).then(() => {
         if (this.totalCount - 1 === this.pageSize * (this.page - 1)) {
           this.page = this.page - 1 > 0 ? this.page - 1 : 1
@@ -384,22 +467,23 @@ export default {
         this.$message.success(message)
       }).catch(error => {
         console.error(error)
-        this.$message.error(this.$t('message.error.remove.vm.schedule'))
+        this.$message.error(this.$t('message.error.remove.resource.schedule'))
         this.$notification.error({
           message: this.$t('label.error'),
-          description: this.$t('message.error.remove.vm.schedule')
+          description: this.$t('message.error.remove.resource.schedule')
         })
       }).finally(() => {
         this.fetchData()
       })
     },
-    updateVMSchedule (schedule) {
+    updateSchedule (schedule) {
       this.resetForm()
       this.isEdit = true
       Object.assign(this.form, schedule)
-      // Some weird issue when we directly pass in the moment with tz object
-      this.form.startDate = dayjs(schedule.startdate).tz(schedule.timezone)
-      this.form.endDate = schedule.enddate ? dayjs(dayjs(schedule.enddate).tz(schedule.timezone)) : null
+      this.form.minMembers = schedule?.details?.minmembers ? Number(schedule.details.minmembers) : null
+      this.form.maxMembers = schedule?.details?.maxmembers ? Number(schedule.details.maxmembers) : null
+      this.form.startDate = dayjs(schedule.startdate)
+      this.form.endDate = schedule.enddate ? dayjs(schedule.enddate) : null
       this.showAddModal()
     },
     showAddModal () {
@@ -411,28 +495,34 @@ export default {
       this.formRef.value.validate().then(() => {
         const formRaw = toRaw(this.form)
         const values = this.handleRemoveFields(formRaw)
+        const selectedAction = values.action || (this.actions.length === 1 ? this.actions[0].value : null)
         var params = {
           description: values.description,
           schedule: values.schedule,
           timezone: values.timezone,
-          action: values.action,
-          virtualmachineid: this.virtualmachine.id,
+          action: selectedAction,
+          resourceid: this.resource.id,
+          resourcetype: this.resourceType,
           enabled: values.enabled,
           startdate: (values.startDate) ? values.startDate.format(this.pattern) : null,
           enddate: (values.endDate) ? values.endDate.format(this.pattern) : null
         }
+        if (this.resourceType === 'AutoScaleVmGroup') {
+          params['details[0].minmembers'] = values.minMembers
+          params['details[1].maxmembers'] = values.maxMembers
+        }
         let command = null
         if (this.form.id === null || this.form.id === undefined) {
-          command = 'createVMSchedule'
+          command = 'createResourceSchedule'
         } else {
           params.id = this.form.id
-          command = 'updateVMSchedule'
+          command = 'updateResourceSchedule'
         }
 
         postAPI(command, params).then(response => {
           this.$notification.success({
             message: this.$t('label.schedule'),
-            description: this.$t('message.success.config.vm.schedule')
+            description: this.$t('message.success.config.resource.schedule')
           })
           this.isSubmitted = false
           this.fetchData()
@@ -446,7 +536,6 @@ export default {
         if (error.errorFields !== undefined) {
           this.formRef.value.scrollToField(error.errorFields[0].name)
         }
-      }).finally(() => {
         this.isSubmitted = false
       })
     },
@@ -475,20 +564,30 @@ export default {
     },
     fetchSchedules () {
       this.schedules = []
-      if (!this.virtualmachine.id) {
+      if (!this.resource.id) {
         return
       }
       const params = {
         page: this.page,
         pagesize: this.pageSize,
-        virtualmachineid: this.virtualmachine.id,
+        resourceid: this.resource.id,
+        resourcetype: this.resourceType,
         listall: true
       }
       this.tabLoading = true
-      getAPI('listVMSchedule', params).then(json => {
+      getAPI('listResourceSchedule', params).then(json => {
         this.schedules = []
-        this.totalCount = json?.listvmscheduleresponse?.count || 0
-        this.schedules = json?.listvmscheduleresponse?.vmschedule || []
+        this.totalCount = json?.listresourcescheduleresponse?.count || 0
+        const rawSchedules = json?.listresourcescheduleresponse?.resourceschedule || []
+        this.schedules = rawSchedules.map(s => ({
+          ...s,
+          minmembers: s.details?.minmembers,
+          maxmembers: s.details?.maxmembers
+        }))
+      }).catch(error => {
+        console.error(error)
+        this.$notifyError(error)
+      }).finally(() => {
         this.tabLoading = false
       })
     },
@@ -510,20 +609,16 @@ export default {
     },
     updateColumns () {
       this.columns = []
+      const columnTitleMap = {
+        enabled: this.$t('label.state'),
+        startdate: this.$t('label.start.date.and.time'),
+        enddate: this.$t('label.end.date.and.time')
+      }
       for (var columnKey of this.columnKeys) {
         if (!this.selectedColumnKeys.includes(columnKey)) continue
         this.columns.push({
           key: columnKey,
-          // If columnKey is 'enabled', then title is 'state'
-          // If columnKey is 'startdate', then the title is `start.date.and.time`
-          // else title is columnKey
-          title: columnKey === 'enabled'
-            ? this.$t('label.state')
-            : columnKey === 'startdate'
-              ? this.$t('label.start.date.and.time')
-              : columnKey === 'enddate'
-                ? this.$t('label.end.date.and.time')
-                : this.$t('label.' + String(columnKey).toLowerCase()),
+          title: columnTitleMap[columnKey] || this.$t('label.' + String(columnKey).toLowerCase()),
           dataIndex: columnKey
         })
       }
diff --git a/ui/src/views/iam/ApiKeyPairPermissionTable.vue b/ui/src/views/iam/ApiKeyPairPermissionTable.vue
new file mode 100644
index 00000000000..a3670aa5578
--- /dev/null
+++ b/ui/src/views/iam/ApiKeyPairPermissionTable.vue
@@ -0,0 +1,518 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+<template>
+  <loading-outlined v-if="loadingTable" class="main-loading-spinner" />
+  <div v-else>
+    <div v-if="!disabled" class="rules-list ant-list ant-list-bordered">
+      <div class="rules-table-item ant-list-item">
+        <div class="rules-table__col rules-table__col--grab" />
+        <div class="rules-table__col rules-table__col--rule rules-table__col--new">
+          <a-auto-complete
+            :key="autocompleteKey"
+            v-focus="true"
+            :filterOption="filterOption"
+            :options="apis"
+            v-model:value="newRule"
+            :placeholder="$t('label.rule')" />
+        </div>
+        <div class="rules-table__col rules-table__col--permission">
+          <permission-editable
+            :default-value="newRulePermission"
+            :value="newRulePermission"
+            @onChange="updateNewPermission()" />
+        </div>
+        <div class="rules-table__col rules-table__col--description">
+          <a-input v-model:value="newRuleDescription" :placeholder="$t('label.description')" />
+        </div>
+        <div class="rules-table__col rules-table__col--actions">
+          <tooltip-button
+            tooltipPlacement="bottom"
+            :tooltip="$t('label.save.new.rule')"
+            icon="plus-outlined"
+            type="primary"
+            @onClick="onRuleSave" />
+        </div>
+      </div>
+
+      <draggable
+        v-model="rules"
+        @change="updateRules"
+        handle=".drag-handle"
+        ghostClass="drag-ghost"
+        :component-data="{type: 'transition'}"
+        item-key="rule">
+        <template #item="{element, index}">
+          <div class="rules-table-item ant-list-item">
+            <div class="rules-table__col rules-table__col--grab drag-handle">
+              <drag-outlined />
+            </div>
+            <div class="rules-table__col rules-table__col--rule">
+              {{ element.rule }}
+            </div>
+            <div class="rules-table__col rules-table__col--permission">
+              <permission-editable
+                :default-value="element.permission"
+                @onChange="onPermissionChange(element, $event, index)" />
+            </div>
+            <div class="rules-table__col rules-table__col--description">
+              <div v-if="element.description">
+                {{ element.description }}
+              </div>
+              <div v-else class="no-description">
+                {{ $t('message.no.description') }}
+              </div>
+            </div>
+            <div class="rules-table__col rules-table__col--actions">
+              <tooltip-button
+                :tooltip="$t('label.delete.rule')"
+                tooltipPlacement="bottom"
+                type="primary"
+                :danger="true"
+                icon="delete-outlined"
+                :disabled="false"
+                @onClick="onRuleDelete(element.rule, index)" />
+            </div>
+          </div>
+        </template>
+      </draggable>
+    </div>
+
+    <div :style="{width: '100%', display: 'flex', marginTop: this.rules.length > 0 ? '12px' : '0'}" v-if="this.rules.length > 0 && !disabled">
+      <a-button
+        style="width: 100%;"
+        danger
+        @click="deleteAllRules()">
+        <template #icon><delete-outlined /></template>
+        {{ $t('label.delete.all.rules') }}
+      </a-button>
+    </div>
+
+    <a-table
+      v-else-if="disabled"
+      :columns="columns"
+      :dataSource="rules"
+      rowKey="rule"
+      size="large"
+      :pagination="pagination"
+      @change="handlePaginationChange">
+      <template #customFilterDropdown="{ setSelectedKeys, selectedKeys, confirm, clearFilters, column }">
+        <div style="padding: 8px">
+          <a-input
+            ref="searchInput"
+            :placeholder="$t('label.search')"
+            :value="selectedKeys[0]"
+            style="width: 100%; margin-bottom: 8px; display: block"
+            @change="e => setSelectedKeys(e.target.value ? [e.target.value] : [])"
+            @pressEnter="handleSearch(selectedKeys, confirm, column.dataIndex)"
+          />
+          <div style="display: flex; gap: 8px">
+            <a-button
+              type="primary"
+              size="small"
+              style="width: 112px;"
+              @click="handleSearch(selectedKeys, confirm, column.dataIndex)">
+              <template #icon>
+                <search-outlined />
+              </template>
+              {{ $t('label.search') }}
+            </a-button>
+
+            <a-button
+              size="small"
+              style="width: 112px;"
+              @click="handleReset(clearFilters)">
+              {{ $t('label.reset') }}
+            </a-button>
+          </div>
+        </div>
+      </template>
+
+      <template #customFilterIcon="{ filtered }">
+        <search-outlined :style="{ color: filtered ? '#1890ff' : '', fontSize: '14px' }" />
+      </template>
+
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'permission'">
+          <a-tag
+            class="permission-tag"
+            :style="{
+              backgroundColor: record.permission === 'allow' ? '#d9f7be' : '#fff2f0',
+              color: record.permission === 'allow' ? '#135200' : '#cf1322'
+            }">
+            <check-outlined v-if="record.permission === 'allow'" />
+            <close-outlined v-else />
+            {{ record.permission === 'allow' ? $t('label.allow') : $t('label.deny') }}
+          </a-tag>
+        </template>
+
+        <template v-else-if="column.key === 'description' && record.description">
+          {{ record.description }}
+        </template>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script>
+import { getAPI } from '@/api'
+import draggable from 'vuedraggable'
+import PermissionEditable from './PermissionEditable'
+import TooltipButton from '@/components/widgets/TooltipButton'
+import { genericCompare } from '@/utils/sort'
+
+export default {
+  name: 'ApiKeyPairPermissionTable',
+  components: {
+    PermissionEditable,
+    draggable,
+    TooltipButton
+  },
+  props: {
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      loadingTable: true,
+      disabled: false,
+      rules: [],
+      newRule: '',
+      newRulePermission: 'allow',
+      newRuleDescription: '',
+      drag: false,
+      apis: [],
+      currRules: new Set(),
+      searchText: '',
+      searchedColumn: '',
+      columns: [
+        {
+          title: this.$t('label.rule'),
+          dataIndex: 'rule',
+          key: 'rule',
+          ellipsis: true,
+          customFilterDropdown: true,
+          onFilter: (value, record) => {
+            return record.rule.toString().toLowerCase().includes(value.toLowerCase())
+          },
+          sorter: (a, b) => { return genericCompare(a.rule || '', b.rule || '') },
+          width: 480
+        },
+        {
+          title: this.$t('label.permission'),
+          dataIndex: 'permission',
+          key: 'permission',
+          width: 160,
+          align: 'center',
+          sorter: (a, b) => { return genericCompare(a.permission || '', b.permission || '') }
+        },
+        {
+          title: this.$t('label.description'),
+          dataIndex: 'description',
+          key: 'description'
+        }
+      ],
+      pagination: {
+        pageSize: this.$store.getters.defaultListViewPageSize,
+        pageSizeOptions: ['10', '20', '40', '80', '100', '200'],
+        showSizeChanger: true
+      },
+      autocompleteKey: 0
+    }
+  },
+  async created () {
+    if (this.$route.path.startsWith('/keypair')) {
+      await this.fetchKeyData()
+      this.disabled = true
+    } else {
+      this.getApis()
+    }
+    this.loadingTable = false
+  },
+  methods: {
+    handleSearch (selectedKeys, confirm, dataIndex) {
+      confirm()
+      this.searchText = selectedKeys[0]
+      this.searchedColumn = dataIndex
+    },
+    handleReset (clearFilters) {
+      clearFilters()
+      this.searchText = ''
+    },
+    handlePaginationChange (pagination) {
+      this.pagination.pageSize = pagination.pageSize
+      this.pagination.current = pagination.current
+    },
+    filterOption (input, option) {
+      return option.value.toUpperCase().indexOf(input.toUpperCase()) >= 0
+    },
+    async fetchKeyData () {
+      try {
+        const response = await getAPI('listUserKeyRules', { keypairid: this.resource.id })
+        this.rules = response?.listuserkeyrulesresponse?.keypermission ?? []
+      } catch (e) {
+        this.$notifyError(e)
+      }
+    },
+    getApis () {
+      this.apis = Object.keys(this.$store.getters.apis).sort((a, b) => a.localeCompare(b)).map(value => { return { value: value } })
+    },
+    onRuleDelete (rule, idx) {
+      this.rules.splice(idx, 1)
+      this.currRules.delete(rule)
+      this.updateRules()
+    },
+    onRuleSave () {
+      if (!this.newRule || this.currRules.has(this.newRule)) {
+        return
+      }
+      this.rules.push({
+        rule: this.newRule,
+        permission: this.newRulePermission,
+        description: this.newRuleDescription,
+        roleid: this.resource.id
+      })
+      this.currRules.add(this.newRule)
+      this.newRule = ''
+      this.newRuleDescription = ''
+      this.autocompleteKey += 1
+      this.updateRules()
+    },
+    async deleteAllRules () {
+      this.loadingTable = true
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          this.rules = []
+          this.currRules = new Set()
+          this.updateRules()
+          resolve()
+          this.loadingTable = false
+        })
+      })
+    },
+    updateRules () {
+      this.$emit('update-rules', this.rules)
+    },
+    updateNewPermission () {
+      this.newRulePermission = (this.newRulePermission === 'allow') ? 'deny' : 'allow'
+    },
+    onPermissionChange (record, value, idx) {
+      if (!record) return
+      this.rules[idx].permission = value
+      record.permission = value
+      this.updateRules()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.main-loading-spinner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 30px;
+}
+.role-add-btn {
+  margin-bottom: 15px;
+}
+.new-role-controls {
+  display: flex;
+
+  button {
+    &:not(:last-child) {
+      margin-right: 5px;
+    }
+  }
+}
+
+.rules-list {
+  max-height: 600px;
+  overflow: auto;
+
+  &--overflow-hidden {
+    overflow: hidden;
+  }
+}
+
+.rules-table {
+  &-item {
+    position: relative;
+    display: flex;
+    align-items: stretch;
+    padding: 0;
+    flex-wrap: wrap;
+
+    @media (min-width: 760px) {
+      flex-wrap: nowrap;
+      padding-right: 25px;
+    }
+  }
+
+  &__col {
+    display: flex;
+    align-items: center;
+    padding: 15px;
+
+    @media (min-width: 760px) {
+      padding: 15px 0;
+
+      &:not(:first-child) {
+        padding-left: 20px;
+      }
+
+      &:not(:last-child) {
+        border-right: 1px solid #e8e8e8;
+        padding-right: 20px;
+      }
+    }
+
+    &--grab {
+      position: absolute;
+      top: 4px;
+      left: 0;
+      width: 100%;
+
+      @media (min-width: 760px) {
+        position: relative;
+        top: auto;
+        width: 35px;
+        padding-left: 25px;
+        justify-content: center;
+      }
+    }
+
+    &--rule,
+    &--description {
+      word-break: break-all;
+      flex: 1;
+      width: 100%;
+
+      @media (min-width: 760px) {
+        width: auto;
+      }
+    }
+
+    &--rule {
+      padding-left: 60px;
+      background-color: rgba(#e6f7ff, 0.7);
+
+      @media (min-width: 760px) {
+        padding-left: 20px;
+        background: none;
+      }
+    }
+
+    &--permission {
+      justify-content: center;
+      width: 100%;
+
+      .ant-select {
+        width: 100%;
+      }
+
+      @media (min-width: 760px) {
+        width: auto;
+
+        .ant-select {
+          width: auto;
+        }
+      }
+    }
+
+    &--actions {
+      max-width: 60px;
+      width: 100%;
+      padding-right: 0;
+
+      @media (min-width: 760px) {
+        width: auto;
+        max-width: 70px;
+        padding-right: 15px;
+      }
+    }
+
+    &--new {
+      padding-left: 15px;
+      background-color: transparent;
+
+      div {
+        width: 100%;
+      }
+    }
+  }
+}
+
+.no-description {
+  opacity: 0.4;
+  font-size: 0.7rem;
+
+  @media (min-width: 760px) {
+    display: none;
+  }
+
+}
+
+.drag-handle {
+  cursor: pointer;
+}
+
+.drag-ghost {
+  opacity: 0.5;
+  background: #f0f2f5;
+}
+
+.loading-overlay {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 5;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 3rem;
+  color: #39A7DE;
+  background-color: rgba(#fff, 0.8);
+}
+
+.permission-tag {
+  border: none;
+  border-radius: 999px;
+  padding: 2px 10px;
+  font-size: 14px;
+  font-weight: 500;
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.rules-table__col--new {
+  .ant-select {
+    width: 100%;
+  }
+}
+
+.rule-dropdown-error {
+  .ant-input {
+    border-color: #ff0000
+  }
+}
+</style>
diff --git a/ui/src/views/iam/GenerateApiKeyPair.vue b/ui/src/views/iam/GenerateApiKeyPair.vue
new file mode 100644
index 00000000000..bc0b2bb475e
--- /dev/null
+++ b/ui/src/views/iam/GenerateApiKeyPair.vue
@@ -0,0 +1,226 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <a-modal
+      v-if="showAddKeyPair"
+      :visible="showAddKeyPair"
+      :closable="true"
+      :maskClosable="false"
+      :okText="$t('label.ok')"
+      :cancelText="$t('label.cancel')"
+      style="top: 20px;"
+      width="50vw"
+      @cancel="closeModal"
+      @ok="handleSubmit"
+      :ok-button-props="{props: { type: 'default' } }"
+      :cancel-button-props="{props: { type: 'primary' } }"
+      centered>
+      <template #title>
+        {{ $t('label.action.create.api.key') }}
+      </template>
+      <a-spin :spinning="loading">
+        <a-form
+          :ref="formRef"
+          :model="form"
+          layout="vertical"
+          @finish="handleSubmit">
+          <a-alert
+            style="margin-bottom: 10px; "
+            :message="$t('message.note.about.keypair.permissions.title')"
+            :description="$t('message.note.about.keypair.permissions.body')"
+            type="info"
+            show-icon
+          />
+          <a-form-item name="name" ref="name">
+            <template #label>
+              <tooltip-label :title="$t('label.name')" :tooltip="apiParams.name.description"/>
+            </template>
+            <a-input
+              v-focus="true"
+              :placeholder="$t('label.apikeypair.name')"
+              v-model:value="form.name" />
+          </a-form-item>
+          <a-form-item name="description" ref="description">
+            <template #label>
+              <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/>
+            </template>
+            <a-input
+              v-model:value="form.description"
+              :placeholder="$t('label.apikeypair.description')" />
+          </a-form-item>
+          <a-row>
+            <a-form-item ref="startDate" name="startDate">
+              <template #label>
+                <tooltip-label :title="$t('label.start.date')" :tooltip="apiParams.startdate.description"/>
+              </template>
+              <a-date-picker
+                v-model:value="form.startDate"
+                :disabled-date="disabledStartDate"
+                show-time
+              />
+            </a-form-item>
+            <a-form-item ref="endDate" name="endDate" style="margin: 0 8px">
+              <template #label>
+                <tooltip-label :title="$t('label.end.date')" :tooltip="apiParams.enddate.description"/>
+              </template>
+              <a-date-picker
+                :disabled-date="disabledEndDate"
+                v-model:value="form.endDate"
+                show-time />
+            </a-form-item>
+          </a-row>
+          <a-form-item>
+            <template #label>
+              <tooltip-label :title="$t('label.rules')" :tooltip="apiParams.rules.description"/>
+            </template>
+            <api-key-pair-permission-table
+              :resource="resource"
+              @update-rules="updateRules"/>
+          </a-form-item>
+        </a-form>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { ref, reactive, toRaw } from 'vue'
+import { postAPI } from '@/api'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+import ApiKeyPairPermissionTable from '@/views/iam/ApiKeyPairPermissionTable.vue'
+import { dayjs, parseDayJsObject } from '@/utils/date'
+
+export default {
+  name: 'GenerateApiKeyPair',
+  components: {
+    TooltipLabel,
+    ApiKeyPairPermissionTable
+  },
+  props: {
+    showAddKeyPair: {
+      type: Boolean,
+      default: false
+    },
+    resource: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      rules: [],
+      loading: false
+    }
+  },
+  beforeCreate () {
+    this.apiParams = this.$getApiParams('registerUserKeys')
+  },
+  created () {
+    this.initForm()
+  },
+  methods: {
+    initForm () {
+      this.formRef = ref()
+      this.form = reactive({})
+    },
+    buildRequestParams () {
+      const values = toRaw(this.form)
+      this.loading = true
+      const params = {
+        name: values.name,
+        id: this.resource.id,
+        description: values.description ? values.description : null,
+        startdate: values.startDate ? parseDayJsObject({ value: values.startDate }) : null,
+        enddate: values.endDate ? parseDayJsObject({ value: values.endDate }) : null
+      }
+      for (const i in this.rules) {
+        const rule = this.rules[i]
+        params['rules[' + i + '].rule'] = rule.rule ? rule.rule : ''
+        params['rules[' + i + '].permission'] = rule.permission ? rule.permission : 'deny'
+        params['rules[' + i + '].description'] = rule.description ? rule.description : ''
+      }
+      return params
+    },
+    handleSubmit (e) {
+      if (e && typeof e.preventDefault === 'function') {
+        e.preventDefault()
+      }
+      if (this.loading) return
+      this.formRef.value.validate().then(() => {
+        const params = this.buildRequestParams()
+        this.loading = true
+        postAPI('registerUserKeys', params).then(response => {
+          this.$pollJob({
+            jobId: response.registeruserkeysresponse.jobid,
+            successMessage: this.$t('message.success.register.user.keypair', { user: this.resource.username }),
+            successMethod: () => {
+              this.fetchData()
+            },
+            errorMessage: this.$t('message.register.keypair.failed'),
+            errorMethod: () => {
+              this.fetchData()
+            },
+            loadingMessage: this.$t('label.registering.keypair', { user: this.resource.username }),
+            catchMessage: this.$t('error.fetching.async.job.result')
+          })
+        }).catch(error => {
+          this.$notification.error({
+            message: this.$t('message.request.failed'),
+            description: (error.response && error.response.headers && error.response.headers['x-description']) || error.message,
+            duration: 0
+          })
+        }).finally(() => {
+          this.loading = false
+          this.closeModal()
+        })
+      })
+    },
+    closeModal () {
+      this.form.name = null
+      this.form.description = null
+      this.form.startDate = null
+      this.form.endDate = null
+      this.rules = []
+      this.$emit('close-modal')
+    },
+    fetchData () {
+      this.$emit('fetch-data')
+    },
+    updateRules (rules) {
+      this.rules = rules
+    },
+    disabledStartDate (current) {
+      return current < dayjs().startOf('day')
+    },
+    disabledEndDate (current) {
+      return current < (this.form.startDate || dayjs().startOf('day'))
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 80vw;
+
+  @media (min-width: 600px) {
+    width: 450px;
+  }
+}
+</style>
diff --git a/ui/src/views/infra/AddPrimaryStorage.vue b/ui/src/views/infra/AddPrimaryStorage.vue
index d46396bbb3a..48dd363e0df 100644
--- a/ui/src/views/infra/AddPrimaryStorage.vue
+++ b/ui/src/views/infra/AddPrimaryStorage.vue
@@ -383,7 +383,7 @@
             <a-input v-model:value="form.radossecret" :placeholder="$t('label.rados.secret')" />
           </a-form-item>
         </div>
-        <div v-if="form.protocol === 'CLVM'">
+        <div v-if="form.protocol === 'CLVM' || form.protocol === 'CLVM_NG'">
           <a-form-item name="volumegroup" ref="volumegroup" :label="$t('label.volumegroup')">
             <a-input v-model:value="form.volumegroup" :placeholder="$t('label.volumegroup')" />
           </a-form-item>
@@ -607,7 +607,7 @@ export default {
       const cluster = this.clusters.find(cluster => cluster.id === this.form.cluster)
       this.hypervisorType = cluster.hypervisortype
       if (this.hypervisorType === 'KVM') {
-        this.protocols = ['nfs', 'SharedMountPoint', 'RBD', 'CLVM', 'Gluster', 'Linstor', 'custom', 'FiberChannel']
+        this.protocols = ['nfs', 'SharedMountPoint', 'RBD', 'CLVM', 'CLVM_NG', 'Gluster', 'Linstor', 'custom', 'FiberChannel']
         if (this.form.scope === 'host') {
           this.protocols.push('Filesystem')
         }
@@ -729,6 +729,15 @@ export default {
       }
       return url
     },
+    clvmNgURL (vgname) {
+      var url
+      if (vgname.indexOf('://') === -1) {
+        url = 'clvm_ng://localhost/' + vgname
+      } else {
+        url = vgname
+      }
+      return url
+    },
     vmfsURL (server, path) {
       var url
       if (server.indexOf('://') === -1) {
@@ -853,6 +862,9 @@ export default {
         } else if (values.protocol === 'CLVM') {
           var vg = (values.volumegroup.substring(0, 1) !== '/') ? ('/' + values.volumegroup) : values.volumegroup
           url = this.clvmURL(vg)
+        } else if (values.protocol === 'CLVM_NG') {
+          vg = (values.volumegroup.substring(0, 1) !== '/') ? ('/' + values.volumegroup) : values.volumegroup
+          url = this.clvmNgURL(vg)
         } else if (values.protocol === 'RBD') {
           url = this.rbdURL(values.radosmonitor, values.radospool, values.radosuser, values.radossecret)
           if (values.datapool) {
diff --git a/ui/src/views/infra/HostUpdate.vue b/ui/src/views/infra/HostUpdate.vue
index 1fee7a6846c..5ef762443e9 100644
--- a/ui/src/views/infra/HostUpdate.vue
+++ b/ui/src/views/infra/HostUpdate.vue
@@ -64,7 +64,22 @@
           </a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item name="oscategoryid" ref="oscategoryid">
+      <a-form-item name="guestosasrule" ref="guestosasrule">
+        <template #label>
+          <tooltip-label :title="$t('label.guestosasrule')"/>
+        </template>
+        <a-switch v-model:checked="form.guestosasrule"/>
+      </a-form-item>
+      <a-form-item v-if="form.guestosasrule" name="guestosrule" ref="guestosrule">
+        <template #label>
+          <tooltip-label :title="$t('label.guestosrule')" :tooltip="apiParams.guestosrule.description"/>
+        </template>
+        <a-textarea
+          v-model:value="form.guestosrule"
+          :placeholder="apiParams.guestosrule.name">
+        </a-textarea>
+      </a-form-item>
+      <a-form-item v-if="!form.guestosasrule" name="oscategoryid" ref="oscategoryid">
         <template #label>
           <tooltip-label :title="$t('label.oscategoryid')" :tooltip="apiParams.oscategoryid.description"/>
         </template>
@@ -149,6 +164,7 @@ export default {
   methods: {
     initForm () {
       this.formRef = ref()
+      const guestOsRule = this.resource?.guestosrule
       this.form = reactive({
         name: this.resource.name,
         hosttags: this.resource.explicithosttags,
@@ -157,7 +173,9 @@ export default {
           ? this.resource.storageaccessgroups.split(',')
           : [],
         oscategoryid: this.resource.oscategoryid,
-        externaldetails: this.resourceExternalDetails
+        externaldetails: this.resourceExternalDetails,
+        guestosasrule: guestOsRule !== undefined,
+        guestosrule: guestOsRule
       })
       this.rules = reactive({})
     },
@@ -194,7 +212,11 @@ export default {
         params.id = this.resource.id
         params.name = values.name
         params.hosttags = values.hosttags
-        params.oscategoryid = values.oscategoryid
+        if (values.guestosasrule === true) {
+          params.guestosrule = values.guestosrule
+        } else {
+          params.oscategoryid = values.oscategoryid || this.osCategories.opts.filter(os => os.name === 'None')[0]?.id
+        }
         if (values.istagarule !== undefined) {
           params.istagarule = values.istagarule
         }
@@ -205,9 +227,11 @@ export default {
         } else {
           params.cleanupexternaldetails = true
         }
+
+        Object.keys(params).forEach((key) => (params[key] == null) && delete params[key])
         this.loading = true
 
-        postAPI('updateHost', params).then(json => {
+        postAPI('updateHost', params).then(() => {
           this.$message.success({
             content: `${this.$t('label.action.update.host')} - ${values.name}`,
             duration: 2
diff --git a/ui/src/views/network/NicsTab.vue b/ui/src/views/network/NicsTab.vue
index 4c99f4f1c51..8e21db5b34d 100644
--- a/ui/src/views/network/NicsTab.vue
+++ b/ui/src/views/network/NicsTab.vue
@@ -222,6 +222,10 @@
             :placeholder="$t('label.new.secondaryip.description')"
             v-model:value="newSecondaryIp"
             v-focus="editNicResource.type!=='Shared'"></a-input>
+          <p class="modal-form__label">{{ $t('label.secondaryip.description') }}:</p>
+          <a-input
+            :placeholder="$t('label.new.secondaryip.description.description')"
+            v-model:value="newSecondaryIpDescription"></a-input>
         </div>
 
         <div style="margin-top: 10px; display: flex; justify-content:flex-end;">
@@ -326,6 +330,7 @@ export default {
       secondaryIPs: [],
       selectedNicId: '',
       newSecondaryIp: '',
+      newSecondaryIpDescription: '',
       editNicResource: {},
       listIps: {
         loading: false,
@@ -401,6 +406,7 @@ export default {
       this.addNetworkData.makedefault = false
       this.editIpAddressValue = ''
       this.newSecondaryIp = ''
+      this.newSecondaryIpDescription = ''
     },
     onChangeIPAddress (record) {
       this.editNicResource = record.nic
@@ -589,6 +595,7 @@ export default {
       if (this.newSecondaryIp) {
         params.ipaddress = this.newSecondaryIp
       }
+      params.description = this.newSecondaryIpDescription
 
       postAPI('addIpToNic', params).then(response => {
         this.$pollJob({
@@ -616,6 +623,7 @@ export default {
         this.loadingNic = false
       }).finally(() => {
         this.newSecondaryIp = null
+        this.newSecondaryIpDescription = null
         this.fetchPublicIps(this.editNetworkId)
       })
     },
diff --git a/ui/src/views/network/NicsTable.vue b/ui/src/views/network/NicsTable.vue
index 11ba135e39a..ec4a25afb3d 100644
--- a/ui/src/views/network/NicsTable.vue
+++ b/ui/src/views/network/NicsTable.vue
@@ -39,7 +39,7 @@
           {{ record.traffictype }}
         </a-descriptions-item>
         <a-descriptions-item :label="$t('label.secondaryips')" v-if="record.secondaryip && record.secondaryip.length > 0 && record.type !== 'L2'">
-          {{ record.secondaryip.map(x => x.ipaddress).join(', ') }}
+          {{ record.secondaryip.map(secondaryIp => secondaryIp.description ? (secondaryIp.ipaddress + ': ' + secondaryIp.description) : secondaryIp.ipaddress).join(', ') }}
         </a-descriptions-item>
         <a-descriptions-item :label="$t('label.ip6address')" v-if="record.ip6address">
           {{ record.ip6address }}
diff --git a/ui/src/views/setting/ConfigurationValue.vue b/ui/src/views/setting/ConfigurationValue.vue
index d9e36d9af53..5a6f0b025ca 100644
--- a/ui/src/views/setting/ConfigurationValue.vue
+++ b/ui/src/views/setting/ConfigurationValue.vue
@@ -295,13 +295,14 @@ export default {
         params[this.scopeKey] = this.resource?.id
       }
       postAPI('updateConfiguration', params).then(json => {
-        configRecordEntry = json.updateconfigurationresponse.configuration
+        const apiRecord = json.updateconfigurationresponse.configuration
+        configRecordEntry = { ...apiRecord, value: String(newValue) }
         this.editableValue = this.getEditableValue(configRecordEntry)
         this.actualValue = this.editableValue
         this.$emit('change-config', { value: newValue })
         this.$store.dispatch('RefreshFeatures')
         this.$messageConfigSuccess(`${this.$t('message.setting.updated')} ${configrecord.name}`, configrecord)
-        this.$notifyConfigurationValueChange(json?.updateconfigurationresponse?.configuration || null)
+        this.$notifyConfigurationValueChange(configRecordEntry)
       }).catch(error => {
         this.editableValue = this.actualValue
         console.error(error)
diff --git a/utils/src/main/java/com/cloud/utils/UriUtils.java b/utils/src/main/java/com/cloud/utils/UriUtils.java
index a4654091e0c..afbaa386c1e 100644
--- a/utils/src/main/java/com/cloud/utils/UriUtils.java
+++ b/utils/src/main/java/com/cloud/utils/UriUtils.java
@@ -641,6 +641,9 @@ public class UriUtils {
             if (url.startsWith("rbd://")) {
                 return getRbdUrlInfo(url);
             }
+            if (url.toLowerCase().startsWith("clvm://") || url.toLowerCase().startsWith("clvm_ng://")) {
+                return getClvmUrlInfo(url);
+            }
             URI uri = new URI(UriUtils.encodeURIComponent(url));
             return new UriInfo(uri.getScheme(), uri.getHost(), uri.getPath(), uri.getUserInfo(), uri.getPort());
         } catch (URISyntaxException e) {
@@ -678,6 +681,36 @@ public class UriUtils {
         }
     }
 
+    private static UriInfo getClvmUrlInfo(String url) {
+        if (url == null || (!url.toLowerCase().startsWith("clvm://") && !url.toLowerCase().startsWith("clvm_ng://"))) {
+            throw new CloudRuntimeException("CLVM URL must start with \"clvm://\" or \"clvm_ng://\"");
+        }
+
+        String scheme;
+        String remainder;
+        if (url.toLowerCase().startsWith("clvm_ng://")) {
+            scheme = "clvm_ng";
+            remainder = url.substring(10);
+        } else {
+            scheme = "clvm";
+            remainder = url.substring(7);
+        }
+
+        int firstSlash = remainder.indexOf('/');
+        String host = (firstSlash == -1) ? remainder : remainder.substring(0, firstSlash);
+        String path = (firstSlash == -1) ? "/" : remainder.substring(firstSlash);
+
+        if (host.isEmpty()) {
+            host = "localhost";
+        }
+
+        while (path.startsWith("//")) {
+            path = path.substring(1);
+        }
+
+        return new UriInfo(scheme, host, path, null, -1);
+    }
+
     public static boolean isUrlForCompressedFile(String url) {
         return UriUtils.COMPRESSION_FORMATS.stream().anyMatch(f -> url.toLowerCase().endsWith(f));
     }
diff --git a/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/TagAsRuleHelper.java b/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/GenericRuleHelper.java
similarity index 61%
rename from utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/TagAsRuleHelper.java
rename to utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/GenericRuleHelper.java
index b3013567352..506bbc1ea5c 100644
--- a/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/TagAsRuleHelper.java
+++ b/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/GenericRuleHelper.java
@@ -16,41 +16,60 @@
 //under the License.
 package org.apache.cloudstack.utils.jsinterpreter;
 
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.cloud.utils.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+public class GenericRuleHelper {
 
-import com.cloud.utils.exception.CloudRuntimeException;
+    protected static Logger LOGGER = LogManager.getLogger(GenericRuleHelper.class);
 
-public class TagAsRuleHelper {
-
-    protected static Logger LOGGER = LogManager.getLogger(TagAsRuleHelper.class);
-
-    public static boolean interpretTagAsRule(String rule, String tags, long timeout) {
+    public static boolean interpretTagAsRule(String rule, String tags, long timeout, String configName) {
         List<String> tagsPresetVariable = new ArrayList<>();
         if (!StringUtils.isEmpty(tags)) {
             tagsPresetVariable.addAll(Arrays.asList(tags.split(",")));
         }
 
-        try (JsInterpreter jsInterpreter = new JsInterpreter(timeout)) {
-            jsInterpreter.injectVariable("tags", tagsPresetVariable);
-            Object scriptReturn = jsInterpreter.executeScript(rule);
-            if (scriptReturn instanceof Boolean) {
-                return (Boolean)scriptReturn;
-            }
-        } catch (IOException ex) {
-            String message = String.format("Error while executing script [%s].", rule);
-            LOGGER.error(message, ex);
-            throw new CloudRuntimeException(message, ex);
+        Boolean scriptReturn = interpretRule("tags", tagsPresetVariable, timeout, rule, configName);
+
+        if (scriptReturn != null) {
+            return scriptReturn;
         }
 
         LOGGER.debug("Result of tag rule [{}] was not a boolean, returning false.", rule);
         return false;
     }
 
+    public static boolean interpretGuestOsRule(String rule, String vmGuestOs, long timeout, String configName) {
+        Boolean scriptReturn = interpretRule("vmGuestOs", vmGuestOs, timeout, rule, configName);
+
+        if (scriptReturn != null) {
+            return scriptReturn;
+        }
+
+        LOGGER.debug("Result of guest OS rule [{}] was not a boolean, returning false.", rule);
+        return false;
+    }
+
+    private static Boolean interpretRule(String variableName, Object variableValue, long timeout, String script, String configName) {
+        try (JsInterpreter jsInterpreter = new JsInterpreter(timeout, configName)) {
+            jsInterpreter.injectVariable(variableName, variableValue);
+            Object scriptReturn = jsInterpreter.executeScript(script);
+            if (scriptReturn instanceof Boolean) {
+                return (Boolean) scriptReturn;
+            }
+        } catch (IOException ex) {
+            String message = String.format("Error while executing script [%s].", script);
+            LOGGER.error(message, ex);
+            throw new CloudRuntimeException(message, ex);
+        }
+        return null;
+    }
+
 }
diff --git a/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreter.java b/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreter.java
index 6e6ef2bbe59..85799e0f561 100644
--- a/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreter.java
+++ b/utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreter.java
@@ -86,10 +86,10 @@ public class JsInterpreter implements Closeable {
      */
     protected JsInterpreter() { }
 
-    public JsInterpreter(long timeout) {
+    public JsInterpreter(long timeout, String configName) {
         this.timeout = timeout;
-        this.timeoutDefaultMessage = String.format(
-                "Timeout (in milliseconds) defined in the global setting [quota.activationrule.timeout]: [%s].", this.timeout);
+        this.timeoutDefaultMessage = String.format("Timeout (in milliseconds) defined in the global setting [%s]: [%s].",
+                configName, this.timeout);
 
         if (System.getProperty("nashorn.args") == null) {
             System.setProperty("nashorn.args", "--no-java --no-syntax-extensions");
diff --git a/utils/src/test/java/com/cloud/utils/UriUtilsTest.java b/utils/src/test/java/com/cloud/utils/UriUtilsTest.java
index 8e6408f7783..c6c059b2ebe 100644
--- a/utils/src/test/java/com/cloud/utils/UriUtilsTest.java
+++ b/utils/src/test/java/com/cloud/utils/UriUtilsTest.java
@@ -283,4 +283,180 @@ public class UriUtilsTest {
         Pair<String, Integer> url2 = UriUtils.validateUrl("https://www.apache.org");
         Assert.assertEquals(url2.first(), "www.apache.org");
     }
+
+    @Test
+    public void testGetClvmUriInfoBasic() {
+        String host = "10.11.12.13";
+
+        String url1 = String.format("clvm://%s/vg0/lv0", host);
+        String url2 = String.format("clvm://%s/vg0", host);
+        String url3 = String.format("clvm://%s", host);
+
+        UriUtils.UriInfo info1 = UriUtils.getUriInfo(url1);
+        Assert.assertEquals("clvm", info1.getScheme());
+        Assert.assertEquals(host, info1.getStorageHost());
+        Assert.assertEquals("/vg0/lv0", info1.getStoragePath());
+        Assert.assertNull(info1.getUserInfo());
+        Assert.assertEquals(-1, info1.getPort());
+        Assert.assertEquals(url1, info1.toString());
+
+        UriUtils.UriInfo info2 = UriUtils.getUriInfo(url2);
+        Assert.assertEquals("clvm", info2.getScheme());
+        Assert.assertEquals(host, info2.getStorageHost());
+        Assert.assertEquals("/vg0", info2.getStoragePath());
+
+        UriUtils.UriInfo info3 = UriUtils.getUriInfo(url3);
+        Assert.assertEquals("clvm", info3.getScheme());
+        Assert.assertEquals(host, info3.getStorageHost());
+        Assert.assertEquals("/", info3.getStoragePath());
+    }
+
+    @Test
+    public void testGetClvmNgUriInfoBasic() {
+        String host = "10.11.12.13";
+
+        String url1 = String.format("clvm_ng://%s/vg0/lv0", host);
+        String url2 = String.format("clvm_ng://%s/vg0", host);
+        String url3 = String.format("clvm_ng://%s", host);
+
+        UriUtils.UriInfo info1 = UriUtils.getUriInfo(url1);
+        Assert.assertEquals("clvm_ng", info1.getScheme());
+        Assert.assertEquals(host, info1.getStorageHost());
+        Assert.assertEquals("/vg0/lv0", info1.getStoragePath());
+        Assert.assertNull(info1.getUserInfo());
+        Assert.assertEquals(-1, info1.getPort());
+        Assert.assertEquals(url1, info1.toString());
+
+        UriUtils.UriInfo info2 = UriUtils.getUriInfo(url2);
+        Assert.assertEquals("clvm_ng", info2.getScheme());
+        Assert.assertEquals(host, info2.getStorageHost());
+        Assert.assertEquals("/vg0", info2.getStoragePath());
+
+        UriUtils.UriInfo info3 = UriUtils.getUriInfo(url3);
+        Assert.assertEquals("clvm_ng", info3.getScheme());
+        Assert.assertEquals(host, info3.getStorageHost());
+        Assert.assertEquals("/", info3.getStoragePath());
+    }
+
+    @Test
+    public void testGetClvmUriInfoNoHost() {
+        String url1 = "clvm:///vg0/lv0";
+        String url2 = "clvm_ng:///vg0/lv0";
+
+        UriUtils.UriInfo info1 = UriUtils.getUriInfo(url1);
+        Assert.assertEquals("clvm", info1.getScheme());
+        Assert.assertEquals("localhost", info1.getStorageHost());
+        Assert.assertEquals("/vg0/lv0", info1.getStoragePath());
+
+        UriUtils.UriInfo info2 = UriUtils.getUriInfo(url2);
+        Assert.assertEquals("clvm_ng", info2.getScheme());
+        Assert.assertEquals("localhost", info2.getStorageHost());
+        Assert.assertEquals("/vg0/lv0", info2.getStoragePath());
+    }
+
+    @Test
+    public void testGetClvmUriInfoMultipleSlashes() {
+        String url1 = "clvm://host1//vg0//lv0";
+        String url2 = "clvm_ng://host2///vg1///lv1";
+
+        UriUtils.UriInfo info1 = UriUtils.getUriInfo(url1);
+        Assert.assertEquals("clvm", info1.getScheme());
+        Assert.assertEquals("host1", info1.getStorageHost());
+        Assert.assertEquals("/vg0//lv0", info1.getStoragePath());
+
+        UriUtils.UriInfo info2 = UriUtils.getUriInfo(url2);
+        Assert.assertEquals("clvm_ng", info2.getScheme());
+        Assert.assertEquals("host2", info2.getStorageHost());
+        Assert.assertEquals("/vg1///lv1", info2.getStoragePath());
+    }
+
+    @Test
+    public void testGetClvmUriInfoComplexPaths() {
+        String host = "storage-node1";
+        String url1 = String.format("clvm://%s/vg-name-with-dashes/lv_name_with_underscores", host);
+        String url2 = String.format("clvm_ng://%s/vg.name.with.dots/lv-123-456", host);
+
+        UriUtils.UriInfo info1 = UriUtils.getUriInfo(url1);
+        Assert.assertEquals("clvm", info1.getScheme());
+        Assert.assertEquals(host, info1.getStorageHost());
+        Assert.assertEquals("/vg-name-with-dashes/lv_name_with_underscores", info1.getStoragePath());
+
+        UriUtils.UriInfo info2 = UriUtils.getUriInfo(url2);
+        Assert.assertEquals("clvm_ng", info2.getScheme());
+        Assert.assertEquals(host, info2.getStorageHost());
+        Assert.assertEquals("/vg.name.with.dots/lv-123-456", info2.getStoragePath());
+    }
+
+    @Test
+    public void testGetClvmUriInfoHostnames() {
+        String[] hosts = {
+            "localhost",
+            "node1",
+            "storage-node-1",
+            "storage.example.com",
+            "10.0.0.1",
+            "192.168.1.100"
+        };
+
+        for (String host : hosts) {
+            String clvmUrl = String.format("clvm://%s/vg0/lv0", host);
+            String clvmNgUrl = String.format("clvm_ng://%s/vg0/lv0", host);
+
+            UriUtils.UriInfo clvmInfo = UriUtils.getUriInfo(clvmUrl);
+            Assert.assertEquals("clvm", clvmInfo.getScheme());
+            Assert.assertEquals(host, clvmInfo.getStorageHost());
+            Assert.assertEquals("/vg0/lv0", clvmInfo.getStoragePath());
+
+            UriUtils.UriInfo clvmNgInfo = UriUtils.getUriInfo(clvmNgUrl);
+            Assert.assertEquals("clvm_ng", clvmNgInfo.getScheme());
+            Assert.assertEquals(host, clvmNgInfo.getStorageHost());
+            Assert.assertEquals("/vg0/lv0", clvmNgInfo.getStoragePath());
+        }
+    }
+
+    @Test
+    public void testGetClvmUriInfoToString() {
+        String url1 = "clvm://host1/vg0/lv0";
+        String url2 = "clvm_ng://host2/vg1/lv1";
+        String url3 = "clvm://localhost/vg0";
+
+        Assert.assertEquals(url1, UriUtils.getUriInfo(url1).toString());
+        Assert.assertEquals(url2, UriUtils.getUriInfo(url2).toString());
+        Assert.assertEquals(url3, UriUtils.getUriInfo(url3).toString());
+    }
+
+    @Test
+    public void testGetClvmUriInfoCaseInsensitive() {
+        String url1 = "CLVM://host1/vg0/lv0";
+        String url2 = "ClVm://host2/vg1/lv1";
+        String url3 = "CLVM_NG://host3/vg2/lv2";
+        String url4 = "clvm_NG://host4/vg3/lv3";
+
+        UriUtils.UriInfo info1 = UriUtils.getUriInfo(url1);
+        Assert.assertEquals("clvm", info1.getScheme());
+        Assert.assertEquals("host1", info1.getStorageHost());
+
+        UriUtils.UriInfo info2 = UriUtils.getUriInfo(url2);
+        Assert.assertEquals("clvm", info2.getScheme());
+        Assert.assertEquals("host2", info2.getStorageHost());
+
+        UriUtils.UriInfo info3 = UriUtils.getUriInfo(url3);
+        Assert.assertEquals("clvm_ng", info3.getScheme());
+        Assert.assertEquals("host3", info3.getStorageHost());
+
+        UriUtils.UriInfo info4 = UriUtils.getUriInfo(url4);
+        Assert.assertEquals("clvm_ng", info4.getScheme());
+        Assert.assertEquals("host4", info4.getStorageHost());
+    }
+
+    @Test
+    public void testGetClvmUriInfoIntegration() {
+        String host = "clvm-host";
+
+        String clvmUrl = String.format("clvm://%s/vg0/lv0", host);
+        String clvmNgUrl = String.format("clvm_ng://%s/vg1/lv1", host);
+
+        testGetUriInfoInternal(clvmUrl, host);
+        testGetUriInfoInternal(clvmNgUrl, host);
+    }
 }
diff --git a/utils/src/test/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreterTest.java b/utils/src/test/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreterTest.java
index e6ef43f2fc1..e4764b2af41 100644
--- a/utils/src/test/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreterTest.java
+++ b/utils/src/test/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreterTest.java
@@ -161,7 +161,7 @@ public class JsInterpreterTest {
 
     @Test
     public void executeScriptTestValidScriptShouldPassWithMixedVariables() {
-        try (JsInterpreter jsInterpreter = new JsInterpreter(1000)) {
+        try (JsInterpreter jsInterpreter = new JsInterpreter(1000, "timeout.configuration")) {
             jsInterpreter.injectVariable("x", 10);
             jsInterpreter.injectVariable("y", "hello");
             jsInterpreter.injectVariable("z", true);
@@ -174,7 +174,7 @@ public class JsInterpreterTest {
     }
 
     private void runMaliciousScriptFileTest(String script, String filename) {
-        try (JsInterpreter jsInterpreter = new JsInterpreter(1000)) {
+        try (JsInterpreter jsInterpreter = new JsInterpreter(1000, "timeout.configuration")) {
             jsInterpreter.executeScript(script);
         } catch (CloudRuntimeException ex) {
             Assert.assertTrue(ex.getMessage().contains("Unable to execute script"));