diff --git a/Containerfile b/Containerfile
index b50ccdf24a..c7f18adf52 100644
--- a/Containerfile
+++ b/Containerfile
@@ -735,6 +735,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     echo "import \"/usr/share/ublue-os/just/84-bazzite-virt.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/85-bazzite-image.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/86-bazzite-windows.just\"" >> /usr/share/ublue-os/justfile && \
+    echo "import \"/usr/share/ublue-os/just/87-bazzite-devcontainers.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
       systemctl enable usr-share-sddm-themes.mount && \
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/87-bazzite-devcontainers.just b/system_files/desktop/shared/usr/share/ublue-os/just/87-bazzite-devcontainers.just
new file mode 100644
index 0000000000..823ccc860a
--- /dev/null
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/87-bazzite-devcontainers.just
@@ -0,0 +1,34 @@
+# vim: set ft=make :
+
+# Install Docker, VS Code and add user to relevant groups for docker
+install-visual-studio-code:
+    #!/usr/bin/bash
+    # check for updates
+    ublue-update --wait
+    # add yum repo
+    echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" | sudo tee /etc/yum.repos.d/vscode.repo > /dev/null
+    # install layer
+    rpm-ostree install -y code
+    echo 'Complete, please reboot to apply changes.'
+
+install-docker-ce:
+    #!/usr/bin/bash
+    # check for updates
+    ublue-update --wait
+    # add yum repo
+    echo -e "[docker-ce-stable]\nname=Docker CE Stable - \$basearch\nbaseurl=https://download.docker.com/linux/fedora/\$releasever/\$basearch/stable\nenabled=1\ngpgcheck=1\ngpgkey=https://download.docker.com/linux/fedora/gpg" | sudo tee /etc/yum.repos.d/docker-ce.repo > /dev/null
+    # install the layer
+    rpm-ostree install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin 
+    # Enable the service
+    systemctl enable docker
+    # Enable the socket
+    systemctl enable docker.socket
+    echo 'Complete, please reboot to apply changes.'
+
+add-user-to-docker-group:
+    #!/usr/bin/bash
+    if ! grep -q "^docker:" /etc/group; then
+      grep '^docker:' /usr/lib/group | sudo tee -a /etc/group > /dev/null
+    fi
+    sudo usermod -aG docker $USER
+    echo 'Complete, please reboot/logout to apply changes.'