diff --git a/sample-apps/dotnet/codebuild/buildspec.yml b/sample-apps/dotnet/codebuild/buildspec.yml
new file mode 100644
index 000000000..7d6519bf0
--- /dev/null
+++ b/sample-apps/dotnet/codebuild/buildspec.yml
@@ -0,0 +1,32 @@
+version: 0.2
+
+phases:
+  pre_build:
+    commands:
+      - echo "Pre-build phase -- Logging into Amazon ECR..."
+      - $ecrUrl = "$env:ACCOUNT_ID.dkr.ecr.$env:AWS_DEFAULT_REGION.amazonaws.com"
+#      - (Get-ECRLoginCommand).Password | docker login --username AWS --password-stdin $env:ACCOUNT_ID.dkr.ecr.$env:AWS_DEFAULT_REGION.amazonaws.com
+      - (Get-ECRLoginCommand).Password | docker login --username AWS --password-stdin $ecrUrl
+      - echo "Pre-build phase completed."
+
+  build:
+    commands:
+      - echo "Build phase -- Building Docker image via docker-compose..."
+      - docker-compose -f sample-apps/dotnet/docker-compose-windows.yaml build
+      - echo "Tagging the Docker image..."
+      - $ecrMainImageUrl = "$env:ACCOUNT_ID.dkr.ecr.$env:AWS_DEFAULT_REGION.amazonaws.com/appsignals-dotnet-windows-main-service:latest"
+      - $ecrRemoteImageUrl = "$env:ACCOUNT_ID.dkr.ecr.$env:AWS_DEFAULT_REGION.amazonaws.com/appsignals-dotnet-windows-remote-service:latest"
+      - docker tag dotnetsampleapp/frontend-service:latest $ecrMainImageUrl
+      - docker tag dotnetsampleapp/remote-service:latest $ecrRemoteImageUrl
+
+  post_build:
+    commands:
+      - echo "Post-build phase -- Pushing Docker image to ECR..."
+      - docker push $ecrMainImageUrl
+      - docker push $ecrRemoteImageUrl
+      - echo "Build completed successfully."
+
+artifacts:
+  files:
+    - '**/*'
+  discard-paths: yes
\ No newline at end of file
diff --git a/sample-apps/dotnet/docker-compose-windows.yaml b/sample-apps/dotnet/docker-compose-windows.yaml
index f2c78ca8a..2a58a1b29 100644
--- a/sample-apps/dotnet/docker-compose-windows.yaml
+++ b/sample-apps/dotnet/docker-compose-windows.yaml
@@ -9,7 +9,7 @@ services:
       - "8.8.6.6"
     build:
       context: .
-      dockerfile: asp_frontend_service/Dockerfile
+      dockerfile: asp_frontend_service/Dockerfile_Windows
     container_name: asp_frontend_service
     restart: always
     ports:
@@ -22,7 +22,7 @@ services:
       - "8.8.6.6"
     build:
       context: .
-      dockerfile: asp_remote_service/Dockerfile
+      dockerfile: asp_remote_service/Dockerfile_Windows
     container_name: asp_remote_service
     restart: always
     ports: