diff --git a/src/fedora/35/amd64/Dockerfile b/src/fedora/35/amd64/Dockerfile
new file mode 100644
index 000000000..78eb9a849
--- /dev/null
+++ b/src/fedora/35/amd64/Dockerfile
@@ -0,0 +1,51 @@
+FROM registry.fedoraproject.org/fedora:35
+
+RUN sleep 30
+RUN cat /etc/resolv.conf
+RUN curl -v http://google.com/
+RUN curl -v http://fedora.org/
+RUN curl -vL http://mirrors.fedoraproject.org/
+
+# Install the base toolchain we need to build anything (clang, cmake, make and the like)
+# this does not include libraries that we need to compile different projects, we'd like
+# them in a different layer.
+RUN dnf --setopt=install_weak_deps=False install -y \
+        clang \
+        cmake \
+        dnf-plugins-core \
+        findutils \
+        gdb \
+        glibc-langpack-en \
+        lldb-devel \
+        llvm-devel \
+        make \
+        python \
+        which \
+    && dnf clean all
+
+# Install tools used by build automation.
+RUN dnf --setopt=install_weak_deps=False install -y \
+        git \
+        tar \
+        procps \
+        zip \
+    && dnf clean all
+
+# Dependencies of CoreCLR, Mono and CoreFX.
+RUN dnf --setopt=install_weak_deps=False install -y \
+        autoconf \
+        automake \
+        glibc-locale-source \
+        iputils \
+        krb5-devel \
+        libcurl-devel \
+        libgdiplus \
+        libicu-devel \
+        libomp-devel \
+        libtool \
+        libunwind-devel \
+        libuuid-devel \
+        lttng-ust-devel \
+        openssl-devel \
+        uuid-devel \
+    && dnf clean all
diff --git a/src/fedora/35/amd64/microsoft.asc b/src/fedora/35/amd64/microsoft.asc
new file mode 100644
index 000000000..6e319d453
--- /dev/null
+++ b/src/fedora/35/amd64/microsoft.asc
@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
+LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
+7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
+OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
+H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
+M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
+ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
+AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
+/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
+MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
+7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
+KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
+XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
+NdCFTW7wY0Fb1fWJ+/KTsC4=
+=J6gs
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/src/fedora/manifest.json b/src/fedora/manifest.json
index c50a95d77..801da2d8f 100644
--- a/src/fedora/manifest.json
+++ b/src/fedora/manifest.json
@@ -50,6 +50,19 @@
               }
             }
           ]
+        },
+        {
+          "platforms": [{
+            "dockerfile": "src/fedora/35/amd64",
+            "os": "linux",
+            "osVersion": "fedora35",
+            "tags": {
+              "fedora-35-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+              "fedora-35": {
+                "isLocal": true
+              }
+            }
+          }]
         }
       ]
     }