diff --git a/Containerfile b/Containerfile
index c7fd5e4cc73..08e0b327445 100644
--- a/Containerfile
+++ b/Containerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-silverblue}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}"
 ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-37}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
 ARG TARGET_BASE="${TARGET_BASE:-bluefin}"
 
 ## bluefin image section
@@ -59,6 +59,9 @@ COPY workarounds.sh /tmp/workarounds.sh
 COPY packages.json /tmp/packages.json
 COPY build.sh /tmp/build.sh
 
+# Apply IP Forwarding before installing Docker to prevent messing with LXC networking
+RUN sysctl -p
+
 RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
 RUN wget https://copr.fedorainfracloud.org/coprs/bobslept/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo
 
@@ -100,6 +103,7 @@ RUN /tmp/workarounds.sh
 RUN rm -f /etc/yum.repos.d/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo
 RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
 RUN rm -f /etc/yum.repos.d/vscode.repo
+RUN rm -f /etc/yum.repos.d/docker-ce.repo
 RUN rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo
 RUN rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo
 
diff --git a/dx/etc/yum.repos.d/docker-ce.repo b/dx/etc/yum.repos.d/docker-ce.repo
new file mode 100644
index 00000000000..8a0de16042a
--- /dev/null
+++ b/dx/etc/yum.repos.d/docker-ce.repo
@@ -0,0 +1,6 @@
+[docker-ce-stable]
+name=Docker CE Stable - $basearch
+baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/fedora/gpg
diff --git a/dx/usr/lib/sysctl.d/docker-ce.conf b/dx/usr/lib/sysctl.d/docker-ce.conf
new file mode 100644
index 00000000000..4234b54305e
--- /dev/null
+++ b/dx/usr/lib/sysctl.d/docker-ce.conf
@@ -0,0 +1 @@
+net.ipv4.ip_forward = 1
diff --git a/packages.json b/packages.json
index ed940a8b51d..ea50793323c 100644
--- a/packages.json
+++ b/packages.json
@@ -46,7 +46,12 @@
 				"cockpit-storaged",
 				"cockpit-system",
 				"code",
+				"containerd.io",
 				"dbus-x11",
+				"docker-ce",
+				"docker-ce-cli",
+				"docker-buildx-plugin",
+				"docker-compose-plugin",
 				"edk2-ovmf",
 				"edk2-ovmf",
 				"genisoimage",
diff --git a/usr/share/ublue-os/just/custom.just b/usr/share/ublue-os/just/custom.just
index bb757d1ba8a..4a34107c8bc 100644
--- a/usr/share/ublue-os/just/custom.just
+++ b/usr/share/ublue-os/just/custom.just
@@ -194,3 +194,7 @@ yafti:
 # Switch to the zsh shell
 zsh:
   sudo lchsh $USER /usr/bin/zsh 
+
+docker:
+  sudo systemctl enable --now docker
+  sudo usermod -aG docker $USER