diff --git a/containers/java-8-maven/.devcontainer/Dockerfile b/containers/java-8-maven/.devcontainer/Dockerfile
index 55a4486bd1..a47cb4d7e6 100644
--- a/containers/java-8-maven/.devcontainer/Dockerfile
+++ b/containers/java-8-maven/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See LICENSE in the project root for license information.
 #-----------------------------------------------------------------------------------------
 
-FROM maven:3.6-jdk-8
+FROM maven:3-jdk-8
 
 # Install git, process tools
 RUN apt-get update && apt-get -y install git procps
diff --git a/containers/java-8-maven/.devcontainer/devcontainer.json b/containers/java-8-maven/.devcontainer/devcontainer.json
index a3270bcd6f..987d123896 100644
--- a/containers/java-8-maven/.devcontainer/devcontainer.json
+++ b/containers/java-8-maven/.devcontainer/devcontainer.json
@@ -1,7 +1,8 @@
 {
-	"name": "Java 8",
+	"name": "Java 8 & Maven",
 	"dockerFile": "Dockerfile",
 	"extensions": [
-		"vscjava.vscode-java-pack"		
+		"vscjava.vscode-java-pack",
+		"redhat.vscode-xml"
 	]
 }
diff --git a/containers/java-8-maven/README.md b/containers/java-8-maven/README.md
index 4b86d63da3..e1eb050b62 100644
--- a/containers/java-8-maven/README.md
+++ b/containers/java-8-maven/README.md
@@ -2,7 +2,7 @@
 
 ## Summary
 
-*Develop Java 8 based applications. Includes the JDK along with any dependencies Maven requires.*
+*Develop Java 8 based applications. Includes the JDK, XML tools, along with any dependencies Maven requires.*
 
 | Metadata | Value |  
 |----------|-------|
diff --git a/containers/java-8-maven/test-project/.settings/org.eclipse.jdt.core.prefs b/containers/java-8-maven/test-project/.settings/org.eclipse.jdt.core.prefs
index 389c90f893..ac8e7500c7 100644
--- a/containers/java-8-maven/test-project/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/java-8-maven/test-project/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.5
diff --git a/repository-containers/github.com/aymericdamien/TensorFlow-Examples/devcontainer.json b/repository-containers/github.com/aymericdamien/TensorFlow-Examples/.devcontainer.json
similarity index 100%
rename from repository-containers/github.com/aymericdamien/TensorFlow-Examples/devcontainer.json
rename to repository-containers/github.com/aymericdamien/TensorFlow-Examples/.devcontainer.json
diff --git a/repository-containers/github.com/django/django/devcontainer.json b/repository-containers/github.com/django/django/.devcontainer.json
similarity index 100%
rename from repository-containers/github.com/django/django/devcontainer.json
rename to repository-containers/github.com/django/django/.devcontainer.json
diff --git a/repository-containers/github.com/spmallick/learnopencv/devcontainer.json b/repository-containers/github.com/spmallick/learnopencv/.devcontainer.json
similarity index 100%
rename from repository-containers/github.com/spmallick/learnopencv/devcontainer.json
rename to repository-containers/github.com/spmallick/learnopencv/.devcontainer.json