diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5a91b21b6..bc79a2882 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,6 +10,13 @@
     "containerEnv": {
         "EDITOR_VSCODE": "true"
     },
+
+    "features": {
+        "docker-in-docker": {
+            "version": "latest"
+        },
+        "github-cli": "latest"
+    },
     
     // Set *default* container specific settings.json values on container create.
     "settings": { 
diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile
index 277f3f510..b4d78f3cc 100644
--- a/docker/app.Dockerfile
+++ b/docker/app.Dockerfile
@@ -13,6 +13,11 @@ EXPOSE 8000
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+# Add Docker Source
+RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
+    $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+
 RUN apt-get update
 
 # apt-get upgrade is normally not a good idea, but this is a dev container
@@ -26,6 +31,7 @@ RUN apt-get install -qy \
 	bash \
 	build-essential \
 	curl \
+    docker-ce-cli \
 	enscript \
 	fish \
 	gawk \
@@ -48,9 +54,11 @@ RUN apt-get install -qy \
     libxtst6 \
 	libmagic-dev \
 	libmariadb-dev \
+    libmemcached-tools \
 	libtidy-dev \
 	locales \
 	mariadb-client \
+    memcached \
     netcat \
 	nano \
 	pigz \
diff --git a/docker/scripts/app-init.sh b/docker/scripts/app-init.sh
index 9f59c3a2e..60eb8ad65 100755
--- a/docker/scripts/app-init.sh
+++ b/docker/scripts/app-init.sh
@@ -84,11 +84,16 @@ for sub in \
 done
 
 # Wait for DB container
+
 if [ -n "$EDITOR_VSCODE" ]; then
     echo "Waiting for DB container to come online ..."
     /usr/local/bin/wait-for localhost:3306 -- echo "DB ready"
 fi
 
+# Run memcached
+
+/usr/bin/memcached -u root -d
+
 # Initial checks
 
 echo "Running initial checks..."