diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml
index 76b27f0..c8158f0 100644
--- a/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml
+++ b/.github/workflows/BuildGitHubAgentsUbuntuLatest.yml
@@ -45,3 +45,11 @@ jobs:
             base-image-exclude-filter: ${{ matrix.sdk }}-nanoserver-1
             base-image-exclude-filter: ${{ matrix.sdk }}-nanoserver-2
             base-image-exclude-filter: ${{ matrix.sdk }}-windowsservercore-ltsc2019
+            base-image-exclude-filter: ${{ matrix.sdk }}-cbl-mariner
+            base-image-exclude-filter: ${{ matrix.sdk }}-cbl-mariner-amd64
+            base-image-exclude-filter: ${{ matrix.sdk }}-cbl-mariner2.0
+            base-image-exclude-filter: ${{ matrix.sdk }}-cbl-mariner2.0-amd64
+            base-image-exclude-filter: ${{ matrix.sdk }}-focal
+            base-image-exclude-filter: ${{ matrix.sdk }}-focal-amd64
+            base-image-exclude-filter: ${{ matrix.sdk }}-jammy
+            base-image-exclude-filter: ${{ matrix.sdk }}-jammy-amd64
\ No newline at end of file
diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml
new file mode 100644
index 0000000..b03b6c8
--- /dev/null
+++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml
@@ -0,0 +1,45 @@
+name: Build Focal on GitHub Ubuntu Latest Agent
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+      - hotfix/*
+  schedule:
+    - cron:  '0 7 * * WED'
+
+jobs:
+  build:
+    name: Build Images
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        sdk: ['6.0', '7.0']
+    steps:
+      - if: github.ref == 'refs/heads/main'
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Get the sources
+        uses: actions/checkout@v3
+
+      - name: Install .NET Core SDK
+        uses: actions/setup-dotnet@v3
+
+      - name: Run Cake script
+        uses: cake-build/cake-action@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          cake-version: tool-manifest
+          arguments: |
+            remove-base-image: true
+            base-image-include-filter: ${{ matrix.sdk }}-focal
+            base-image-include-filter: ${{ matrix.sdk }}-focal-amd64
diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml
new file mode 100644
index 0000000..003cce7
--- /dev/null
+++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml
@@ -0,0 +1,45 @@
+name: Build Jammy on GitHub Ubuntu Latest Agent
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+      - hotfix/*
+  schedule:
+    - cron:  '0 7 * * WED'
+
+jobs:
+  build:
+    name: Build Images
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        sdk: ['6.0', '7.0']
+    steps:
+      - if: github.ref == 'refs/heads/main'
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Get the sources
+        uses: actions/checkout@v3
+
+      - name: Install .NET Core SDK
+        uses: actions/setup-dotnet@v3
+
+      - name: Run Cake script
+        uses: cake-build/cake-action@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          cake-version: tool-manifest
+          arguments: |
+            remove-base-image: true
+            base-image-include-filter: ${{ matrix.sdk }}-cbl-jammy
+            base-image-include-filter: ${{ matrix.sdk }}-cbl-jammy-amd64
\ No newline at end of file
diff --git a/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml b/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml
new file mode 100644
index 0000000..91bfeab
--- /dev/null
+++ b/.github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml
@@ -0,0 +1,47 @@
+name: Build Mariner on GitHub Ubuntu Latest Agent
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+      - hotfix/*
+  schedule:
+    - cron:  '0 7 * * WED'
+
+jobs:
+  build:
+    name: Build Images
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        sdk: ['6.0', '7.0']
+    steps:
+      - if: github.ref == 'refs/heads/main'
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Get the sources
+        uses: actions/checkout@v3
+
+      - name: Install .NET Core SDK
+        uses: actions/setup-dotnet@v3
+
+      - name: Run Cake script
+        uses: cake-build/cake-action@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          cake-version: tool-manifest
+          arguments: |
+            remove-base-image: true
+            base-image-include-filter: ${{ matrix.sdk }}-cbl-mariner
+            base-image-include-filter: ${{ matrix.sdk }}-cbl-mariner-amd64
+            base-image-include-filter: ${{ matrix.sdk }}-cbl-mariner2.0
+            base-image-include-filter: ${{ matrix.sdk }}-cbl-mariner2.0-amd64