From b360cf167d23f8c1b7d9c0e0af9862a9d891080d Mon Sep 17 00:00:00 2001
From: dwith <dan.with@rackspace.com>
Date: Mon, 17 Nov 2025 18:05:54 -0600
Subject: [PATCH] Fix: Manila Alphabetize APT packages and Docs

Changes staged this time
---
 .../workflows/container-build-manila-api.yaml | 166 -------
 .../container-build-manila-data.yaml          | 166 -------
 .../container-build-manila-scheduler.yaml     | 166 -------
 .../container-build-manila-share.yaml         | 166 -------
 ContainerFiles/manila                         | 406 +++++++++++++-----
 ContainerFiles/manila-api                     | 128 ------
 ContainerFiles/manila-data                    | 138 ------
 ContainerFiles/manila-scheduler               | 131 ------
 ContainerFiles/manila-share                   | 145 -------
 scripts/manila-api-cve-patching.sh            |  28 --
 scripts/manila-cve-patching.sh                |  18 +
 scripts/manila-data-cve-patching.sh           |  28 --
 scripts/manila-scheduler-cve-patching.sh      |  28 --
 scripts/manila-share-cve-patching.sh          |  28 --
 14 files changed, 317 insertions(+), 1425 deletions(-)
 delete mode 100644 .github/workflows/container-build-manila-api.yaml
 delete mode 100644 .github/workflows/container-build-manila-data.yaml
 delete mode 100644 .github/workflows/container-build-manila-scheduler.yaml
 delete mode 100644 .github/workflows/container-build-manila-share.yaml
 delete mode 100644 ContainerFiles/manila-api
 delete mode 100644 ContainerFiles/manila-data
 delete mode 100644 ContainerFiles/manila-scheduler
 delete mode 100644 ContainerFiles/manila-share
 delete mode 100644 scripts/manila-api-cve-patching.sh
 delete mode 100644 scripts/manila-data-cve-patching.sh
 delete mode 100644 scripts/manila-scheduler-cve-patching.sh
 delete mode 100644 scripts/manila-share-cve-patching.sh

