diff --git a/README.monitor-base.md b/README.monitor-base.md
index aa7e8460a8..5110a7c371 100644
--- a/README.monitor-base.md
+++ b/README.monitor-base.md
@@ -57,8 +57,6 @@ Tags | Dockerfile | OS Version
 9.0.2-amd64, 9.0-amd64, 9.0.2, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
 8.1.0-ubuntu-chiseled-amd64, 8.1-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.1.0-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
 8.1.0-azurelinux-distroless-amd64, 8.1-azurelinux-distroless-amd64, 8-azurelinux-distroless-amd64, 8.1.0-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
-8.0.8-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
-8.0.8-azurelinux-distroless-amd64, 8.0-azurelinux-distroless-amd64, 8.0.8-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
 
 #### .NET Monitor Preview Tags
 
@@ -73,8 +71,6 @@ Tags | Dockerfile | OS Version
 9.0.2-arm64v8, 9.0-arm64v8, 9.0.2, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 8.1.0-ubuntu-chiseled-arm64v8, 8.1-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.1.0-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
 8.1.0-azurelinux-distroless-arm64v8, 8.1-azurelinux-distroless-arm64v8, 8-azurelinux-distroless-arm64v8, 8.1.0-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.8-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.8-azurelinux-distroless-arm64v8, 8.0-azurelinux-distroless-arm64v8, 8.0.8-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 
 #### .NET Monitor Preview Tags
 
diff --git a/README.monitor.md b/README.monitor.md
index e69554cabf..0059f6f840 100644
--- a/README.monitor.md
+++ b/README.monitor.md
@@ -56,8 +56,6 @@ Tags | Dockerfile | OS Version
 9.0.2, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
 8.1.0-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
 8.1.0-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
-8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
-8.0.8-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
 
 #### .NET Monitor Preview Tags
 
@@ -72,8 +70,6 @@ Tags | Dockerfile | OS Version
 9.0.2, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 8.1.0-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
 8.1.0-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
-8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
-8.0.8-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
 
 #### .NET Monitor Preview Tags
 
diff --git a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml
index f874eb97e9..ce9342ad59 100644
--- a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml
+++ b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml
@@ -3,5 +3,3 @@ $(McrTagsYmlTagGroup:9.1-preview|.NET Monitor Preview Tags)
 $(McrTagsYmlTagGroup:9.0)
 $(McrTagsYmlTagGroup:8.1-ubuntu-chiseled)
 $(McrTagsYmlTagGroup:8.1-azurelinux-distroless)
-$(McrTagsYmlTagGroup:8.0-ubuntu-chiseled)
-$(McrTagsYmlTagGroup:8.0-azurelinux-distroless)
diff --git a/eng/mcr-tags-metadata-templates/monitor-tags.yml b/eng/mcr-tags-metadata-templates/monitor-tags.yml
index 2dc8ef7b62..3ed828f4cd 100644
--- a/eng/mcr-tags-metadata-templates/monitor-tags.yml
+++ b/eng/mcr-tags-metadata-templates/monitor-tags.yml
@@ -3,5 +3,3 @@ $(McrTagsYmlTagGroup:9.1-preview|.NET Monitor Preview Tags)
 $(McrTagsYmlTagGroup:9.0)
 $(McrTagsYmlTagGroup:8.1-ubuntu-chiseled)
 $(McrTagsYmlTagGroup:8.1-azurelinux-distroless)
