diff --git a/.devcontainer/.devcontainer.json b/.devcontainer/.devcontainer.json
deleted file mode 100644
index e92ed3ba..00000000
--- a/.devcontainer/.devcontainer.json
+++ /dev/null
@@ -1,51 +0,0 @@
-// 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
-{
-	"name": "Microprofile",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
-
-	"features": {
-		"ghcr.io/devcontainers/features/java:1": {
-			"installMaven": true,
-			"version": "17",
-			"jdkDistro": "ms",
-			"gradleVersion": "latest",
-			"mavenVersion": "latest",
-			"antVersion": "latest",
-			"groovyVersion": "latest"
-		},
-		"ghcr.io/ebaskoro/devcontainer-features/sdkman:1": {
-			"candidate": "java",
-			"version": "latest"
-		},
-		"ghcr.io/devcontainers/features/docker-in-docker:2": {
-			"moby": true,
-			"azureDnsAutoDetection": true,
-			"installDockerBuildx": true,
-			"installDockerComposeSwitch": true,
-			"version": "latest",
-			"dockerDashComposeVersion": "none"
-		}
-	},
-
-	// 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": {
-		"vscode": {
-			"extensions": [
-				"vscjava.vscode-java-pack", 
-				"github.copilot", 
-				"microprofile-community.vscode-microprofile-pack"
-			]
-		}
-	}
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0886c428..d3c354d4 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,17 +1,40 @@
 {
+	"name": "MicroProfile Tutorial",
 	"image": "mcr.microsoft.com/devcontainers/universal:2",
+	
 	"features": {
-		"ghcr.io/devcontainers-extra/features/node-asdf:0": {}
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "20"
+		},
+		"ghcr.io/devcontainers/features/java:1": {
+			"version": "21",
+			"installMaven": "true",
+			"mavenVersion": "3.9"
+		},
+		"ghcr.io/devcontainers/features/ruby:1": {
+			"version": "3.2"
+		},
+		"ghcr.io/devcontainers/features/python:1": {
+			"version": "3.11"
+		}
 	},
+
 	"customizations": {
 		"vscode": {
 			"extensions": [
 				"GitHub.copilot",
 				"asciidoctor.asciidoctor-vscode",
+				"matt-rudge.auto-open-preview-panel",
 				"microprofile-community.vscode-microprofile-pack",
 				"vscjava.vscode-java-pack",
+				"vscjava.vscode-maven",
 				"Open-Liberty.liberty-tools-vscode"
-			]
+			],
+			"settings": {
+				"terminal.integrated.defaultProfile.linux": "bash"
+			}
 		}
-	}
-}
\ No newline at end of file
+	},
+
+	"postCreateCommand": "npm install && gem install asciidoctor-pdf"
+}