diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..3189122
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,44 @@
+FROM registry.fedoraproject.org/fedora:36
+
+ARG NAME=fedora-toolbox
+ARG VERSION=36
+LABEL com.github.containers.toolbox="true" \
+      com.redhat.component="$NAME" \
+      name="$NAME" \
+      version="$VERSION" \
+      usage="This image is meant to be used with the toolbox command" \
+      summary="Base image for creating Fedora toolbox containers" \
+      maintainer="Debarshi Ray <rishi@fedoraproject.org>"
+
+COPY README.md /
+
+RUN rm /etc/rpm/macros.image-language-conf
+RUN sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf
+
+RUN dnf -y upgrade
+RUN dnf -y swap coreutils-single coreutils-full
+RUN dnf -y swap glibc-minimal-langpack glibc-all-langpacks
+
+COPY missing-docs /
+RUN dnf -y reinstall $(<missing-docs)
+RUN rm /missing-docs
+
+COPY extra-packages /
+RUN dnf -y install $(<extra-packages)
+RUN rm /extra-packages
+
+COPY ensure-files /
+RUN ret_val=0; \
+  while read file; do \
+    if ! compgen -G "$file" >/dev/null; then \
+      echo "$file: No such file or directory" >&2; \
+      ret_val=1; \
+      break; \
+    fi; \
+  done <ensure-files; \
+  if [ "$ret_val" -ne 0 ]; then \
+    false; \
+  fi
+RUN rm /ensure-files
+
+RUN dnf clean all
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6f9943b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,44 @@
+[Toolbox](https://containertoolbx.org/) is a tool for Linux, which allows the
+use of interactive command line environments for development and
+troubleshooting the host operating system, without having to install software
+on the host. It is built on top of [Podman](https://podman.io/) and other
+standard container technologies from [OCI](https://opencontainers.org/).
+
+Toolbox environments have seamless access to the user's home directory,
+the Wayland and X11 sockets, networking (including Avahi), removable devices
+(like USB sticks), systemd journal, SSH agent, D-Bus, ulimits, /dev and the
+udev database, etc..
+
+This is particularly useful on
+[OSTree](https://ostree.readthedocs.io/en/latest/) based operating systems like
+[Fedora CoreOS](https://coreos.fedoraproject.org/) and
+[Silverblue](https://silverblue.fedoraproject.org/). The intention of these
+systems is to discourage installation of software on the host, and instead
+install software as (or in) containers — they mostly don't even have package
+managers like DNF or YUM. This makes it difficult to set up a development
+environment or troubleshoot the operating system in the usual way.
+
+Toolbox solves this problem by providing a fully mutable container within
+which one can install their favourite development and troubleshooting tools,
+editors and SDKs. For example, it's possible to do `yum install ansible`
+without affecting the base operating system.
+
+However, this tool doesn't *require* using an OSTree based system. It works
+equally well on Fedora Workstation and Server, and that's a useful way to
+incrementally adopt containerization.
+
+The toolbox environment is based on an [OCI](https://www.opencontainers.org/)
+image. On Fedora this is the `fedora-toolbox` image. This image is used to
+create a toolbox container that offers the interactive command line
+environment.
+
+Note that Toolbox makes no promise about security beyond what's already
+available in the usual command line environment on the host that everybody is
+familiar with.
+
+
+## Installation & Use
+
+See our guides on
+[installing & getting started](https://containertoolbx.org/install/) with
+Toolbox and [Linux distro support](https://containertoolbx.org/distros/).
diff --git a/dead.container b/dead.container
deleted file mode 100644
index ac43a2a..0000000
--- a/dead.container
+++ /dev/null
@@ -1,9 +0,0 @@
-The fedora-toolbox OCI image for Fedora 39 onwards is no longer built using
-OpenShift Build Service from the Dockerfile here.  It's now being built using
-Image Factory from fedora-kickstarts and pungi-fedora [1], as part of the
-ToolbxReleaseBlocker Change [2] for Fedora 39.
-
-[1] https://pagure.io/fedora-kickstarts/
-    https://pagure.io/pungi-fedora/
-
-[2] https://fedoraproject.org/wiki/Changes/ToolbxReleaseBlocker
diff --git a/ensure-files b/ensure-files
new file mode 100644
index 0000000..9693d36
--- /dev/null
+++ b/ensure-files
@@ -0,0 +1,17 @@
+/usr/share/man/man1/bash.1*
+/usr/share/man/man1/cd.1*
+/usr/share/man/man1/export.1*
+
+/usr/share/man/man1/cat.1*
+/usr/share/man/man1/cp.1*
+/usr/share/man/man1/ls.1*
+
+/usr/share/man/man1/gpg2.1*
+/usr/share/man/man7/gnupg2.7*
+
+/usr/share/man/fr/man8/rpm.8*
+/usr/share/man/ja/man8/rpm.8*
+/usr/share/man/man8/rpm.8*
+
+/usr/share/man/man1/kill.1*
+/usr/share/man/man8/mount.8*
diff --git a/extra-packages b/extra-packages
new file mode 100644
index 0000000..14c9028
--- /dev/null
+++ b/extra-packages
@@ -0,0 +1,48 @@
+bash-completion
+bc
+bzip2
+diffutils
+dnf-plugins-core
+findutils
+flatpak-spawn
+fpaste
+git
+gnupg2
+gnupg2-smime
+gvfs-client
+hostname
+iproute
+iputils
+jwhois
+keyutils
+krb5-libs
+less
+lsof
+man-db
+man-pages
+mesa-dri-drivers
+mesa-vulkan-drivers
+mtr
+nano-default-editor
+nss-mdns
+openssh-clients
+passwd
+pigz
+procps-ng
+rsync
+shadow-utils
+sudo
+tcpdump
+time
+traceroute
+tree
+unzip
+util-linux
+vte-profile
+vulkan-loader
+wget
+which
+words
+xorg-x11-xauth
+xz
+zip
diff --git a/missing-docs b/missing-docs
new file mode 100644
index 0000000..b06fdc3
--- /dev/null
+++ b/missing-docs
@@ -0,0 +1,20 @@
+acl
+bash
+coreutils-common
+curl
+findutils
+gawk
+gnupg2
+grep
+gzip
+libcap
+openssl
+p11-kit
+pam
+python3
+rpm
+sed
+sudo
+systemd
+tar
+util-linux-core