diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 994b708a8..aa54fc27b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,20 +1,6 @@
 {
-  "name": "Node.js 18 & TypeScript",
-  "image": "mcr.microsoft.com/devcontainers/typescript-node:1-18-bullseye",
-  "features": {
-    "ghcr.io/devcontainers/features/java": {
-      "installGradle": true,
-      "installMaven": true,
-      "version": "11"
-    },
-    "ghcr.io/devcontainers-contrib/features/pnpm": {
-      "version": "latest"
-    },
-    "ghcr.io/devcontainers-contrib/features/poetry": {
-      "version": "latest"
-    },
-    "ghcr.io/devcontainers-contrib/features/projen:1": {}
-  },
+  "name": "PDK Image",
+  "image": "public.ecr.aws/p9i6h6j0/aws-pdk:latest",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -23,7 +9,5 @@
         "GitHub.vscode-github-actions"
       ]
     }
-  },
-  "postCreateCommand": "sudo apt update && sudo apt upgrade -y",
-  "postStartCommand": "sudo apt update"
+  }
 }
diff --git a/packages/infrastructure/samples/infrastructure/java/src/java/groupId/constructs/websites/WebsiteConstruct.java.mustache b/packages/infrastructure/samples/infrastructure/java/src/java/groupId/constructs/websites/WebsiteConstruct.java.mustache
index 370e01ae9..ea56e8504 100644
--- a/packages/infrastructure/samples/infrastructure/java/src/java/groupId/constructs/websites/WebsiteConstruct.java.mustache
+++ b/packages/infrastructure/samples/infrastructure/java/src/java/groupId/constructs/websites/WebsiteConstruct.java.mustache
@@ -1,5 +1,6 @@
 package {{{groupId}}}.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
diff --git a/packages/infrastructure/test/projects/java/__snapshots__/infrastructure-java-project.test.ts.snap b/packages/infrastructure/test/projects/java/__snapshots__/infrastructure-java-project.test.ts.snap
index 97d4eaa4c..531388aad 100644
--- a/packages/infrastructure/test/projects/java/__snapshots__/infrastructure-java-project.test.ts.snap
+++ b/packages/infrastructure/test/projects/java/__snapshots__/infrastructure-java-project.test.ts.snap
@@ -2682,6 +2682,7 @@ public class Api extends Construct {
 ",
   "infra/src/main/java/software/aws/infra/constructs/websites/Website.java": "package software.aws.infra.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -3832,6 +3833,7 @@ public class Api2 extends Construct {
 ",
   "infra/src/main/java/software/aws/infra/constructs/websites/Website.java": "package software.aws.infra.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -4985,6 +4987,7 @@ public class Api2 extends Construct {
 ",
   "infra/src/main/java/software/aws/infra/constructs/websites/Website.java": "package software.aws.infra.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -5028,6 +5031,7 @@ public class Website extends Construct {
 ",
   "infra/src/main/java/software/aws/infra/constructs/websites/Website2.java": "package software.aws.infra.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -6098,6 +6102,7 @@ public class Api extends Construct {
 ",
   "infra/src/main/java/software/aws/infra/constructs/websites/Website.java": "package software.aws.infra.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -6141,6 +6146,7 @@ public class Website extends Construct {
 ",
   "infra/src/main/java/software/aws/infra/constructs/websites/Website2.java": "package software.aws.infra.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -7117,6 +7123,7 @@ public class Main {
 }",
   "infra/src/main/java/software/aws/infra/constructs/websites/Website.java": "package software.aws.infra.constructs.websites;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TreeMap;