diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1489d285f..d9ca0947b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,43 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/java
 {
-	"image": "mcr.microsoft.com/devcontainers/universal:2",
+	"name": "Java",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/java:1-21-bullseye",
+
 	"features": {
-		"ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {}
+		"ghcr.io/devcontainers/features/java:1": {
+			"installGradle": true,
+			"installGroovy": false,
+			"installMaven": false,
+			"installAnt": false,
+			"version": "21",
+			"jdkDistro": "ms",
+			"gradleVersion": "latest",
+			"mavenVersion": "none"
+		},
+		"ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
+			"platform": "35",
+			"build_tools": "35.0.0"
+		},
+		"ghcr.io/devcontainers/features/node:1": {
+			"nodeGypDependencies": false,
+			"installYarnUsingApt": false,
+			"version": "lts",
+			"pnpmVersion": "latest",
+			"nvmVersion": "latest"
+		}
 	}
-}
\ No newline at end of file
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "java -version",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..f33a02cd1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly