diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000000..ac3e23a757ba
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,12 @@
+{
+  "name": "Java",
+  "image": "mcr.microsoft.com/devcontainers/java:1-21",
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "none",
+      "installMaven": "true",
+      "mavenVersion": "3.8.6",
+      "installGradle": "true"
+    }
+  }
+}
\ No newline at end of file
diff --git a/.github/workflows/junie.yml b/.github/workflows/junie.yml
index 8914b4144201..66a8e4e64d2e 100644
--- a/.github/workflows/junie.yml
+++ b/.github/workflows/junie.yml
@@ -20,5 +20,3 @@ jobs:
     uses: jetbrains-junie/junie-workflows/.github/workflows/ej-issue.yml@main
     with:
       workflow_params: ${{ inputs.workflow_params }}
-      fix_conflicts: false
-      skip_workflow_file_validation: false