diff --git a/templates/README-template.md b/templates/README-template.md
index e683aec86..b41ffb0bf 100644
--- a/templates/README-template.md
+++ b/templates/README-template.md
@@ -47,8 +47,8 @@ You can add as many screen shots as you'd like to help users understand your web
 
 This sample is optimally compatible with the following environment configuration:
 
-![SPFx 1.17.4](https://img.shields.io/badge/SPFx-1.17.4-green.svg)
-![Node.js v16.13+](https://img.shields.io/badge/Node.js-v16.13+-green.svg)
+![SPFx 1.18.2](https://img.shields.io/badge/SPFx-1.18.2-green.svg)
+![Node.js v16 | v18](https://img.shields.io/badge/Node.js-v16%20%7C%20v18-green.svg)
 ![Compatible with SharePoint Online](https://img.shields.io/badge/SharePoint%20Online-Compatible-green.svg)
 ![Does not work with SharePoint 2019](https://img.shields.io/badge/SharePoint%20Server%202019-Incompatible-red.svg "SharePoint Server 2019 requires SPFx 1.4.1 or lower")
 ![Does not work with SharePoint 2016 (Feature Pack 2)](https://img.shields.io/badge/SharePoint%20Server%202016%20(Feature%20Pack%202)-Incompatible-red.svg "SharePoint Server 2016 Feature Pack 2 requires SPFx 1.1")
@@ -57,6 +57,10 @@ This sample is optimally compatible with the following environment configuration
 ![Compatible with Remote Containers](https://img.shields.io/badge/Remote%20Containers-Compatible-green.svg)
 
 <!--
+If using SPFx 1.17.4
+![SPFx 1.17.4](https://img.shields.io/badge/SPFx-1.17.4-green.svg)
+![Node.js v16.13+](https://img.shields.io/badge/Node.js-v16.13+-green.svg)
+
 If using SPFx 1.16
 ![SPFx 1.16.1](https://img.shields.io/badge/SPFx-1.16.1-green.svg)
 ![Node.js v16 | v14 | v12](https://img.shields.io/badge/Node.js-v16%20%7C%20v14%20%7C%20v12-green.svg)
diff --git a/templates/containers/post-1.12.1/.devcontainer/devcontainer.json b/templates/containers/post-1.12.1/.devcontainer/devcontainer.json
index 59bee0f75..1d500d525 100644
--- a/templates/containers/post-1.12.1/.devcontainer/devcontainer.json
+++ b/templates/containers/post-1.12.1/.devcontainer/devcontainer.json
@@ -1,18 +1,19 @@
 // For more information on how to run this SPFx project in a VS Code Remote Container, please visit https://aka.ms/spfx-devcontainer
 {
-	"name": "SPFx 1.18.1",
-	"image": "docker.io/m365pnp/spfx:1.18.1",
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"editorconfig.editorconfig",
-		"dbaeumer.vscode-eslint"
-	],
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"name": "SPFx 1.18.2",
+	"image": "docker.io/m365pnp/spfx:1.18.2",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"editorconfig.editorconfig",
+				"dbaeumer.vscode-eslint"
+			]
+		}
+	},
 	"forwardPorts": [
 		4321,
-		35729
+		35729,
+		5432
 	],
 	"portsAttributes": {
 		"4321": {
@@ -21,12 +22,11 @@
 			"onAutoForward": "silent",
 			"requireLocalPort": true
 		},
-		// Not needed for SPFx>= 1.12.1 
-		// "5432": {
-		// 	"protocol": "https",
-		// 	"label": "Workbench",
-		// 	"onAutoForward": "silent"
-		// },
+		"5432": {
+			"protocol": "https",
+			"label": "Workbench",
+			"onAutoForward": "silent"
+		},
 		"35729": {
 			"protocol": "https",
 			"label": "LiveReload",
diff --git a/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json b/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json
index 1c92f1353..1d500d525 100644
--- a/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json
+++ b/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json
@@ -1,15 +1,15 @@
 // For more information on how to run this SPFx project in a VS Code Remote Container, please visit https://aka.ms/spfx-devcontainer
 {
-	"name": "SPFx 1.11.0",
-	"image": "docker.io/m365pnp/spfx:1.11.0",
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"editorconfig.editorconfig",
-		"dbaeumer.vscode-eslint"
-	],
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"name": "SPFx 1.18.2",
+	"image": "docker.io/m365pnp/spfx:1.18.2",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"editorconfig.editorconfig",
+				"dbaeumer.vscode-eslint"
+			]
+		}
+	},
 	"forwardPorts": [
 		4321,
 		35729,
diff --git a/templates/sample-template.json b/templates/sample-template.json
index 90b77e0f2..69efd732f 100644
--- a/templates/sample-template.json
+++ b/templates/sample-template.json
@@ -9,8 +9,8 @@
     "longDescription": [
       "YOUR-SHORT-DESCRIPTION"
     ],
-    "creationDateTime": "2023-12-25",
-    "updateDateTime": "2023-12-31",
+    "creationDateTime": "2024-12-25",
+    "updateDateTime": "2024-12-31",
     "products": [
       "SharePoint"
     ],
@@ -21,7 +21,7 @@
       },
       {
         "key": "SPFX-VERSION",
-        "value": "1.17.4"
+        "value": "1.18.2"
       }
     ],
     "thumbnails": [