diff --git a/Makefile b/Makefile
index cc0ea1e7..62a8a0be 100644
--- a/Makefile
+++ b/Makefile
@@ -157,16 +157,12 @@ set-experimental:
 
 build-windows-1809: build-windows-packages build-nanoserver-1809 build-dotnet-framework-1809
 
-build-windows-2004: build-windows-packages build-dotnet-framework-2004
-
 build-windows-2022: build-windows-packages build-dotnet-framework-2022
 
 build-nanoserver-1809: build-stack-nanoserver-1809 build-builder-nanoserver-1809 build-buildpacks-nanoserver-1809
 
 build-dotnet-framework-1809: build-stack-dotnet-framework-1809 build-builder-dotnet-framework-1809 build-buildpacks-dotnet-framework-1809
 
-build-dotnet-framework-2004: build-stack-dotnet-framework-2004 build-builder-dotnet-framework-2004 build-buildpacks-dotnet-framework-2004
-
 build-dotnet-framework-2022: build-stack-dotnet-framework-2022 build-builder-dotnet-framework-2022 build-buildpacks-dotnet-framework-2022
 
 build-stack-nanoserver-1809:
@@ -177,10 +173,6 @@ build-stack-dotnet-framework-1809:
 	@echo "> Building 'dotnet-framework-1809' stack..."
 	bash stacks/build-stack.sh stacks/dotnet-framework-1809
 
-build-stack-dotnet-framework-2004:
-	@echo "> Building 'dotnet-framework-2004' stack..."
-	bash stacks/build-stack.sh stacks/dotnet-framework-2004
-
 build-stack-dotnet-framework-2022:
 	@echo "> Building 'dotnet-framework-2022' stack..."
 	bash stacks/build-stack.sh stacks/dotnet-framework-2022
@@ -193,10 +185,6 @@ build-builder-dotnet-framework-1809: build-windows-packages
 	@echo "> Building 'dotnet-framework-1809' builder..."
 	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-1809 --config $(SAMPLES_ROOT)/builders/dotnet-framework-1809/builder.toml $(PULL_POLICY_NEVER)
 
-build-builder-dotnet-framework-2004: build-windows-packages
-	@echo "> Building 'dotnet-framework-2004' builder..."
-	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-2004 --config $(SAMPLES_ROOT)/builders/dotnet-framework-2004/builder.toml $(PULL_POLICY_NEVER)
-
 build-builder-dotnet-framework-2022: build-windows-packages
 	@echo "> Building 'dotnet-framework-2022' builder..."
 	$(PACK_CMD) builder create cnbs/sample-builder:dotnet-framework-2022 --config $(SAMPLES_ROOT)/builders/dotnet-framework-2022/builder.toml $(PULL_POLICY_NEVER)
@@ -212,10 +200,6 @@ build-buildpacks-dotnet-framework-1809: build-sample-root
 	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-1809' builder..."
 	$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-1809 -v --builder cnbs/sample-builder:dotnet-framework-1809 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
 
-build-buildpacks-dotnet-framework-2004: build-sample-root
-	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2004' builder..."
-	$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-2004 -v --builder cnbs/sample-builder:dotnet-framework-2004 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
-
 build-buildpacks-dotnet-framework-2022: build-sample-root
 	@echo "> Creating 'dotnet-framework' app using 'dotnet-framework-2022' builder..."
 	$(PACK_CMD) build sample-dotnet-framework-app:dotnet-framework-2022 -v --builder cnbs/sample-builder:dotnet-framework-2022 --buildpack $(SAMPLES_ROOT)/buildpacks/dotnet-framework --path apps/aspnet $(PULL_POLICY_NEVER) $(PACK_BUILD_FLAGS)
@@ -234,14 +218,10 @@ deploy-windows-packages:
 
 deploy-windows-1809: deploy-windows-stacks-1809 deploy-windows-builders-1809
 
-deploy-windows-2004: deploy-windows-stacks-2004 deploy-windows-builders-2004
-
 deploy-windows-2022: deploy-windows-stacks-2022 deploy-windows-builders-2022
 
 deploy-windows-stacks-1809: deploy-windows-stacks-nanoserver-1809 deploy-windows-stacks-dotnet-framework-1809
 
-deploy-windows-stacks-2004: deploy-windows-stacks-dotnet-framework-2004
-
 deploy-windows-stacks-2022: deploy-windows-stacks-dotnet-framework-2022
 
 deploy-windows-stacks-nanoserver-1809:
