diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 043531c970..aece0a456e 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -65,7 +65,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.402
+        dotnet-version: 6.0.102
         
     - name: Clean
       run: dotnet clean ./OutOfSchool/OutOfSchool.sln --configuration Release && dotnet nuget locals all --clear
@@ -77,4 +77,4 @@ jobs:
       run: dotnet build --configuration Release --no-restore ./OutOfSchool
       
     - name: Test
-      run: dotnet test --no-restore --no-build --configuration Release ./OutOfSchool
\ No newline at end of file
+      run: dotnet test --no-restore --no-build --configuration Release ./OutOfSchool
diff --git a/cloudbuild-app.yml b/cloudbuild-app.yml
index a05022c2be..fb30566f70 100644
--- a/cloudbuild-app.yml
+++ b/cloudbuild-app.yml
@@ -6,11 +6,11 @@ steps:
     - build
     - gcr.io/$PROJECT_ID/oos-api:$SHORT_SHA
     - --cache-image=gcr.io/$PROJECT_ID/oos-api:cache
-    - --builder=paketobuildpacks/builder:full
+    # - --builder=paketobuildpacks/builder:full
+    - --builder=paketobuildpacks/builder:0.2.0-full
     - --buildpack=fagiani/apt
-    # TODO: after paketo-buildpacks/dotnet-core buildpack fix revert to using latest version
     # - --buildpack=gcr.io/paketo-buildpacks/dotnet-core
-    - --buildpack=docker:///gcr.io/paketo-buildpacks/dotnet-core:0.16.1
+    - --buildpack=docker:///gcr.io/paketo-buildpacks/dotnet-core:0.11.3
     - --env=BP_DOTNET_PROJECT_PATH=./OutOfSchool/OutOfSchool.WebApi/
     - --publish
 # Deploy container image to Cloud Run
diff --git a/cloudbuild-auth.yml b/cloudbuild-auth.yml
index fbd0bcecab..4518c0ee62 100644
--- a/cloudbuild-auth.yml
+++ b/cloudbuild-auth.yml
@@ -6,10 +6,10 @@ steps:
     - build
     - gcr.io/$PROJECT_ID/oos-auth:$SHORT_SHA
     - --cache-image=gcr.io/$PROJECT_ID/oos-auth:cache
-    # TODO: after paketo-buildpacks/dotnet-core buildpack fix revert to using latest version
     # - --buildpack=gcr.io/paketo-buildpacks/dotnet-core
-    - --buildpack=docker:///gcr.io/paketo-buildpacks/dotnet-core:0.16.1
-    - --builder=paketobuildpacks/builder:base
+    - --buildpack=docker:///gcr.io/paketo-buildpacks/dotnet-core:0.11.3
+    # - --builder=paketobuildpacks/builder:base
+    - --builder=paketobuildpacks/builder:0.2.0-base
     - --env=BP_DOTNET_PROJECT_PATH=./OutOfSchool/OutOfSchool.IdentityServer/
     - --publish
 # Deploy container image to Cloud Run