-$(McrTagsYmlTagGroup:8.0-ubuntu-chiseled)
-$(McrTagsYmlTagGroup:8.0-azurelinux-distroless)
diff --git a/manifest.json b/manifest.json
index 6b4cf454e3..eae37ea3b2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9288,100 +9288,6 @@
       ],
       "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/monitor-base-tags.yml",
       "images": [
-        {
-          "productVersion": "$(monitor|8.0|product-version)",
-          "sharedTags": {
-            "$(monitor|8.0|fixed-tag)-ubuntu-chiseled": {},
-            "$(monitor|8.0|minor-tag)-ubuntu-chiseled": {},
-            "$(monitor|8.0|fixed-tag)": {},
-            "$(monitor|8.0|minor-tag)": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/monitor-base/8.0/ubuntu-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "jammy-chiseled",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-amd64": {},
-                "$(monitor|8.0|minor-tag)-ubuntu-chiseled-amd64": {}
-              }
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/monitor-base/8.0/ubuntu-chiseled/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "jammy-chiseled",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-arm64v8": {},
-                "$(monitor|8.0|minor-tag)-ubuntu-chiseled-arm64v8": {}
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(monitor|8.0|product-version)",
-          "sharedTags": {
-            "$(monitor|8.0|fixed-tag)-azurelinux-distroless": {},
-            "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless": {
-              "docType": "Undocumented"
-            },
-            "$(monitor|8.0|minor-tag)-azurelinux-distroless": {},
-            "$(monitor|8.0|minor-tag)-cbl-mariner-distroless": {
-              "docType": "Undocumented"
-            }
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/monitor-base/8.0/azurelinux-distroless/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-azurelinux-distroless-amd64": {},
-                "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(monitor|8.0|minor-tag)-azurelinux-distroless-amd64": {},
-                "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-amd64": {
-                  "docType": "Undocumented"
-                }
-              }
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:aspnet)"
-              },
-              "dockerfile": "src/monitor-base/8.0/azurelinux-distroless/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-azurelinux-distroless-arm64v8": {},
-                "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(monitor|8.0|minor-tag)-azurelinux-distroless-arm64v8": {},
-                "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                }
-              },
-              "variant": "v8"
-            }
-          ]
-        },
         {
           "productVersion": "$(monitor|8.1|product-version)",
           "sharedTags": {
@@ -9590,104 +9496,6 @@
       ],
       "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/monitor-tags.yml",
       "images": [
-        {
-          "productVersion": "$(monitor|8.0|product-version)",
-          "sharedTags": {
-            "$(monitor|8.0|fixed-tag)-ubuntu-chiseled": {},
-            "$(monitor|8.0|minor-tag)-ubuntu-chiseled": {},
-            "$(monitor|8.0|fixed-tag)": {},
-            "$(monitor|8.0|minor-tag)": {}
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:monitor-base)"
-              },
-              "dockerfile": "src/monitor/8.0/ubuntu-chiseled/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "jammy-chiseled",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(monitor|8.0|minor-tag)-ubuntu-chiseled-amd64": {
-                  "docType": "Undocumented"
-                }
-              }
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:monitor-base)"
-              },
-              "dockerfile": "src/monitor/8.0/ubuntu-chiseled/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "jammy-chiseled",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(monitor|8.0|minor-tag)-ubuntu-chiseled-arm64v8": {
-                  "docType": "Undocumented"
-                }
-              },
-              "variant": "v8"
-            }
-          ]
-        },
-        {
-          "productVersion": "$(monitor|8.0|product-version)",
-          "sharedTags": {
-            "$(monitor|8.0|fixed-tag)-azurelinux-distroless": {},
-            "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless": {
-              "docType": "Undocumented"
-            },
-            "$(monitor|8.0|minor-tag)-azurelinux-distroless": {},
-            "$(monitor|8.0|minor-tag)-cbl-mariner-distroless": {
-              "docType": "Undocumented"
-            }
-          },
-          "platforms": [
-            {
-              "buildArgs": {
-                "REPO": "$(Repo:monitor-base)"
-              },
-              "dockerfile": "src/monitor/8.0/azurelinux-distroless/amd64",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-amd64": {
-                  "docType": "Undocumented"
-                },
-                "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-amd64": {
-                  "docType": "Undocumented"
-                }
-              }
-            },
-            {
-              "architecture": "arm64",
-              "buildArgs": {
-                "REPO": "$(Repo:monitor-base)"
-              },
-              "dockerfile": "src/monitor/8.0/azurelinux-distroless/arm64v8",
-              "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
-              "os": "linux",
-              "osVersion": "azurelinux3.0-distroless",
-              "tags": {
-                "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                },
-                "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {
-                  "docType": "Undocumented"
-                }
-              },
-              "variant": "v8"
-            }
-          ]
-        },
         {
           "productVersion": "$(monitor|8.1|product-version)",
           "sharedTags": {
diff --git a/manifest.versions.json b/manifest.versions.json
index e2c7a3b335..4ac0d060ee 100644
--- a/manifest.versions.json
+++ b/manifest.versions.json
@@ -139,19 +139,6 @@
 
     "monitor|8|major-tag": "8",
 
-    "monitor|8.0|build-version": "8.0.8",
-    "monitor|8.0|product-version": "8.0.8",
-    "monitor|8.0|fixed-tag": "$(monitor|8.0|product-version)",
-    "monitor|8.0|minor-tag": "8.0",
-    "monitor|8.0|base-url|main": "$(base-url|public|maintenance|main)",
-    "monitor|8.0|base-url|nightly": "$(base-url|public|maintenance|nightly)",
-    "monitor-base|8.0|linux|x64|sha": "1761d0754ed60014cca4e5c76d2c0abb2e2aaea91f22800c3411397fbde012120610abb5c46398f841031b2bfeb16d59ef0ab81d49dccc1a9648d6a6c06a6c15",
-    "monitor-base|8.0|linux|arm64|sha": "095888e19feb703460cf920e15d7044d689f5f928ea3c00083f14787d471393db3bceedb8b7c63db154340346ba1753350fe62831598c2942588ba7cc1cd91f0",
-    "monitor-ext-azureblobstorage|8.0|linux|x64|sha": "457c29126ff164ac06e82525d4c54835f263f5447d2ab65a8c228181e0de3f47291668f0f2c3ff204c462f5110d6ed053a5d169231b17af9e959a2ffb745bd23",
-    "monitor-ext-azureblobstorage|8.0|linux|arm64|sha": "d42e7bbf900f5432e76dae983f28f3bfbd0cb1eab0433197379edaee1fe013ad8d2f78df7502476f589a234521e8b1c8fd873de048a0d92eaa87f4f8b4cfc357",
-    "monitor-ext-s3storage|8.0|linux|x64|sha": "fa6b0db58bf70e1c242703fb3f555ad0754b3fe0829ab539b1ad06c58c47287a3f02fc11f2f23f13f4a94400eaa157c3ef159d19a9d2b327f2963d5a1bb3ef64",
-    "monitor-ext-s3storage|8.0|linux|arm64|sha": "0fcd310d795938c96d2c8b30fc4b705207b9e00f6463914d9d55e8640796861d719f71359b2b09d92fc1fe103307ed6fb4a3fe261e22b17df39ccee6607d42dc",
-
     "monitor|8.1|build-version": "8.1.0",
     "monitor|8.1|product-version": "8.1.0",
     "monitor|8.1|fixed-tag": "$(monitor|8.1|product-version)",
diff --git a/src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile
deleted file mode 100644
index ec4c50cc95..0000000000
--- a/src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
-    && dotnet_monitor_base_sha512='1761d0754ed60014cca4e5c76d2c0abb2e2aaea91f22800c3411397fbde012120610abb5c46398f841031b2bfeb16d59ef0ab81d49dccc1a9648d6a6c06a6c15' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:8.0.15-azurelinux3.0-distroless-amd64
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile
deleted file mode 100644
index 3ba31f526f..0000000000
--- a/src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
-    && dotnet_monitor_base_sha512='095888e19feb703460cf920e15d7044d689f5f928ea3c00083f14787d471393db3bceedb8b7c63db154340346ba1753350fe62831598c2942588ba7cc1cd91f0' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:8.0.15-azurelinux3.0-distroless-arm64v8
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile b/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile
deleted file mode 100644
index 9cdf97f03c..0000000000
--- a/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM amd64/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
-    && dotnet_monitor_base_sha512='1761d0754ed60014cca4e5c76d2c0abb2e2aaea91f22800c3411397fbde012120610abb5c46398f841031b2bfeb16d59ef0ab81d49dccc1a9648d6a6c06a6c15' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:8.0.15-jammy-chiseled-amd64
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile b/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile
deleted file mode 100644
index 7b31fb4c0c..0000000000
--- a/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM arm64v8/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
-    && dotnet_monitor_base_sha512='095888e19feb703460cf920e15d7044d689f5f928ea3c00083f14787d471393db3bceedb8b7c63db154340346ba1753350fe62831598c2942588ba7cc1cd91f0' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:8.0.15-jammy-chiseled-arm64v8
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile
deleted file mode 100644
index 9f982bbb64..0000000000
--- a/src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
-    && dotnet_monitor_extension_sha512='457c29126ff164ac06e82525d4c54835f263f5447d2ab65a8c228181e0de3f47291668f0f2c3ff204c462f5110d6ed053a5d169231b17af9e959a2ffb745bd23' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
-    && dotnet_monitor_extension_sha512='fa6b0db58bf70e1c242703fb3f555ad0754b3fe0829ab539b1ad06c58c47287a3f02fc11f2f23f13f4a94400eaa157c3ef159d19a9d2b327f2963d5a1bb3ef64' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:8.0.8-azurelinux-distroless-amd64
-
-COPY --from=installer ["/app", "/app"]
diff --git a/src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile
deleted file mode 100644
index a2055905fc..0000000000
--- a/src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
-    && dotnet_monitor_extension_sha512='d42e7bbf900f5432e76dae983f28f3bfbd0cb1eab0433197379edaee1fe013ad8d2f78df7502476f589a234521e8b1c8fd873de048a0d92eaa87f4f8b4cfc357' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
-    && dotnet_monitor_extension_sha512='0fcd310d795938c96d2c8b30fc4b705207b9e00f6463914d9d55e8640796861d719f71359b2b09d92fc1fe103307ed6fb4a3fe261e22b17df39ccee6607d42dc' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:8.0.8-azurelinux-distroless-arm64v8
-
-COPY --from=installer ["/app", "/app"]
diff --git a/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile b/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile
deleted file mode 100644
index ba8a9e2deb..0000000000
--- a/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM amd64/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
-    && dotnet_monitor_extension_sha512='457c29126ff164ac06e82525d4c54835f263f5447d2ab65a8c228181e0de3f47291668f0f2c3ff204c462f5110d6ed053a5d169231b17af9e959a2ffb745bd23' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
-    && dotnet_monitor_extension_sha512='fa6b0db58bf70e1c242703fb3f555ad0754b3fe0829ab539b1ad06c58c47287a3f02fc11f2f23f13f4a94400eaa157c3ef159d19a9d2b327f2963d5a1bb3ef64' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:8.0.8-ubuntu-chiseled-amd64
-
-COPY --from=installer ["/app", "/app"]
diff --git a/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile b/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile
deleted file mode 100644
index 710aeb50a2..0000000000
--- a/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM arm64v8/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=8.0.8 \
-    && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
-    && dotnet_monitor_extension_sha512='d42e7bbf900f5432e76dae983f28f3bfbd0cb1eab0433197379edaee1fe013ad8d2f78df7502476f589a234521e8b1c8fd873de048a0d92eaa87f4f8b4cfc357' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
-    && dotnet_monitor_extension_sha512='0fcd310d795938c96d2c8b30fc4b705207b9e00f6463914d9d55e8640796861d719f71359b2b09d92fc1fe103307ed6fb4a3fe261e22b17df39ccee6607d42dc' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:8.0.8-ubuntu-chiseled-arm64v8
-
-COPY --from=installer ["/app", "/app"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-azurelinux-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-azurelinux-distroless-amd64-Dockerfile.approved.txt
deleted file mode 100644
index dbc2df0a7c..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-azurelinux-distroless-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-s3storage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:0.0.0-azurelinux-distroless-amd64
-
-COPY --from=installer ["/app", "/app"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-azurelinux-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
deleted file mode 100644
index 247937b14c..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-s3storage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:0.0.0-azurelinux-distroless-arm64v8
-
-COPY --from=installer ["/app", "/app"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-ubuntu-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-ubuntu-chiseled-amd64-Dockerfile.approved.txt
deleted file mode 100644
index 23bb882be0..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-ubuntu-chiseled-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM amd64/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-s3storage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:0.0.0-ubuntu-chiseled-amd64
-
-COPY --from=installer ["/app", "/app"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-ubuntu-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-ubuntu-chiseled-arm64v8-Dockerfile.approved.txt
deleted file mode 100644
index cbee065a9c..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.0-ubuntu-chiseled-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/monitor/base
-
-# Installer image
-FROM arm64v8/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor extensions
-RUN dotnet_monitor_extension_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
-    \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-egress-s3storage.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz" \
-    && dotnet_monitor_extension_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_extension_sha512  dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
-    \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-azureblobstorage.tar.gz \
-    && tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
-    && rm dotnet-monitor-egress-s3storage.tar.gz
-
-
-# .NET Monitor image
-FROM $REPO:0.0.0-ubuntu-chiseled-arm64v8
-
-COPY --from=installer ["/app", "/app"]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-azurelinux-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-azurelinux-distroless-amd64-Dockerfile.approved.txt
deleted file mode 100644
index f93f4bc43d..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-azurelinux-distroless-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-base.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz" \
-    && dotnet_monitor_base_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:0.0.0-azurelinux3.0-distroless-amd64
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-azurelinux-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
deleted file mode 100644
index 593efb6e8c..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-azurelinux-distroless-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer
-
-RUN tdnf install -y \
-        ca-certificates \
-        gzip \
-        tar \
-    && tdnf clean all
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-base.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz" \
-    && dotnet_monitor_base_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:0.0.0-azurelinux3.0-distroless-arm64v8
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-ubuntu-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-ubuntu-chiseled-amd64-Dockerfile.approved.txt
deleted file mode 100644
index 8e11940a7f..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-ubuntu-chiseled-amd64-Dockerfile.approved.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM amd64/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-base.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz" \
-    && dotnet_monitor_base_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:0.0.0-jammy-chiseled-amd64
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-ubuntu-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-ubuntu-chiseled-arm64v8-Dockerfile.approved.txt
deleted file mode 100644
index 9ec1ef6233..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-8.0-ubuntu-chiseled-arm64v8-Dockerfile.approved.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-ARG REPO=mcr.microsoft.com/dotnet/aspnet
-
-# Installer image
-FROM arm64v8/buildpack-deps:jammy-curl AS installer
-
-# Retrieve .NET Monitor Base
-RUN dotnet_monitor_version=0.0.0 \
-    && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet-monitor-base.tar.gz "https://artifacts.visualstudio.com/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz" \
-    && dotnet_monitor_base_sha512='{sha512_placeholder}' \
-    && echo "$dotnet_monitor_base_sha512  dotnet-monitor-base.tar.gz" | sha512sum -c - \
-    && mkdir -p /app \
-    && tar -oxzf dotnet-monitor-base.tar.gz -C /app \
-    && rm dotnet-monitor-base.tar.gz
-
-
-# .NET Monitor Base image
-FROM $REPO:0.0.0-jammy-chiseled-arm64v8
-
-WORKDIR /app
-COPY --from=installer /app .
-
-ENV \
-    # Unset ASPNETCORE_HTTP_PORTS from aspnet base image
-    ASPNETCORE_HTTP_PORTS= \
-    # Disable debugger and profiler diagnostics to avoid diagnosing self.
-    COMPlus_EnableDiagnostics=0 \
-    # Default Filter
-    DefaultProcess__Filters__0__Key=ProcessId \
-    DefaultProcess__Filters__0__Value=1 \
-    # Remove Unix Domain Socket before starting diagnostic port server
-    DiagnosticPort__DeleteEndpointOnStartup=true \
-    # Server GC mode
-    DOTNET_gcServer=1 \
-    # Logging: JSON format so that analytic platforms can get discrete entry information
-    Logging__Console__FormatterName=json \
-    # Logging: Use round-trip date/time format without timezone information (always logged in UTC)
-    Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \
-    # Logging: Write timestamps using UTC offset (+0:00)
-    Logging__Console__FormatterOptions__UseUtcTimestamp=true \
-    # Add dotnet-monitor path to front of PATH for easier, prioritized execution
-    PATH="/app:${PATH}"
-
-ENTRYPOINT [ "dotnet-monitor" ]
-CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]
diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
index e8ded59493..dbbefdb076 100644
--- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
+++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs
@@ -343,12 +343,6 @@ public static class TestData
 
         private static readonly ProductImageData[] s_linuxMonitorTestData =
         {
-            new ProductImageData { Version = V8_0, VersionFamily = V8_0, OS = OS.JammyChiseled,          OSTag = OS.UbuntuChiseled,    Arch = Arch.Amd64,  SupportedImageRepos = DotNetImageRepo.Monitor },
-            new ProductImageData { Version = V8_0, VersionFamily = V8_0, OS = OS.JammyChiseled,          OSTag = OS.UbuntuChiseled,    Arch = Arch.Arm64,  SupportedImageRepos = DotNetImageRepo.Monitor },
-            // OSTag does not correspond to OS because platform tags for Azure Linux were not added to the images.
-            // Use CBL-Mariner distroless for OSTag since those platform tags exist and won't require tests to understand the difference in tagging.
-            new ProductImageData { Version = V8_0, VersionFamily = V8_0, OS = OS.AzureLinux30Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64,  SupportedImageRepos = DotNetImageRepo.Monitor },
-            new ProductImageData { Version = V8_0, VersionFamily = V8_0, OS = OS.AzureLinux30Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64,  SupportedImageRepos = DotNetImageRepo.Monitor },
             new ProductImageData { Version = V8_1, VersionFamily = V8_0, OS = OS.JammyChiseled,          OSTag = OS.UbuntuChiseled,    Arch = Arch.Amd64,  SupportedImageRepos = DotNetImageRepo.Monitor },
             new ProductImageData { Version = V8_1, VersionFamily = V8_0, OS = OS.JammyChiseled,          OSTag = OS.UbuntuChiseled,    Arch = Arch.Arm64,  SupportedImageRepos = DotNetImageRepo.Monitor },
             // OSTag does not correspond to OS because platform tags for Azure Linux were not added to the images
diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json
index 994576c790..1c2abf67ea 100644
--- a/tests/performance/ImageSize.nightly.linux.json
+++ b/tests/performance/ImageSize.nightly.linux.json
@@ -370,10 +370,6 @@
     "src/sdk/10.0/noble-aot/arm64v8": 896400197
   },
   "dotnet/nightly/monitor": {
-    "src/monitor/8.0/ubuntu-chiseled/amd64": 127821834,
-    "src/monitor/8.0/ubuntu-chiseled/arm64v8": 134958622,
-    "src/monitor/8.0/azurelinux-distroless/amd64": 141200979,
-    "src/monitor/8.0/azurelinux-distroless/arm64v8": 148117492,
     "src/monitor/8.1/ubuntu-chiseled/amd64": 127821834,
     "src/monitor/8.1/ubuntu-chiseled/arm64v8": 134958622,
     "src/monitor/8.1/azurelinux-distroless/amd64": 141200979,
@@ -384,10 +380,6 @@
     "src/monitor/9.1/azurelinux-distroless/arm64v8": 149490964
   },
   "dotnet/nightly/monitor/base": {
-    "src/monitor-base/8.0/ubuntu-chiseled/amd64": 119965752,
-    "src/monitor-base/8.0/ubuntu-chiseled/arm64v8": 127102540,
-    "src/monitor-base/8.0/azurelinux-distroless/amd64": 133344897,
-    "src/monitor-base/8.0/azurelinux-distroless/arm64v8": 140261410,
     "src/monitor-base/8.1/ubuntu-chiseled/amd64": 119965752,
     "src/monitor-base/8.1/ubuntu-chiseled/arm64v8": 127102540,
     "src/monitor-base/8.1/azurelinux-distroless/amd64": 133344897,