diff --git a/.github/workflows/container-build-manila-api.yaml b/.github/workflows/container-build-manila-api.yaml
deleted file mode 100644
index 37d474c..0000000
--- a/.github/workflows/container-build-manila-api.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
----
-name: Create and publish a manila-api image
-
-permissions:
-  actions: read
-  contents: read
-  id-token: write
-  packages: write
-  pull-requests: write
-  security-events: write
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/container-build-manila-api.yaml
-      - ContainerFiles/manila-api
-      - scripts/manila-api-cve-patching.sh
-  schedule:
-    - cron: '0 0 * * 0'  # Run Weekly at midnight UTC
-  workflow_dispatch:
-    inputs:
-      openstack-constraints:
-        description: 'Version of OpenStack Constraints to use'
-        required: true
-        default: "master"
-        type: choice
-        options:
-          - master
-          - unmaintained/2024.1
-          - stable/2025.1
-      project-version:
-        description: 'Version of OpenStack manila to build, defaults to openstack-constraints if unspecified'
-        required: false
-        type: string
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}/manila-api
-  project_version: ${{ github.event.inputs.project-version }}
-  # NOTE(cloudnull): This is used to parse the workflow_dispatch inputs, sadly the inputs are not available in the
-  #                   workflow_dispatch event, so they're being stored in the environment variables. This is a
-  #                   workaround until there's a better way to handle this.
-  openstack_constraints: >
-    ["unmaintained/2024.1", "stable/2025.1"]
-
-jobs:
-  init:
-    runs-on: ubuntu-latest
-    outputs:
-      openstack-constraints: ${{ steps.generate-matrix.outputs.openstack_constraints }}
-    steps:
-      - name: generate-matrix
-        id: generate-matrix
-        run: |
-          if [ "${{ github.event_name == 'workflow_dispatch' }}" = "true" ]; then
-            openstack_constraints="$(echo '${{ github.event.inputs.openstack-constraints }}' | jq -R '[select(length>0)]' | jq -c '.')"
-          fi
-          echo "openstack_constraints=${openstack_constraints:-${{ env.openstack_constraints }}}" >> $GITHUB_OUTPUT
-  build-and-push-image:
-    needs:
-      - init
-    strategy:
-      matrix:
-        openstack-constraints: ${{ fromJSON(needs.init.outputs.openstack-constraints)}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Dynamically set MY_DATE environment variable
-        run: echo "MY_DATE=$(date +%s)" >> $GITHUB_ENV
-      - name: Dynamically set OS_VERSION_PARSE environment variable
-        run: |
-          VERSION=$(echo -n "${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}" | awk -F'/' '{($2=="" ? x=$1 : x=$2); print x}')
-          echo "OS_VERSION_PARSE=${VERSION}" >> $GITHUB_ENV
-          NAME=$(echo -n "${{ env.IMAGE_NAME }}" | awk -F'/' '{print $NF}')
-          echo "CATEGORY_NAME=${VERSION}-${NAME}" >> $GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-api
-          push: false
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.IMAGE_NAME }}:local
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Upload Trivy scan results to GitHub Security tab
-        continue-on-error: true
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'
-          category: "${{ env.CATEGORY_NAME }}"
-      - name: Run Trivy scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          output: trivy.txt
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Create trivy output file in markdown format
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy.txt ]]; then
-              echo "### Security Output" > trivy-output.txt
-              echo '```terraform' >> trivy-output.txt
-              cat trivy.txt >> trivy-output.txt
-              echo '```' >> trivy-output.txt
-          fi
-      - name: Publish Trivy Output to Summary
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy-output.txt ]]; then
-            {
-              cat trivy-output.txt
-            } >> $GITHUB_STEP_SUMMARY
-          fi
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-api
-          push: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-${{ env.MY_DATE }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
diff --git a/.github/workflows/container-build-manila-data.yaml b/.github/workflows/container-build-manila-data.yaml
deleted file mode 100644
index 3a04733..0000000
--- a/.github/workflows/container-build-manila-data.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
----
-name: Create and publish a manila-data image
-
-permissions:
-  actions: read
-  contents: read
-  id-token: write
-  packages: write
-  pull-requests: write
-  security-events: write
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/container-build-manila-data.yaml
-      - ContainerFiles/manila-data
-      - scripts/manila-data-cve-patching.sh
-  schedule:
-    - cron: '0 0 * * 0'  # Run Weekly at midnight UTC
-  workflow_dispatch:
-    inputs:
-      openstack-constraints:
-        description: 'Version of OpenStack Constraints to use'
-        required: true
-        default: "master"
-        type: choice
-        options:
-          - master
-          - unmaintained/2024.1
-          - stable/2025.1
-      project-version:
-        description: 'Version of OpenStack manila to build, defaults to openstack-constraints if unspecified'
-        required: false
-        type: string
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}/manila-data
-  project_version: ${{ github.event.inputs.project-version }}
-  # NOTE(cloudnull): This is used to parse the workflow_dispatch inputs, sadly the inputs are not available in the
-  #                   workflow_dispatch event, so they're being stored in the environment variables. This is a
-  #                   workaround until there's a better way to handle this.
-  openstack_constraints: >
-    ["unmaintained/2024.1", "stable/2025.1"]
-
-jobs:
-  init:
-    runs-on: ubuntu-latest
-    outputs:
-      openstack-constraints: ${{ steps.generate-matrix.outputs.openstack_constraints }}
-    steps:
-      - name: generate-matrix
-        id: generate-matrix
-        run: |
-          if [ "${{ github.event_name == 'workflow_dispatch' }}" = "true" ]; then
-            openstack_constraints="$(echo '${{ github.event.inputs.openstack-constraints }}' | jq -R '[select(length>0)]' | jq -c '.')"
-          fi
-          echo "openstack_constraints=${openstack_constraints:-${{ env.openstack_constraints }}}" >> $GITHUB_OUTPUT
-  build-and-push-image:
-    needs:
-      - init
-    strategy:
-      matrix:
-        openstack-constraints: ${{ fromJSON(needs.init.outputs.openstack-constraints)}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Dynamically set MY_DATE environment variable
-        run: echo "MY_DATE=$(date +%s)" >> $GITHUB_ENV
-      - name: Dynamically set OS_VERSION_PARSE environment variable
-        run: |
-          VERSION=$(echo -n "${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}" | awk -F'/' '{($2=="" ? x=$1 : x=$2); print x}')
-          echo "OS_VERSION_PARSE=${VERSION}" >> $GITHUB_ENV
-          NAME=$(echo -n "${{ env.IMAGE_NAME }}" | awk -F'/' '{print $NF}')
-          echo "CATEGORY_NAME=${VERSION}-${NAME}" >> $GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-data
-          push: false
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.IMAGE_NAME }}:local
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Upload Trivy scan results to GitHub Security tab
-        continue-on-error: true
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'
-          category: "${{ env.CATEGORY_NAME }}"
-      - name: Run Trivy scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          output: trivy.txt
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Create trivy output file in markdown format
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy.txt ]]; then
-              echo "### Security Output" > trivy-output.txt
-              echo '```terraform' >> trivy-output.txt
-              cat trivy.txt >> trivy-output.txt
-              echo '```' >> trivy-output.txt
-          fi
-      - name: Publish Trivy Output to Summary
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy-output.txt ]]; then
-            {
-              cat trivy-output.txt
-            } >> $GITHUB_STEP_SUMMARY
-          fi
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-data
-          push: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-${{ env.MY_DATE }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
diff --git a/.github/workflows/container-build-manila-scheduler.yaml b/.github/workflows/container-build-manila-scheduler.yaml
deleted file mode 100644
index 99a0a20..0000000
--- a/.github/workflows/container-build-manila-scheduler.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
----
-name: Create and publish a manila-scheduler image
-
-permissions:
-  actions: read
-  contents: read
-  id-token: write
-  packages: write
-  pull-requests: write
-  security-events: write
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/container-build-manila-scheduler.yaml
-      - ContainerFiles/manila-scheduler
-      - scripts/manila-scheduler-cve-patching.sh
-  schedule:
-    - cron: '0 0 * * 0'  # Run Weekly at midnight UTC
-  workflow_dispatch:
-    inputs:
-      openstack-constraints:
-        description: 'Version of OpenStack Constraints to use'
-        required: true
-        default: "master"
-        type: choice
-        options:
-          - master
-          - unmaintained/2024.1
-          - stable/2025.1
-      project-version:
-        description: 'Version of OpenStack manila to build, defaults to openstack-constraints if unspecified'
-        required: false
-        type: string
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}/manila-scheduler
-  project_version: ${{ github.event.inputs.project-version }}
-  # NOTE(cloudnull): This is used to parse the workflow_dispatch inputs, sadly the inputs are not available in the
-  #                   workflow_dispatch event, so they're being stored in the environment variables. This is a
-  #                   workaround until there's a better way to handle this.
-  openstack_constraints: >
-    ["unmaintained/2024.1", "stable/2025.1"]
-
-jobs:
-  init:
-    runs-on: ubuntu-latest
-    outputs:
-      openstack-constraints: ${{ steps.generate-matrix.outputs.openstack_constraints }}
-    steps:
-      - name: generate-matrix
-        id: generate-matrix
-        run: |
-          if [ "${{ github.event_name == 'workflow_dispatch' }}" = "true" ]; then
-            openstack_constraints="$(echo '${{ github.event.inputs.openstack-constraints }}' | jq -R '[select(length>0)]' | jq -c '.')"
-          fi
-          echo "openstack_constraints=${openstack_constraints:-${{ env.openstack_constraints }}}" >> $GITHUB_OUTPUT
-  build-and-push-image:
-    needs:
-      - init
-    strategy:
-      matrix:
-        openstack-constraints: ${{ fromJSON(needs.init.outputs.openstack-constraints)}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Dynamically set MY_DATE environment variable
-        run: echo "MY_DATE=$(date +%s)" >> $GITHUB_ENV
-      - name: Dynamically set OS_VERSION_PARSE environment variable
-        run: |
-          VERSION=$(echo -n "${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}" | awk -F'/' '{($2=="" ? x=$1 : x=$2); print x}')
-          echo "OS_VERSION_PARSE=${VERSION}" >> $GITHUB_ENV
-          NAME=$(echo -n "${{ env.IMAGE_NAME }}" | awk -F'/' '{print $NF}')
-          echo "CATEGORY_NAME=${VERSION}-${NAME}" >> $GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-scheduler
-          push: false
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.IMAGE_NAME }}:local
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Upload Trivy scan results to GitHub Security tab
-        continue-on-error: true
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'
-          category: "${{ env.CATEGORY_NAME }}"
-      - name: Run Trivy scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          output: trivy.txt
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Create trivy output file in markdown format
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy.txt ]]; then
-              echo "### Security Output" > trivy-output.txt
-              echo '```terraform' >> trivy-output.txt
-              cat trivy.txt >> trivy-output.txt
-              echo '```' >> trivy-output.txt
-          fi
-      - name: Publish Trivy Output to Summary
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy-output.txt ]]; then
-            {
-              cat trivy-output.txt
-            } >> $GITHUB_STEP_SUMMARY
-          fi
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-scheduler
-          push: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-${{ env.MY_DATE }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
diff --git a/.github/workflows/container-build-manila-share.yaml b/.github/workflows/container-build-manila-share.yaml
deleted file mode 100644
index 2bcf09f..0000000
--- a/.github/workflows/container-build-manila-share.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
----
-name: Create and publish a manila-share image
-
-permissions:
-  actions: read
-  contents: read
-  id-token: write
-  packages: write
-  pull-requests: write
-  security-events: write
-
-on:
-  pull_request:
-    paths:
-      - .github/workflows/container-build-manila-share.yaml
-      - ContainerFiles/manila-share
-      - scripts/manila-share-cve-patching.sh
-  schedule:
-    - cron: '0 0 * * 0'  # Run Weekly at midnight UTC
-  workflow_dispatch:
-    inputs:
-      openstack-constraints:
-        description: 'Version of OpenStack Constraints to use'
-        required: true
-        default: "master"
-        type: choice
-        options:
-          - master
-          - unmaintained/2024.1
-          - stable/2025.1
-      project-version:
-        description: 'Version of OpenStack manila to build, defaults to openstack-constraints if unspecified'
-        required: false
-        type: string
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}/manila-share
-  project_version: ${{ github.event.inputs.project-version }}
-  # NOTE(cloudnull): This is used to parse the workflow_dispatch inputs, sadly the inputs are not available in the
-  #                   workflow_dispatch event, so they're being stored in the environment variables. This is a
-  #                   workaround until there's a better way to handle this.
-  openstack_constraints: >
-    ["unmaintained/2024.1", "stable/2025.1"]
-
-jobs:
-  init:
-    runs-on: ubuntu-latest
-    outputs:
-      openstack-constraints: ${{ steps.generate-matrix.outputs.openstack_constraints }}
-    steps:
-      - name: generate-matrix
-        id: generate-matrix
-        run: |
-          if [ "${{ github.event_name == 'workflow_dispatch' }}" = "true" ]; then
-            openstack_constraints="$(echo '${{ github.event.inputs.openstack-constraints }}' | jq -R '[select(length>0)]' | jq -c '.')"
-          fi
-          echo "openstack_constraints=${openstack_constraints:-${{ env.openstack_constraints }}}" >> $GITHUB_OUTPUT
-  build-and-push-image:
-    needs:
-      - init
-    strategy:
-      matrix:
-        openstack-constraints: ${{ fromJSON(needs.init.outputs.openstack-constraints)}}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Dynamically set MY_DATE environment variable
-        run: echo "MY_DATE=$(date +%s)" >> $GITHUB_ENV
-      - name: Dynamically set OS_VERSION_PARSE environment variable
-        run: |
-          VERSION=$(echo -n "${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}" | awk -F'/' '{($2=="" ? x=$1 : x=$2); print x}')
-          echo "OS_VERSION_PARSE=${VERSION}" >> $GITHUB_ENV
-          NAME=$(echo -n "${{ env.IMAGE_NAME }}" | awk -F'/' '{print $NF}')
-          echo "CATEGORY_NAME=${VERSION}-${NAME}" >> $GITHUB_ENV
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-share
-          push: false
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.IMAGE_NAME }}:local
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Upload Trivy scan results to GitHub Security tab
-        continue-on-error: true
-        if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'
-          category: "${{ env.CATEGORY_NAME }}"
-      - name: Run Trivy scanner
-        uses: aquasecurity/trivy-action@0.33.1  # using latest trivy scanner
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          image-ref: '${{ env.IMAGE_NAME }}:local'
-          output: trivy.txt
-          ignore-unfixed: true
-          skip-files: /etc/ssl/private/ssl-cert-snakeoil.key,/usr/local/bin/pip
-          severity: 'CRITICAL,HIGH,MEDIUM'
-      - name: Create trivy output file in markdown format
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy.txt ]]; then
-              echo "### Security Output" > trivy-output.txt
-              echo '```terraform' >> trivy-output.txt
-              cat trivy.txt >> trivy-output.txt
-              echo '```' >> trivy-output.txt
-          fi
-      - name: Publish Trivy Output to Summary
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          if [[ -s trivy-output.txt ]]; then
-            {
-              cat trivy-output.txt
-            } >> $GITHUB_STEP_SUMMARY
-          fi
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ContainerFiles/manila-share
-          push: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.OS_VERSION_PARSE }}-${{ env.MY_DATE }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            OS_VERSION=${{ env.project_version != '' && env.project_version || matrix.openstack-constraints }}
-            OS_CONSTRAINTS=${{ matrix.openstack-constraints }}
-            CACHEBUST=${{ github.sha }}
diff --git a/ContainerFiles/manila b/ContainerFiles/manila
index 222b3a7..40d803e 100644
--- a/ContainerFiles/manila
+++ b/ContainerFiles/manila
@@ -1,133 +1,325 @@
-# syntax = docker/dockerfile:1
+# syntax = docker/dockerfile:1.4.0
+# DOCKER
 # This Dockerfile uses multi-stage build to customize DEV and PROD images:
 # https://docs.docker.com/develop/develop-images/multistage-build/
 
 ARG VENV_TAG=3.12-latest
 FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
+
 ARG CACHEBUST=0
 ARG OS_VERSION=master
 ARG OS_CONSTRAINTS=master
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             build-essential \
-                                             cargo \
-                                             curl \
-                                             docutils-common \
-                                             gettext \
-                                             git \
-                                             libffi-dev \
-                                             libjs-sphinxdoc \
-                                             libjs-underscore \
-                                             libldap2-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libsystemd-dev \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             ssl-cert \
-                                             xmlsec1
-RUN /usr/local/bin/python -m pip install --upgrade --force-reinstall pip
-RUN /var/lib/openstack/bin/pip install --constraint https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
-                                       git+https://opendev.org/openstack/manila.git@${OS_VERSION}#egg=manila \
-                                       PyMySQL \
-                                       python-memcached \
-                                       uwsgi
-RUN /var/lib/openstack/bin/python -m pip install --upgrade --force-reinstall pip pyOpenSSL==25.3.0
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN <<EOT bash
+set -eux
+apt-get update
+apt-get upgrade -y
+PACKAGES="
+  bash
+  brotli
+  build-essential
+  bzip2
+  cargo
+  curl
+  default-mysql-client
+  default-mysql-server
+  docutils-common
+  gettext
+  gfortran
+  git
+  gzip
+  libblkid1
+  libbz2-1.0
+  libbz2-dev
+  libc6
+  libcap2
+  liberasurecode-dev
+  libffi-dev
+  libgcc-s1
+  libjpeg-dev
+  libjs-sphinxdoc
+  libjs-underscore
+  libkrb5-dev
+  liblapack-dev
+  libldap2-dev
+  liblz4-1
+  liblzma-dev
+  liblzma5
+  libmariadb-dev
+  libnss3-dev
+  libopenblas-dev
+  libpcre2-dev
+  libpq-dev
+  librdkafka-dev
+  libsasl2-dev
+  libsqlite3-dev
+  libssl-dev
+  libstdc++6
+  libsystemd-dev
+  libvirt-dev
+  libwrap0
+  libxml2
+  libxml2-dev
+  libxslt1-dev
+  libxslt1.1
+  libzmq3-dev
+  lsb-base
+  netbase
+  nfs-common
+  pkg-config
+  postgresql-client
+  pypy3
+  pypy3-dev
+  python3-all
+  python3-all-dev
+  python3-dev
+  python3-venv
+  squashfs-tools
+  ssl-cert
+  ucf
+  uuid-dev
+  xmlsec1
+  xz-utils
+  zlib1g
+  zlib1g-dev
+  zopfli
+  zstd
+"
+apt-get install -y --no-install-recommends $PACKAGES
+/usr/local/bin/python -m pip install --upgrade --force-reinstall pip setuptools
+EOT
+
+RUN <<-EOT
+set -eux
+/var/lib/openstack/bin/pip install \
+  --constraint https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
+  git+https://opendev.org/openstack/manila.git@${OS_VERSION}#egg=manila \
+  PyMySQL \
+  python-memcached \
+  uwsgi
+/var/lib/openstack/bin/python -m pip install --upgrade --force-reinstall pip setuptools pyOpenSSL==25.3.0
+EOT
 
 COPY scripts/manila-cve-patching.sh /opt/
+
 RUN bash /opt/manila-cve-patching.sh
 
-RUN find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && find / -name '*.whl' -delete \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/client.key \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/server.key \
-  && sed -i '/^Usage/,/^Documentation\n^-.*$/d' /var/lib/openstack/lib/python*/site-packages/PyJWT-*.dist-info/METADATA
+RUN <<EOT
+  set -eux
+  find / -name '*.pyc' -delete
+  find / -name '*.pyo' -delete
+  find / -name '__pycache__' -delete
+  find / -name '*.whl' -delete
+  rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/client.key
+  rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/server.key
+  sed -i '/^Usage/,/^Documentation\n^-.*$/d' /var/lib/openstack/lib/python*/site-packages/PyJWT-*.dist-info/METADATA
+EOT
+
+FROM python:3.12.12-slim-trixie
+
+ARG DEBIAN_FRONTEND=noninteractive
 
-FROM python:3.12-slim-bookworm
 LABEL maintainer="Rackspace"
 LABEL vendor="Rackspace OpenStack Team"
 LABEL org.opencontainers.image.name="manila"
 LABEL org.opencontainers.image.description="OpenStack Service (manila) built for the enterprise."
+
+ARG NOVA_TSS_USER=tss
+ARG NOVA_TSS_UID=42434
+ARG NOVA_TSS_GID=42434
+
 COPY --from=dependency_build /var/lib/openstack /var/lib/openstack
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             bzip2 \
-                                             curl \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             gettext \
-                                             gzip \
-                                             libblkid1 \
-                                             libbz2-1.0 \
-                                             libbz2-dev \
-                                             libcap2 \
-                                             libc6 \
-                                             libffi-dev \
-                                             libgcc-s1 \
-                                             libldap2-dev \
-                                             liblz4-1 \
-                                             liblzma5 \
-                                             liblzma-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libstdc++6 \
-                                             libsystemd-dev \
-                                             libwrap0 \
-                                             libxml2 \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             lsb-base \
-                                             netbase \
-                                             nfs-common \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             squashfs-tools \
-                                             ssl-cert \
-                                             ucf \
-                                             xmlsec1 \
-                                             xz-utils \
-                                             zlib1g \
-                                             zlib1g-dev \
-                                             zopfli \
-                                             zstd \
-  && python3 -m pip install --upgrade --force-reinstall pip \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/* \
-  && find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && groupadd --system --gid 42424 manila \
-  && useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
-  && mkdir -p /var/lib/manila/tmp \
-  && mkdir -p /var/lib/openstack/etc/manila \
-  && ln -s /var/lib/openstack/etc/manila /etc/manila \
-  && chown manila:manila -h /etc/manila \
-  && chown -R manila:manila /var/lib/openstack/etc/manila \
-  && chown -R manila:manila /var/lib/manila
+
+RUN <<EOT
+set -eux
+apt-get update
+apt-get upgrade -y
+RUNTIME_PACKAGES="
+  adduser
+  apt
+  base-files
+  base-passwd
+  bash
+  bind9-host
+  bind9-libs
+  bridge-utils
+  brotli
+  bsdutils
+  bzip2
+  ca-certificates
+  coreutils
+  curl
+  dash
+  debconf
+  debianutils
+  default-mysql-client
+  default-mysql-server
+  diffutils
+  distro-info-data
+  dpkg
+  e2fsprogs
+  findutils
+  gettext
+  gpgv
+  grep
+  gzip
+  hostname
+  init-system-helpers
+  iproute2
+  libacl1
+  libapt-pkg7.0
+  libattr1
+  libaudit-common
+  libaudit1
+  libblkid1
+  libbz2-1.0
+  libc-bin
+  libc6
+  libcap-ng0
+  libcap2
+  libcom-err2
+  libcrypt1
+  libdb5.3
+  libdebconfclient0
+  libexpat1
+  libext2fs2
+  libffi-dev
+  libffi8
+  libgcc-s1
+  libgcrypt20
+  libgmp10
+  libgnutls30
+  libgpg-error0
+  libgssapi-krb5-2
+  libhogweed6
+  libicu76
+  libidn2-0
+  libjson-c5
+  libk5crypto3
+  libkeyutils1
+  libkrb5-3
+  libkrb5support0
+  libldap2-dev
+  liblmdb0
+  liblz4-1
+  liblzma5
+  libmariadb-dev-compat
+  libmaxminddb0
+  libmount1
+  libncurses6
+  libncursesw6
+  libnettle8
+  libnghttp2-14
+  libnsl2
+  libp11-kit0
+  libpam-modules
+  libpam-modules-bin
+  libpam-runtime
+  libpam0g
+  libpcre2-8-0
+  libproc2-0
+  libpsl5
+  libpython3-stdlib
+  libreadline8
+  libsasl2-dev
+  libseccomp2
+  libselinux1
+  libsemanage-common
+  libsemanage2
+  libsepol2
+  libsmartcols1
+  libsqlite3-0
+  libss2
+  libssl-dev
+  libssl3
+  libstdc++6
+  libsystemd-dev
+  libsystemd0
+  libtasn1-6
+  libtinfo6
+  libtirpc3
+  libudev1
+  libunistring5
+  libuuid1
+  libuv1
+  libvirt-dev
+  libwrap0
+  libxml2
+  libxml2-dev
+  libxslt1.1
+  libxxhash0
+  libzstd1
+  login
+  logsave
+  lsb-base
+  mariadb-client-core
+  mariadb-server
+  mawk
+  media-types
+  mount
+  ncurses-bin
+  netbase
+  nfs-common
+  openssl
+  openvswitch-switch
+  passwd
+  perl-base
+  pkg-config
+  postgresql-client
+  procps
+  python3
+  python3-distutils-extra
+  python3-minimal
+  python3-pip-whl
+  python3-setuptools-whl
+  python3-venv
+  sed
+  sensible-utils
+  squashfs-tools
+  ssl-cert
+  sudo
+  sysvinit-utils
+  tar
+  ucf
+  usrmerge
+  util-linux
+  uuid-dev
+  wget
+  xmlsec1
+  xz-utils
+  zlib1g
+  zopfli
+  zstd
+"
+apt-get install -y --no-install-recommends $RUNTIME_PACKAGES
+/usr/local/bin/python -m pip install --upgrade --force-reinstall pip setuptools pyOpenSSL==25.3.0
+apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
+apt-get clean -y
+rm -rf /var/lib/apt/lists/*
+find / -name '*.pyc' -delete
+find / -name '*.pyo' -delete
+find / -name '__pycache__' -delete
+groupadd --system --gid 42424 manila
+useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila
+mkdir -p /var/lib/manila/tmp
+mkdir -p /var/lib/openstack/etc/manila
+ln -s /var/lib/openstack/etc/manila /etc/manila
+chown manila:manila -h /etc/manila
+chown -R manila:manila /var/lib/openstack/etc/manila
+chown -R manila:manila /var/lib/manila
+groupadd --system --gid $NOVA_TSS_GID $NOVA_TSS_USER
+useradd --system --gid $NOVA_TSS_GID --uid $NOVA_TSS_UID --shell /sbin/nologin -c 'Nova tss user' $NOVA_TSS_USER
+EOT
+
 # Set the environment variables for the manila venv
 ENV PATH="/var/lib/openstack/bin:$PATH"
+
 # Set the working directory
 WORKDIR /var/lib/openstack
+
 # Set the user and group to match the original build
 USER 42424:42424
+
 # Set the entrypoint to the manila-manage command
 ENTRYPOINT ["/var/lib/openstack/bin/manila-manage"]
diff --git a/ContainerFiles/manila-api b/ContainerFiles/manila-api
deleted file mode 100644
index a5213c6..0000000
--- a/ContainerFiles/manila-api
+++ /dev/null
@@ -1,128 +0,0 @@
-# syntax = docker/dockerfile:1
-# This Dockerfile uses multi-stage build to customize DEV and PROD images:
-# https://docs.docker.com/develop/develop-images/multistage-build/
-
-ARG VENV_TAG=3.12-latest
-FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
-ARG CACHEBUST=0
-ARG OS_VERSION=master
-ARG OS_CONSTRAINTS=master
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             build-essential \
-                                             cargo \
-                                             curl \
-                                             docutils-common \
-                                             gettext \
-                                             git \
-                                             libffi-dev \
-                                             libjs-sphinxdoc \
-                                             libjs-underscore \
-                                             libldap2-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libsystemd-dev \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             ssl-cert \
-                                             xmlsec1
-RUN /usr/local/bin/python -m pip install --upgrade --force-reinstall pip
-RUN /var/lib/openstack/bin/pip install --constraint https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
-                                       git+https://opendev.org/openstack/manila.git@${OS_VERSION}#egg=manila \
-                                       PyMySQL \
-                                       python-memcached \
-                                       uwsgi
-RUN . /var/lib/openstack/bin/activate && /var/lib/openstack/bin/python -m pip install --upgrade pip pyOpenSSL==25.3.0
-
-COPY scripts/manila-api-cve-patching.sh /opt/
-RUN bash /opt/manila-api-cve-patching.sh
-
-RUN find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && find / -name '*.whl' -delete \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/client.key \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/server.key \
-  && sed -i '/^Usage/,/^Documentation\n^-.*$/d' /var/lib/openstack/lib/python*/site-packages/PyJWT-*.dist-info/METADATA
-
-FROM python:3.12-slim-bookworm
-LABEL maintainer="Rackspace"
-LABEL vendor="Rackspace OpenStack Team"
-LABEL org.opencontainers.image.name="manila-api"
-LABEL org.opencontainers.image.description="OpenStack Service (manila-api) built for the enterprise."
-COPY --from=dependency_build /var/lib/openstack /var/lib/openstack
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             bzip2 \
-                                             curl \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             gettext \
-                                             gzip \
-                                             libblkid1 \
-                                             libbz2-1.0 \
-                                             libbz2-dev \
-                                             libcap2 \
-                                             libc6 \
-                                             libffi-dev \
-                                             libgcc-s1 \
-                                             libldap2-dev \
-                                             liblz4-1 \
-                                             liblzma5 \
-                                             liblzma-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libstdc++6 \
-                                             libsystemd-dev \
-                                             libwrap0 \
-                                             libxml2 \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             nfs-common \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             squashfs-tools \
-                                             ssl-cert \
-                                             xmlsec1 \
-                                             xz-utils \
-                                             zlib1g \
-                                             zlib1g-dev \
-                                             zopfli \
-                                             zstd \
-  && python3 -m pip install --upgrade --force-reinstall pip \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/* \
-  && find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && groupadd --system --gid 42424 manila \
-  && useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
-  && mkdir -p /var/lib/openstack/etc/manila \
-  && ln -s /var/lib/openstack/etc/manila /etc/manila \
-  && chown manila:manila -h /etc/manila \
-  && chown -R manila:manila /var/lib/openstack/etc/manila
-# Set the environment variables for the manila venv
-ENV PATH="/var/lib/openstack/bin:$PATH"
-# Set the working directory
-WORKDIR /var/lib/openstack
-# Set the user and group to match the original build
-USER 42424:42424
-# Set the entrypoint to the manila-manage command
-ENTRYPOINT ["/var/lib/openstack/bin/manila-manage"]
diff --git a/ContainerFiles/manila-data b/ContainerFiles/manila-data
deleted file mode 100644
index 850047f..0000000
--- a/ContainerFiles/manila-data
+++ /dev/null
@@ -1,138 +0,0 @@
-# syntax = docker/dockerfile:1
-# This Dockerfile uses multi-stage build to customize DEV and PROD images:
-# https://docs.docker.com/develop/develop-images/multistage-build/
-
-ARG VENV_TAG=3.12-latest
-FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
-ARG CACHEBUST=0
-ARG OS_VERSION=master
-ARG OS_CONSTRAINTS=master
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             build-essential \
-                                             cargo \
-                                             curl \
-                                             docutils-common \
-                                             gettext \
-                                             git \
-                                             libffi-dev \
-                                             libjs-sphinxdoc \
-                                             libjs-underscore \
-                                             libldap2-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libsystemd-dev \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             ssl-cert \
-                                             sudo \
-                                             xmlsec1
-RUN /usr/local/bin/python -m pip install --upgrade --force-reinstall pip
-RUN /var/lib/openstack/bin/pip install --constraint https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
-                                       git+https://opendev.org/openstack/manila.git@${OS_VERSION}#egg=manila \
-                                       PyMySQL \
-                                       python-memcached \
-                                       uwsgi
-RUN . /var/lib/openstack/bin/activate && /var/lib/openstack/bin/python -m pip install --upgrade pip pyOpenSSL==25.3.0
-
-COPY scripts/manila-data-cve-patching.sh /opt/
-RUN bash /opt/manila-data-cve-patching.sh
-
-RUN find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && find / -name '*.whl' -delete \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/client.key \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/server.key \
-  && sed -i '/^Usage/,/^Documentation\n^-.*$/d' /var/lib/openstack/lib/python*/site-packages/PyJWT-*.dist-info/METADATA
-
-FROM python:3.12-slim-bookworm
-LABEL maintainer="Rackspace"
-LABEL vendor="Rackspace OpenStack Team"
-LABEL org.opencontainers.image.name="manila-data"
-LABEL org.opencontainers.image.description="OpenStack Service (manila-data) built for the enterprise."
-COPY --from=dependency_build /var/lib/openstack /var/lib/openstack
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             bridge-utils \
-                                             bzip2 \
-                                             curl \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             gettext \
-                                             gzip \
-                                             iproute2 \
-                                             libblkid1 \
-                                             libbz2-1.0 \
-                                             libbz2-dev \
-                                             libcap2 \
-                                             libc6 \
-                                             libffi-dev \
-                                             libgcc-s1 \
-                                             libldap2-dev \
-                                             liblz4-1 \
-                                             liblzma5 \
-                                             liblzma-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libstdc++6 \
-                                             libsystemd-dev \
-                                             libwrap0 \
-                                             libxml2 \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             lsb-base \
-                                             netbase \
-                                             nfs-common \
-                                             openvswitch-switch \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             squashfs-tools \
-                                             ssl-cert \
-                                             sudo \
-                                             ucf \
-                                             xmlsec1 \
-                                             xz-utils \
-                                             zlib1g \
-                                             zlib1g-dev \
-                                             zopfli \
-                                             zstd \
-  && python3 -m pip install --upgrade --force-reinstall pip \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/* \
-  && find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && groupadd --system --gid 42424 manila \
-  && useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
-  && mkdir -p /var/lib/manila/tmp \
-  && mkdir -p /var/lib/openstack/etc/manila \
-  && ln -s /var/lib/openstack/etc/manila /etc/manila \
-  && chown manila:manila -h /etc/manila \
-  && chown -R manila:manila /var/lib/openstack/etc/manila \
-  && chown -R manila:manila /var/lib/manila
-# Set the environment variables for the manila venv
-ENV PATH="/var/lib/openstack/bin:$PATH"
-# Set the working directory
-WORKDIR /var/lib/openstack
-# Set the user and group to match the original build
-USER 42424:42424
-# Set the entrypoint to the manila-manage command
-ENTRYPOINT ["/var/lib/openstack/bin/manila-manage"]
diff --git a/ContainerFiles/manila-scheduler b/ContainerFiles/manila-scheduler
deleted file mode 100644
index 5384709..0000000
--- a/ContainerFiles/manila-scheduler
+++ /dev/null
@@ -1,131 +0,0 @@
-# syntax = docker/dockerfile:1
-# This Dockerfile uses multi-stage build to customize DEV and PROD images:
-# https://docs.docker.com/develop/develop-images/multistage-build/
-
-ARG VENV_TAG=3.12-latest
-FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
-ARG CACHEBUST=0
-ARG OS_VERSION=master
-ARG OS_CONSTRAINTS=master
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             build-essential \
-                                             cargo \
-                                             curl \
-                                             docutils-common \
-                                             gettext \
-                                             git \
-                                             libffi-dev \
-                                             libjs-sphinxdoc \
-                                             libjs-underscore \
-                                             libldap2-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libsystemd-dev \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             ssl-cert \
-                                             xmlsec1
-RUN /usr/local/bin/python -m pip install --upgrade --force-reinstall pip
-RUN /var/lib/openstack/bin/pip install --constraint https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
-                                       git+https://opendev.org/openstack/manila.git@${OS_VERSION}#egg=manila \
-                                       PyMySQL \
-                                       python-memcached \
-                                       uwsgi
-
-RUN . /var/lib/openstack/bin/activate && /var/lib/openstack/bin/python -m pip install --upgrade pip pyOpenSSL==25.3.0
-
-COPY scripts/manila-scheduler-cve-patching.sh /opt/
-RUN bash /opt/manila-scheduler-cve-patching.sh
-
-RUN find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && find / -name '*.whl' -delete \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/client.key \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/server.key \
-  && sed -i '/^Usage/,/^Documentation\n^-.*$/d' /var/lib/openstack/lib/python*/site-packages/PyJWT-*.dist-info/METADATA
-
-FROM python:3.12-slim-bookworm
-LABEL maintainer="Rackspace"
-LABEL vendor="Rackspace OpenStack Team"
-LABEL org.opencontainers.image.name="manila-scheduler"
-LABEL org.opencontainers.image.description="OpenStack Service (manila-scheduler) built for the enterprise."
-COPY --from=dependency_build /var/lib/openstack /var/lib/openstack
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             bzip2 \
-                                             curl \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             gettext \
-                                             gzip \
-                                             libblkid1 \
-                                             libbz2-1.0 \
-                                             libbz2-dev \
-                                             libcap2 \
-                                             libc6 \
-                                             libffi-dev \
-                                             libgcc-s1 \
-                                             libldap2-dev \
-                                             liblz4-1 \
-                                             liblzma5 \
-                                             liblzma-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libstdc++6 \
-                                             libsystemd-dev \
-                                             libwrap0 \
-                                             libxml2 \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             nfs-common \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             squashfs-tools \
-                                             ssl-cert \
-                                             xmlsec1 \
-                                             xz-utils \
-                                             zlib1g \
-                                             zlib1g-dev \
-                                             zopfli \
-                                             zstd \
-  && python3 -m pip install --upgrade --force-reinstall pip \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/* \
-  && find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && groupadd --system --gid 42424 manila \
-  && useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
-  && mkdir -p /var/lib/manila/tmp \
-  && mkdir -p /var/lib/openstack/etc/manila \
-  && ln -s /var/lib/openstack/etc/manila /etc/manila \
-  && chown manila:manila -h /etc/manila \
-  && chown -R manila:manila /var/lib/openstack/etc/manila \
-  && chown -R manila:manila /var/lib/manila
-# Set the environment variables for the manila venv
-ENV PATH="/var/lib/openstack/bin:$PATH"
-# Set the working directory
-WORKDIR /var/lib/openstack
-# Set the user and group to match the original build
-USER 42424:42424
-# Set the entrypoint to the manila-manage command
-ENTRYPOINT ["/var/lib/openstack/bin/manila-manage"]
diff --git a/ContainerFiles/manila-share b/ContainerFiles/manila-share
deleted file mode 100644
index bafbaf8..0000000
--- a/ContainerFiles/manila-share
+++ /dev/null
@@ -1,145 +0,0 @@
-# syntax = docker/dockerfile:1
-# This Dockerfile uses multi-stage build to customize DEV and PROD images:
-# https://docs.docker.com/develop/develop-images/multistage-build/
-# Dockerfile
-
-ARG VENV_TAG=3.12-latest
-FROM ghcr.io/rackerlabs/genestack-images/openstack-venv:${VENV_TAG} AS dependency_build
-ARG CACHEBUST=0
-ARG OS_VERSION=master
-ARG OS_CONSTRAINTS=master
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             build-essential \
-                                             bridge-utils \
-                                             cargo \
-                                             curl \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             docutils-common \
-                                             gettext \
-                                             git \
-                                             iproute2 \
-                                             libffi-dev \
-                                             libjs-sphinxdoc \
-                                             libjs-underscore \
-                                             libldap2-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libsystemd-dev \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             nfs-kernel-server \
-                                             openvswitch-switch \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             sudo \
-                                             ssl-cert \
-                                             xmlsec1
-RUN /usr/local/bin/python -m pip install --upgrade --force-reinstall pip
-RUN /var/lib/openstack/bin/pip install --constraint https://opendev.org/openstack/requirements/raw/branch/${OS_CONSTRAINTS}/upper-constraints.txt \
-                                       git+https://opendev.org/openstack/manila.git@${OS_VERSION}#egg=manila \
-                                       PyMySQL \
-                                       python-memcached \
-                                       uwsgi
-
-RUN . /var/lib/openstack/bin/activate && /var/lib/openstack/bin/python -m pip install --upgrade pip pyOpenSSL==25.3.0
-
-COPY scripts/manila-share-cve-patching.sh /opt/
-RUN bash /opt/manila-share-cve-patching.sh
-
-RUN find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && find / -name '*.whl' -delete \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/client.key \
-  && rm -f /var/lib/openstack/lib/python*/site-packages/slapdtest/certs/server.key \
-  && sed -i '/^Usage/,/^Documentation\n^-.*$/d' /var/lib/openstack/lib/python*/site-packages/PyJWT-*.dist-info/METADATA
-
-FROM python:3.12-slim-bookworm
-LABEL maintainer="Rackspace"
-LABEL vendor="Rackspace OpenStack Team"
-LABEL org.opencontainers.image.name="manila-share"
-LABEL org.opencontainers.image.description="OpenStack Service (manila-share) built for the enterprise."
-COPY --from=dependency_build /var/lib/openstack /var/lib/openstack
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get upgrade -y \
-  && apt-get install --no-install-recommends -y \
-                                             bash \
-                                             brotli \
-                                             bridge-utils \
-                                             bzip2 \
-                                             curl \
-                                             default-mysql-client \
-                                             default-mysql-server \
-                                             gettext \
-                                             gzip \
-                                             iproute2 \
-                                             libblkid1 \
-                                             libbz2-1.0 \
-                                             libbz2-dev \
-                                             libcap2 \
-                                             libc6 \
-                                             libffi-dev \
-                                             libgcc-s1 \
-                                             libldap2-dev \
-                                             liblz4-1 \
-                                             liblzma5 \
-                                             liblzma-dev \
-                                             libpq-dev \
-                                             libsasl2-dev \
-                                             libssl-dev \
-                                             libstdc++6 \
-                                             libsystemd-dev \
-                                             libwrap0 \
-                                             libxml2 \
-                                             libxml2-dev \
-                                             libxslt1-dev \
-                                             libxslt1.1 \
-                                             lsb-base \
-                                             netbase \
-                                             nfs-common \
-                                             nfs-kernel-server \
-                                             openvswitch-switch \
-                                             postgresql-client \
-                                             pkg-config \
-                                             python3-dev \
-                                             squashfs-tools \
-                                             sudo \
-                                             ssl-cert \
-                                             ucf \
-                                             xmlsec1 \
-                                             xz-utils \
-                                             zlib1g \
-                                             zlib1g-dev \
-                                             zopfli \
-                                             zstd \
-  && python3 -m pip install --upgrade --force-reinstall pip \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && apt-get clean -y \
-  && rm -rf /var/lib/apt/lists/* \
-  && find / -name '*.pyc' -delete \
-  && find / -name '*.pyo' -delete \
-  && find / -name '__pycache__' -delete \
-  && groupadd --system --gid 42424 manila \
-  && useradd --system --gid 42424 --uid 42424 --shell /sbin/nologin --create-home --home /var/lib/manila manila \
-  && mkdir -p /var/lib/manila/tmp \
-  && mkdir -p /var/lib/openstack/etc/manila \
-  && ln -s /var/lib/openstack/etc/manila /etc/manila \
-  && chown manila:manila -h /etc/manila \
-  && chown -R manila:manila /var/lib/openstack/etc/manila \
-  && chown -R manila:manila /var/lib/manila
-# Set the environment variables for the manila venv
-ENV PATH="/var/lib/openstack/bin:$PATH"
-# Set the working directory
-WORKDIR /var/lib/openstack
-# Set the user and group to match the original build
-USER 42424:42424
-# Set the entrypoint to the manila-manage command
-ENTRYPOINT ["/var/lib/openstack/bin/manila-manage"]
diff --git a/scripts/manila-api-cve-patching.sh b/scripts/manila-api-cve-patching.sh
deleted file mode 100644
index 62cac87..0000000
--- a/scripts/manila-api-cve-patching.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
-    # CVE fixes CVE-2025-27516,CVE-2024-47081,CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "eventlet==0.40.3" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-
-elif [ ${OS_VERSION:-master} = "unmaintained/2024.1" ]; then
-    # CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,
-    # CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,CVE-2023-29483,
-    # CVE-2024-3651,CVE-2024-35195,CVE-2024-37891,CVE-2024-12797,
-    # CVE-2024-47081,CVE-2024-49767,CVE-2024-34069,CVE-2024-49766,
-    # CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "PyMySQL==1.1.1" \
-                                       "WebOb==1.8.8" \
-                                       "Werkzeug==3.0.6" \
-                                       "cryptography==46.0.3" \
-                                       "dnspython==2.6.1" \
-                                       "eventlet==0.40.3" \
-                                       "idna==3.7" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-fi
diff --git a/scripts/manila-cve-patching.sh b/scripts/manila-cve-patching.sh
index 62cac87..07c59ab 100644
--- a/scripts/manila-cve-patching.sh
+++ b/scripts/manila-cve-patching.sh
@@ -8,6 +8,24 @@ if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
                                        "requests==2.32.4" \
                                        "urllib3==2.5.0"
 
+elif [ ${OS_VERSION:-master} = "stable/2024.2" ]; then
+    # CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,
+    # CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,CVE-2023-29483,
+    # CVE-2024-3651,CVE-2024-35195,CVE-2024-37891,CVE-2024-12797,
+    # CVE-2024-47081,CVE-2024-49767,CVE-2024-34069,CVE-2024-49766,
+    # CVE-2025-58068,CVE-2025-50181
+    /var/lib/openstack/bin/pip install --upgrade \
+                                       "Jinja2==3.1.6" \
+                                       "PyMySQL==1.1.1" \
+                                       "WebOb==1.8.8" \
+                                       "Werkzeug==3.0.6" \
+                                       "cryptography==46.0.3" \
+                                       "dnspython==2.6.1" \
+                                       "eventlet==0.40.3" \
+                                       "idna==3.7" \
+                                       "requests==2.32.4" \
+                                       "urllib3==2.5.0"
+
 elif [ ${OS_VERSION:-master} = "unmaintained/2024.1" ]; then
     # CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,
     # CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,CVE-2023-29483,
diff --git a/scripts/manila-data-cve-patching.sh b/scripts/manila-data-cve-patching.sh
deleted file mode 100644
index 62cac87..0000000
--- a/scripts/manila-data-cve-patching.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
-    # CVE fixes CVE-2025-27516,CVE-2024-47081,CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "eventlet==0.40.3" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-
-elif [ ${OS_VERSION:-master} = "unmaintained/2024.1" ]; then
-    # CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,
-    # CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,CVE-2023-29483,
-    # CVE-2024-3651,CVE-2024-35195,CVE-2024-37891,CVE-2024-12797,
-    # CVE-2024-47081,CVE-2024-49767,CVE-2024-34069,CVE-2024-49766,
-    # CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "PyMySQL==1.1.1" \
-                                       "WebOb==1.8.8" \
-                                       "Werkzeug==3.0.6" \
-                                       "cryptography==46.0.3" \
-                                       "dnspython==2.6.1" \
-                                       "eventlet==0.40.3" \
-                                       "idna==3.7" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-fi
diff --git a/scripts/manila-scheduler-cve-patching.sh b/scripts/manila-scheduler-cve-patching.sh
deleted file mode 100644
index 62cac87..0000000
--- a/scripts/manila-scheduler-cve-patching.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
-    # CVE fixes CVE-2025-27516,CVE-2024-47081,CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "eventlet==0.40.3" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-
-elif [ ${OS_VERSION:-master} = "unmaintained/2024.1" ]; then
-    # CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,
-    # CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,CVE-2023-29483,
-    # CVE-2024-3651,CVE-2024-35195,CVE-2024-37891,CVE-2024-12797,
-    # CVE-2024-47081,CVE-2024-49767,CVE-2024-34069,CVE-2024-49766,
-    # CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "PyMySQL==1.1.1" \
-                                       "WebOb==1.8.8" \
-                                       "Werkzeug==3.0.6" \
-                                       "cryptography==46.0.3" \
-                                       "dnspython==2.6.1" \
-                                       "eventlet==0.40.3" \
-                                       "idna==3.7" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-fi
diff --git a/scripts/manila-share-cve-patching.sh b/scripts/manila-share-cve-patching.sh
deleted file mode 100644
index 62cac87..0000000
--- a/scripts/manila-share-cve-patching.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ${OS_VERSION:-master} = "stable/2025.1" ]; then
-    # CVE fixes CVE-2025-27516,CVE-2024-47081,CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "eventlet==0.40.3" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-
-elif [ ${OS_VERSION:-master} = "unmaintained/2024.1" ]; then
-    # CVE fixes CVE-2024-34064,CVE-2024-56201,CVE-2024-56326,CVE-2025-27516,
-    # CVE-2024-36039,CVE-2024-42353,GHSA-h4gh-qq45-vh27,CVE-2023-29483,
-    # CVE-2024-3651,CVE-2024-35195,CVE-2024-37891,CVE-2024-12797,
-    # CVE-2024-47081,CVE-2024-49767,CVE-2024-34069,CVE-2024-49766,
-    # CVE-2025-58068,CVE-2025-50181
-    /var/lib/openstack/bin/pip install --upgrade \
-                                       "Jinja2==3.1.6" \
-                                       "PyMySQL==1.1.1" \
-                                       "WebOb==1.8.8" \
-                                       "Werkzeug==3.0.6" \
-                                       "cryptography==46.0.3" \
-                                       "dnspython==2.6.1" \
-                                       "eventlet==0.40.3" \
-                                       "idna==3.7" \
-                                       "requests==2.32.4" \
-                                       "urllib3==2.5.0"
-fi