diff --git a/README.md b/README.md
index 111be3c..054a86e 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,6 @@ will be commited.
 
 ### [![Fedora](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml)
 
-- [dockerhub/fedora:36](https://hub.docker.com/r/_/fedora/tags?name=36) - `ghcr.io/saltstack/salt-ci-containers/fedora:36`
 - [dockerhub/fedora:37](https://hub.docker.com/r/_/fedora/tags?name=37) - `ghcr.io/saltstack/salt-ci-containers/fedora:37`
 - [dockerhub/fedora:38](https://hub.docker.com/r/_/fedora/tags?name=38) - `ghcr.io/saltstack/salt-ci-containers/fedora:38`
 - [dockerhub/fedora:39](https://hub.docker.com/r/_/fedora/tags?name=39) - `ghcr.io/saltstack/salt-ci-containers/fedora:39`
diff --git a/containers.yml b/containers.yml
index 0c27bec..819c9fb 100644
--- a/containers.yml
+++ b/containers.yml
@@ -192,7 +192,6 @@ mirrors:
   Fedora:
     container: fedora
     versions:
-      - "36"
       - "37"
       - "38"
       - "39"
diff --git a/mirrors/fedora/36.Dockerfile b/mirrors/fedora/36.Dockerfile
deleted file mode 100644
index 9d8235a..0000000
--- a/mirrors/fedora/36.Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM fedora:36
-RUN dnf update -y
diff --git a/mirrors/fedora/README.md b/mirrors/fedora/README.md
index 06c3631..7b88f8a 100644
--- a/mirrors/fedora/README.md
+++ b/mirrors/fedora/README.md
@@ -1,6 +1,5 @@
 # [![Fedora](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml)
 
-- [dockerhub/fedora:36](https://hub.docker.com/r/_/fedora/tags?name=36) - `ghcr.io/saltstack/salt-ci-containers/fedora:36`
 - [dockerhub/fedora:37](https://hub.docker.com/r/_/fedora/tags?name=37) - `ghcr.io/saltstack/salt-ci-containers/fedora:37`
 - [dockerhub/fedora:38](https://hub.docker.com/r/_/fedora/tags?name=38) - `ghcr.io/saltstack/salt-ci-containers/fedora:38`
 - [dockerhub/fedora:39](https://hub.docker.com/r/_/fedora/tags?name=39) - `ghcr.io/saltstack/salt-ci-containers/fedora:39`