diff --git a/tools/osbuilder/README.md b/tools/osbuilder/README.md
index cf8c02cef8..6bdfa28f81 100644
--- a/tools/osbuilder/README.md
+++ b/tools/osbuilder/README.md
@@ -209,9 +209,9 @@ of the the osbuilder distributions.
 > Note: this table is not relevant for the dracut build method, since it supports
 any Linux distribution and architecture where dracut is available.
 
-|           |Alpine            |Clear Linux       |Debian/Ubuntu     |Fedora            |openSUSE          |
-|--         |--                |--                |--                |--                |--                |
-|**ARM64**  |:heavy_check_mark:|                  |                  |:heavy_check_mark:|:heavy_check_mark:|
-|**PPC64le**|:heavy_check_mark:|                  |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
-|**s390x**  |                  |                  |:heavy_check_mark:|:heavy_check_mark:|                  |
-|**x86_64** |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
+|           |Alpine            |Clear Linux       |Debian/Ubuntu     |openSUSE          |
+|--         |--                |--                |--                |--                |
+|**ARM64**  |:heavy_check_mark:|                  |                  |:heavy_check_mark:|
+|**PPC64le**|:heavy_check_mark:|                  |:heavy_check_mark:|:heavy_check_mark:|
+|**s390x**  |                  |                  |:heavy_check_mark:|                  |
+|**x86_64** |:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
diff --git a/tools/osbuilder/dockerfiles/QAT/README.md b/tools/osbuilder/dockerfiles/QAT/README.md
index ccc96a5e44..0507f019f0 100644
--- a/tools/osbuilder/dockerfiles/QAT/README.md
+++ b/tools/osbuilder/dockerfiles/QAT/README.md
@@ -9,7 +9,6 @@ to use the agent as the init. Because of this, alpine is not a valid base OS ima
 to use. The following rootfs OS's have been tested with this Dockerfile.
 
 * Clear Linux
-* Fedora
 * SUSE
 * Ubuntu 
 
diff --git a/tools/osbuilder/rootfs-builder/README.md b/tools/osbuilder/rootfs-builder/README.md
index fe3d1a8a22..71c92792ce 100644
--- a/tools/osbuilder/rootfs-builder/README.md
+++ b/tools/osbuilder/rootfs-builder/README.md
@@ -99,10 +99,10 @@ must be met:
    Example:
    ```
    $ export USE_DOCKER=true
-   $ # build guest O/S rootfs based on fedora
-   $ ./rootfs-builder/rootfs.sh -r "${PWD}/fedora_rootfs" fedora
+   $ # build guest O/S rootfs based on debian
+   $ ./rootfs-builder/rootfs.sh -r "${PWD}/debian_rootfs" debian
    $ # build image based rootfs created above
-   $ ./image-builder/image_builder.sh "${PWD}/fedora_rootfs"
+   $ ./image-builder/image_builder.sh "${PWD}/debian_rootfs"
    ```
 
 ## Adding support for a new guest OS
@@ -180,7 +180,7 @@ To add additional packages, use one of the following methods:
   Example:
 
   ```
-  $ EXTRA_PKGS="vim emacs" ./rootfs-builder/rootfs.sh -r ${PWD}/myrootfs fedora
+  $ EXTRA_PKGS="vim emacs" ./rootfs-builder/rootfs.sh -r ${PWD}/myrootfs debian
   ```
 
 - Modify the variable `PACKAGES` in `rootfs-builder/<distro>/config.sh`.
diff --git a/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in b/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in
deleted file mode 100644
index e566823ea7..0000000000
--- a/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-ARG IMAGE_REGISTRY=registry.fedoraproject.org
-FROM ${IMAGE_REGISTRY}/fedora:@OS_VERSION@
-
-@SET_PROXY@
-
-RUN dnf -y update && dnf install -y \
-    autoconf \
-    automake \
-    binutils \
-    chrony \
-    coreutils \
-    curl \
-    gcc \
-    gcc-c++ \
-    git \
-    glibc-common \
-    glibc-devel \
-    glibc-headers \
-    glibc-static \
-    glibc-utils \
-    libseccomp \
-    libseccomp-devel \
-    libstdc++-devel \
-    libstdc++-static \
-    protobuf-compiler \
-    m4 \
-    make \
-    pkgconfig \
-    redhat-release \
-    sed \
-    systemd \
-    tar \
-    vim \
-    which && \
-    dnf clean all
-
-# This will install the proper packages to build Kata components
-@INSTALL_MUSL@
-@INSTALL_RUST@
diff --git a/tools/osbuilder/rootfs-builder/fedora/config.sh b/tools/osbuilder/rootfs-builder/fedora/config.sh
deleted file mode 100644
index 76cae407b1..0000000000
--- a/tools/osbuilder/rootfs-builder/fedora/config.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-OS_NAME="Fedora"
-
-OS_VERSION=${OS_VERSION:-30}
-
-MIRROR_LIST="https://mirrors.fedoraproject.org/metalink?repo=fedora-${OS_VERSION}&arch=\$basearch"
-
-PACKAGES="coreutils chrony"
-
-#Optional packages:
-# systemd: An init system that will start kata-agent if kata-agent
-#          itself is not configured as init process.
-[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd" || true
-
-# Init process must be one of {systemd,kata-agent}
-INIT_PROCESS=systemd
-ARCH_EXCLUDE_LIST=()
-
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true
diff --git a/tools/osbuilder/rootfs-builder/fedora/config_aarch64.sh b/tools/osbuilder/rootfs-builder/fedora/config_aarch64.sh
deleted file mode 100644
index 42126f34c5..0000000000
--- a/tools/osbuilder/rootfs-builder/fedora/config_aarch64.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2019 ARM Limited
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# image busybox will fail on fedora 30 rootfs image
-# see https://github.com/kata-containers/osbuilder/issues/334 for detailed info
-OS_VERSION="29"
-
-MIRROR_LIST="https://mirrors.fedoraproject.org/metalink?repo=fedora-${OS_VERSION}&arch=\$basearch"