diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 00000000..fd403023
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,31 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu
+
+# System tools
+RUN apt-get update && apt-get install -y \
+    curl \
+    zip \
+    unzip \
+    ca-certificates \
+    git \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+# SDKMAN
+ENV SDKMAN_DIR=/usr/local/sdkman
+RUN curl -s "https://get.sdkman.io" | bash
+
+# Java toolchain (same as container A)
+RUN bash -c "source $SDKMAN_DIR/bin/sdkman-init.sh && \
+    sdk install java 8.0.472-tem && \
+    sdk install gradle 8.14 && \
+    sdk install maven 3.9.9 && \
+    sdk default java 8.0.472-tem && \
+    sdk default gradle 8.14 && \
+    sdk default maven 3.9.9"
+
+
+# Expose tools
+ENV PATH="$SDKMAN_DIR/candidates/java/current/bin:\
+$SDKMAN_DIR/candidates/gradle/current/bin:\
+$SDKMAN_DIR/candidates/maven/current/bin:$PATH"
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..d093ea83
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,20 @@
+{
+  "name": "PKI Suite Samples Dev Container",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "remoteUser": "vscode",
+  "mounts": [
+    "source=maven-repo,target=/home/vscode/.m2,type=volume"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "vscjava.vscode-java-pack",
+        "vscjava.vscode-gradle",
+        "redhat.java"
+      ]
+    }
+  },
+  "postCreateCommand": "bash -lc 'set -e && cd java/springmvc && wget -q https://cdn.lacunasoftware.com/pki-express/linux/pkie-1.36.0.tar.gz && sudo mkdir -p /usr/share/pkie && sudo tar xzf pkie-1.36.0.tar.gz -C /usr/share/pkie && sudo chmod +x /usr/share/pkie/pkie && sudo ln -sf /usr/share/pkie/pkie /usr/local/bin/pkie && sudo mkdir -p /var/log/pkie && sudo chmod 777 /var/log/pkie && sudo pkie config --set logDir=/var/log/pkie && sudo pkie activate LacunaPkiLicense.config'"
+}
diff --git a/java/springmvc/build.gradle b/java/springmvc/build.gradle
index d8fd1b8e..8c21e519 100644
--- a/java/springmvc/build.gradle
+++ b/java/springmvc/build.gradle
@@ -21,7 +21,7 @@ version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.8
 
 repositories {
-    
+    mavenLocal()
     mavenCentral()
     
     // Uncomment to use prerelease Lacuna packages
@@ -32,7 +32,7 @@ repositories {
 
 dependencies {
     compile group: 'com.lowagie', name: 'itext', version: '4.2.0'
-    implementation 'com.lacunasoftware.pkiexpress:pki-express:1.20.0'
+    implementation 'com.lacunasoftware.pkiexpress:pki-express:1.23.2'
     implementation 'com.lacunasoftware.restpki:restpki-client:1.15.6'
     implementation 'com.lacunasoftware.restpki:restpkicore-client:1.1.4'
     implementation 'com.lacunasoftware.amplia:amplia-client:1.0.0'
@@ -43,3 +43,7 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.11'
     implementation 'com.google.code.gson:gson:2.8.5'
 }
+
+bootRun {
+    sourceResources sourceSets.main
+}
diff --git a/java/springmvc/src/main/resources/templates/layout.html b/java/springmvc/src/main/resources/templates/layout.html
index 54a0c4fd..971efac7 100644
--- a/java/springmvc/src/main/resources/templates/layout.html
+++ b/java/springmvc/src/main/resources/templates/layout.html
@@ -57,4 +57,4 @@
 <script th:replace="this :: scripts"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>