@@ -255,11 +235,6 @@ deploy-windows-stacks-dotnet-framework-1809:
 	docker push cnbs/sample-stack-run:dotnet-framework-1809
 	docker push cnbs/sample-stack-build:dotnet-framework-1809
 
-deploy-windows-stacks-dotnet-framework-2004:
-	@echo "> Deploying 'dotnet-framework-2004' stack..."
-	docker push cnbs/sample-stack-run:dotnet-framework-2004
-	docker push cnbs/sample-stack-build:dotnet-framework-2004
-
 deploy-windows-stacks-dotnet-framework-2022:
 	@echo "> Deploying 'dotnet-framework-2022' stack..."
 	docker push cnbs/sample-stack-run:dotnet-framework-2022
@@ -267,8 +242,6 @@ deploy-windows-stacks-dotnet-framework-2022:
 
 deploy-windows-builders-1809: deploy-windows-builders-nanoserver-1809 deploy-windows-builders-dotnet-framework-1809
 
-deploy-windows-builders-2004: deploy-windows-builders-dotnet-framework-2004
-
 deploy-windows-builders-2022: deploy-windows-builders-dotnet-framework-2022
 
 deploy-windows-builders-nanoserver-1809:
@@ -279,10 +252,6 @@ deploy-windows-builders-dotnet-framework-1809:
 	@echo "> Deploying 'dotnet-framework-1809' builder..."
 	docker push cnbs/sample-builder:dotnet-framework-1809
 
-deploy-windows-builders-dotnet-framework-2004:
-	@echo "> Deploying 'dotnet-framework-2004' builder..."
-	docker push cnbs/sample-builder:dotnet-framework-2004
-
 deploy-windows-builders-dotnet-framework-2022:
 	@echo "> Deploying 'dotnet-framework-2022' builder..."
 	docker push cnbs/sample-builder:dotnet-framework-2022
@@ -296,10 +265,6 @@ clean-windows:
 	@echo "> Removing 'dotnet-framework-1809' stack..."
 	docker rmi cnbs/sample-stack-run:dotnet-framework-1809 || true
 	docker rmi cnbs/sample-stack-build:dotnet-framework-1809 || true
-	
-	@echo "> Removing 'dotnet-framework-2004' stack..."
-	docker rmi cnbs/sample-stack-run:dotnet-framework-2004 || true
-	docker rmi cnbs/sample-stack-build:dotnet-framework-2004 || true
 
 	@echo "> Removing 'dotnet-framework-2022' stack..."
 	docker rmi cnbs/sample-stack-run:dotnet-framework-2022 || true
@@ -308,7 +273,6 @@ clean-windows:
 	@echo "> Removing builders..."
 	docker rmi cnbs/sample-builder:nanoserver-1809 || true
 	docker rmi cnbs/sample-builder:dotnet-framework-1809 || true
-	docker rmi cnbs/sample-builder:dotnet-framework-2004 || true
 	docker rmi cnbs/sample-builder:dotnet-framework-2022 || true
 
 	@echo "> Removing 'nanoserver-1809' apps..."
@@ -319,9 +283,6 @@ clean-windows:
 	@echo "> Removing 'dotnet-framework-1809' apps..."
 	docker rmi sample-aspnet-app:dotnet-framework-1809 || true
 
-	@echo "> Removing 'dotnet-framework-2004' apps..."
-	docker rmi sample-aspnet-app:dotnet-framework-2004 || true
-
 	@echo "> Removing 'dotnet-framework-2022' apps..."
 	docker rmi sample-aspnet-app:dotnet-framework-2022 || true
 
