diff --git a/setup/src/common/scripts/postStartCommand.sh b/setup/src/common/scripts/postStartCommand.sh
new file mode 100755
index 00000000..14b4ccd2
--- /dev/null
+++ b/setup/src/common/scripts/postStartCommand.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright (c) 2024 Contributors to the Eclipse Foundation
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License, Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+.devcontainer/scripts/upgrade-cli.sh
diff --git a/setup/src/cpp/common/devcontainer.json b/setup/src/cpp/common/devcontainer.json
index 6cc3e969..9d3a2a44 100644
--- a/setup/src/cpp/common/devcontainer.json
+++ b/setup/src/cpp/common/devcontainer.json
@@ -123,7 +123,7 @@
 	// "forwardPorts": [],
 	// Use 'onCreateCommand' to run commands when the container is created.
 	"onCreateCommand": "bash .devcontainer/scripts/onCreateCommand.sh",
-	"postStartCommand": "bash .devcontainer/scripts/upgrade-cli.sh",
+	"postStartCommand": "bash .devcontainer/scripts/postStartCommand.sh",
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
 }
diff --git a/setup/src/python/common/devcontainer.json b/setup/src/python/common/devcontainer.json
index babb0ee2..06b7a04c 100644
--- a/setup/src/python/common/devcontainer.json
+++ b/setup/src/python/common/devcontainer.json
@@ -69,7 +69,7 @@
 		}
 	},
 	"onCreateCommand": "bash .devcontainer/scripts/onCreateCommand.sh",
-	"postStartCommand": "bash .devcontainer/scripts/upgrade-cli.sh",
+	"postStartCommand": "bash .devcontainer/scripts/postStartCommand.sh",
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
 }