diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index cb832c055..cdc617df2 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -164,9 +164,9 @@ stages:
               _RuntimeIdentifier: ''
               _BuildArchitecture: 'x64'
               _TestArg: $(_NonWindowsTestArg)
-            Build_Fedora_29_Debug_x64:
+            Build_Fedora_36_Debug_x64:
               _BuildConfig: Debug
-              _DockerParameter: '--docker fedora.29'
+              _DockerParameter: '--docker fedora.36'
               _LinuxPortable: '--linux-portable'
               _RuntimeIdentifier: ''
               _BuildArchitecture: 'x64'
diff --git a/eng/docker/fedora.29/Dockerfile b/eng/docker/fedora.36/Dockerfile
similarity index 87%
rename from eng/docker/fedora.29/Dockerfile
rename to eng/docker/fedora.36/Dockerfile
index 925bd8564..d36d5c15e 100644
--- a/eng/docker/fedora.29/Dockerfile
+++ b/eng/docker/fedora.36/Dockerfile
@@ -4,14 +4,14 @@
 #
 
 # Dockerfile that creates a container suitable to build dotnet-cli
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-2f0798a-20181105183801
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220716171953-531d246
 
 RUN dnf install -y nss
 
 RUN dnf clean all
 
 # Override RID set by the dotnet-buildtools-prereqs docker image
-ENV __PUBLISH_RID=fedora.29-x64
+ENV __PUBLISH_RID=fedora.36-x64
 
 # Setup User to match Host User, and give superuser permissions 
 ARG USER_ID=0