diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9466772b..84092df1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Change Log
+## 1.25.5 - 2022-01-20
+### Changed
+* Added dependent extensions to Dev Container definitions.
+
 ## 1.25.4 - 2021-12-15
 ### Changed
 * Replaced deprecated 'Request' with axios for http requests.
diff --git a/assets/containers/CSharp/.devcontainer/devcontainer.json b/assets/containers/CSharp/.devcontainer/devcontainer.json
index ba84c3cf..0462152c 100644
--- a/assets/containers/CSharp/.devcontainer/devcontainer.json
+++ b/assets/containers/CSharp/.devcontainer/devcontainer.json
@@ -25,6 +25,8 @@
     "extensions": [
         "ms-dotnettools.csharp",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 
diff --git a/assets/containers/Cpp/.devcontainer/devcontainer.json b/assets/containers/Cpp/.devcontainer/devcontainer.json
index 9751987c..eac84bcd 100644
--- a/assets/containers/Cpp/.devcontainer/devcontainer.json
+++ b/assets/containers/Cpp/.devcontainer/devcontainer.json
@@ -23,6 +23,8 @@
     "extensions": [
         "ms-vscode.cpptools",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 
diff --git a/assets/containers/Java/.devcontainer/devcontainer.json b/assets/containers/Java/.devcontainer/devcontainer.json
index 92337ccc..771af735 100644
--- a/assets/containers/Java/.devcontainer/devcontainer.json
+++ b/assets/containers/Java/.devcontainer/devcontainer.json
@@ -36,6 +36,8 @@
     "extensions": [
         "vscjava.vscode-java-pack",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 
diff --git a/assets/containers/Node/.devcontainer/devcontainer.json b/assets/containers/Node/.devcontainer/devcontainer.json
index dcffc862..7b50394b 100644
--- a/assets/containers/Node/.devcontainer/devcontainer.json
+++ b/assets/containers/Node/.devcontainer/devcontainer.json
@@ -25,6 +25,8 @@
     "extensions": [
         "dbaeumer.vscode-eslint",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 
diff --git a/assets/containers/Python/.devcontainer/devcontainer.json b/assets/containers/Python/.devcontainer/devcontainer.json
index 436fba16..2016e5f8 100644
--- a/assets/containers/Python/.devcontainer/devcontainer.json
+++ b/assets/containers/Python/.devcontainer/devcontainer.json
@@ -46,6 +46,8 @@
         "ms-python.python",
         "ms-python.vscode-pylance",
         "ms-azuretools.vscode-docker",
+        "ms-vscode.azure-account",
+        "vsciot-vscode.vscode-iot-device-cube",
         "vsciot-vscode.azure-iot-tools"
     ],
 
diff --git a/package-lock.json b/package-lock.json
index c9708ad7..1ab325dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,18 @@
 {
   "name": "azure-iot-edge",
-  "version": "1.25.4",
+  "version": "1.25.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "azure-iot-edge",
-      "version": "1.25.4",
+      "version": "1.25.5",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@azure/arm-containerregistry": "^8.1.1",
         "@azure/arm-machinelearningservices": "^4.1.1",
         "@azure/arm-streamanalytics": "^2.1.1",
+        "@vscode/extension-telemetry": "^0.4.6",
         "axios": "0.24.0",
         "body-parser": "^1.18.2",
         "dotenv": "^5.0.1",
@@ -25,8 +26,7 @@
         "semver": "^5.6.0",
         "strip-json-comments": "^2.0.1",
         "tmp": "0.0.33",
-        "unzipper": "^0.10.5",
-        "vscode-extension-telemetry": "^0.4.2"
+        "unzipper": "^0.10.5"
       },
       "devDependencies": {
         "@azure/arm-resources": "^4.2.2",
@@ -654,6 +654,14 @@
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
+    "node_modules/@vscode/extension-telemetry": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.4.6.tgz",
+      "integrity": "sha512-bDXwHoNXIR1Rc8xdphJ4B3rWdzAGm+FUPk4mJl6/oyZmfEX+QdlDLxnCwlv/vxHU1p11ThHSB8kRhsWZ1CzOqw==",
+      "engines": {
+        "vscode": "^1.60.0"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -2104,9 +2112,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
       "funding": [
         {
           "type": "individual",
@@ -4527,14 +4535,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/vscode-extension-telemetry": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.4.2.tgz",
-      "integrity": "sha512-y0f51mVoFxHIzULQNCC26TBFIKdEC7uckS3tFoK++OOOl8mU2LlOxgmbd52T/SXoXNg5aI7xqs+4V2ug5ITvKw==",
-      "engines": {
-        "vscode": "^1.60.0"
-      }
-    },
     "node_modules/vscode-test": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
@@ -5424,6 +5424,11 @@
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
+    "@vscode/extension-telemetry": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.4.6.tgz",
+      "integrity": "sha512-bDXwHoNXIR1Rc8xdphJ4B3rWdzAGm+FUPk4mJl6/oyZmfEX+QdlDLxnCwlv/vxHU1p11ThHSB8kRhsWZ1CzOqw=="
+    },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -6550,9 +6555,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
     },
     "form-data": {
       "version": "2.5.1",
@@ -8356,11 +8361,6 @@
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
-    "vscode-extension-telemetry": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.4.2.tgz",
-      "integrity": "sha512-y0f51mVoFxHIzULQNCC26TBFIKdEC7uckS3tFoK++OOOl8mU2LlOxgmbd52T/SXoXNg5aI7xqs+4V2ug5ITvKw=="
-    },
     "vscode-test": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz",
diff --git a/package.json b/package.json
index 2ff9ace0..50ac021f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "This extension is now a part of Azure IoT Tools extension pack. We highly recommend installing Azure IoT Tools to get full capabilities for Azure IoT development. Develop, deploy, debug, and manage your IoT Edge solution.",
-  "version": "1.25.4",
+  "version": "1.25.5",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",
@@ -584,7 +584,7 @@
     "strip-json-comments": "^2.0.1",
     "tmp": "0.0.33",
     "unzipper": "^0.10.5",
-    "vscode-extension-telemetry": "^0.4.2"
+    "@vscode/extension-telemetry": "^0.4.6"
   },
   "extensionDependencies": [
     "ms-vscode.azure-account",
diff --git a/src/common/telemetryClient.ts b/src/common/telemetryClient.ts
index f1847872..1dda8a94 100644
--- a/src/common/telemetryClient.ts
+++ b/src/common/telemetryClient.ts
@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 "use strict";
+import TelemetryReporter from "@vscode/extension-telemetry";
 import * as vscode from "vscode";
-import TelemetryReporter from "vscode-extension-telemetry";
 import { Constants } from "./constants";
 
 const packageJSON = vscode.extensions.getExtension(Constants.ExtensionId).packageJSON;