diff --git a/src/universal/.devcontainer/devcontainer.json b/src/universal/.devcontainer/devcontainer.json
index 9c1e25351..7f2a194c2 100644
--- a/src/universal/.devcontainer/devcontainer.json
+++ b/src/universal/.devcontainer/devcontainer.json
@@ -9,6 +9,9 @@
             "userUid": "1000",
             "userGid": "1000"
         },
+        "ghcr.io/devcontainers-extra/features/apt-packages:1": {
+            "packages": "bubblewrap, socat"
+        },
         "ghcr.io/devcontainers/features/dotnet:2": {
             "version": "10.0",
             "dotnetRuntimeVersions": "9.0", 
@@ -80,6 +83,7 @@
     },
     "overrideFeatureInstallOrder": [
         "ghcr.io/devcontainers/features/common-utils",
+        "ghcr.io/devcontainers-extra/features/apt-packages",
         "ghcr.io/devcontainers/features/git",
         "ghcr.io/devcontainers/features/dotnet",
         "ghcr.io/devcontainers/features/hugo",
diff --git a/src/universal/manifest.json b/src/universal/manifest.json
index b650be2e0..70ac1eca1 100644
--- a/src/universal/manifest.json
+++ b/src/universal/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "6.0.3",
+	"version": "6.0.4",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",
diff --git a/src/universal/test-project/test-utils.sh b/src/universal/test-project/test-utils.sh
index 872ec8ee6..f06bb6c6c 100644
--- a/src/universal/test-project/test-utils.sh
+++ b/src/universal/test-project/test-utils.sh
@@ -131,7 +131,9 @@ checkCommon()
         locales \
         gettext \
         sudo \
-        inotify-tools"
+        inotify-tools \
+        bubblewrap \
+        socat"
 
     # Actual tests
     checkOSPackages "common-os-packages" ${PACKAGE_LIST}