diff --git a/builders/dotnet-framework-2004/README.md b/builders/dotnet-framework-2004/README.md
deleted file mode 100644
index b79e18a3..00000000
--- a/builders/dotnet-framework-2004/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Sample .NET Framework 2004 Builder
-
-### Prerequisites
-* Docker with Windows Containers and support for 2004 images
-
-### Usage
-
-#### Creating the builder
-
-```bash
-pack builder create cnbs/sample-builder:dotnet-framework-2004 --config builder.toml
-```
-
-#### Build app with builder
-
-```bash
-pack build sample-app --builder cnbs/sample-builder:dotnet-framework-2004 --trust-builder --path ../../apps/aspnet
-```
-
-#### Run built app
-```
-docker run --rm -it -p 8080:80 sample-app
-```
diff --git a/builders/dotnet-framework-2004/builder.toml b/builders/dotnet-framework-2004/builder.toml
deleted file mode 100644
index 9c47af1a..00000000
--- a/builders/dotnet-framework-2004/builder.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Buildpacks to include in builder
-[[buildpacks]]
-id = "samples/dotnet-framework"
-version = "0.0.1"
-uri = "../../buildpacks/dotnet-framework"
-
-# Order used for detection
-[[order]]
-[[order.group]]
-id = "samples/dotnet-framework"
-version = "0.0.1"
-
-# Stack that will be used by the builder
-[stack]
-id = "io.buildpacks.samples.stacks.dotnet-framework-2004"
-run-image = "cnbs/sample-stack-run:dotnet-framework-2004"
-build-image = "cnbs/sample-stack-build:dotnet-framework-2004"
\ No newline at end of file
diff --git a/buildpacks/dotnet-framework/buildpack.toml b/buildpacks/dotnet-framework/buildpack.toml
index 5469e665..275f967f 100755
--- a/buildpacks/dotnet-framework/buildpack.toml
+++ b/buildpacks/dotnet-framework/buildpack.toml
@@ -8,8 +8,5 @@ api = "0.9"
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-1809"
 
-[[stacks]]
-  id = "io.buildpacks.samples.stacks.dotnet-framework-2004"
-
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
diff --git a/buildpacks/hello-moon-windows/buildpack.toml b/buildpacks/hello-moon-windows/buildpack.toml
index 4a241ef8..49646537 100644
--- a/buildpacks/hello-moon-windows/buildpack.toml
+++ b/buildpacks/hello-moon-windows/buildpack.toml
@@ -15,8 +15,5 @@ id = "io.buildpacks.samples.stacks.nanoserver-1809"
 [[stacks]]
 id = "io.buildpacks.samples.stacks.dotnet-framework-1809"
 
-[[stacks]]
-  id = "io.buildpacks.samples.stacks.dotnet-framework-2004"
-
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
diff --git a/buildpacks/hello-world-windows/buildpack.toml b/buildpacks/hello-world-windows/buildpack.toml
index 51d30f0c..161b9d6c 100644
--- a/buildpacks/hello-world-windows/buildpack.toml
+++ b/buildpacks/hello-world-windows/buildpack.toml
@@ -11,8 +11,5 @@ homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/hello-wor
 [[stacks]]
 id = "io.buildpacks.samples.stacks.nanoserver-1809"
 
-[[stacks]]
-  id = "io.buildpacks.samples.stacks.dotnet-framework-2004"
-
 [[stacks]]
   id = "io.buildpacks.samples.stacks.dotnet-framework-2022"
diff --git a/stacks/dotnet-framework-2004/build/Dockerfile b/stacks/dotnet-framework-2004/build/Dockerfile
deleted file mode 100644
index 0c2c98ea..00000000
--- a/stacks/dotnet-framework-2004/build/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-2004
-
-ARG stack_id
-
-# non-zero sets all user-owned directories to BUILTIN\Users
-ARG cnb_uid=1
-ARG cnb_gid=1
-
-ENV CNB_USER_ID=${cnb_uid}
-ENV CNB_GROUP_ID=${cnb_gid}
-
-LABEL io.buildpacks.stack.id=${stack_id}
-ENV CNB_STACK_ID=${stack_id}
-
-USER ContainerAdministrator
diff --git a/stacks/dotnet-framework-2004/run/Dockerfile b/stacks/dotnet-framework-2004/run/Dockerfile
deleted file mode 100644
index a2b223ec..00000000
--- a/stacks/dotnet-framework-2004/run/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-2004
-
-ARG stack_id
-
-# Create unresolved symlink from c:\inetpub\wwwroot to c:\workspace
-RUN Remove-Item -Force -Recurse c:\inetpub\wwwroot ; New-Item -Type Directory c:\workspace ; New-Item -Type SymbolicLink -Path c:\inetpub\wwwroot -Value c:\workspace ; Remove-Item -Force c:\workspace
-
-# launcher requires a non-empty PATH to workaround https://github.com/buildpacks/pack/issues/800
-ENV PATH=C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Users\\ContainerAdministrator\\AppData\\Local\\Microsoft\\WindowsApps
-
-LABEL io.buildpacks.stack.id=${stack_id}
-
-USER ContainerAdministrator