diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59926eaf..29a4f5bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 	## __WORK IN PROGRESS__
 	(at the beginning of a new line)
 -->
+
+## __WORK IN PROGRESS__
+* (hacki11) Support git-ssh in devcontainer (#1136) [Migration guide](docs/updates/20250401_devcontainer_ssh.md)
+
 ## 2.6.5 (2024-09-13)
 * (AlCalzone) Update required versions of `js-controller` and `admin` to the current stable versions (#1116)
 * (AlCalzone) Remove deprecated `main` and `title` fields from `io-package.json` (#1115)
diff --git a/docs/updates/20250401_devcontainer_ssh.md b/docs/updates/20250401_devcontainer_ssh.md
new file mode 100644
index 00000000..776414d0
--- /dev/null
+++ b/docs/updates/20250401_devcontainer_ssh.md
@@ -0,0 +1,13 @@
+# Add git-ssh support in DevContainer
+
+To be able to push to git using ssh url in a DevContainer, ssh is needed in the docker image. 
+
+Make sure to add this change to `.devcontainer/iobroker/Dockerfile`:
+
+```diff
+FROM iobroker/iobroker:latest
+RUN ln -s /opt/iobroker/node_modules/ /root/.node_modules
++# Needed to use git-ssh in devcontainer
++RUN apt-get update \
++    && apt-get -y --no-install-recommends install openssh-client
+```
diff --git a/templates/_devcontainer/iobroker/_Dockerfile.ts b/templates/_devcontainer/iobroker/_Dockerfile.ts
index 2ca86692..ee89f8dd 100644
--- a/templates/_devcontainer/iobroker/_Dockerfile.ts
+++ b/templates/_devcontainer/iobroker/_Dockerfile.ts
@@ -8,6 +8,9 @@ const templateFunction: TemplateFunction = answers => {
 	const template = `
 FROM iobroker/iobroker:latest
 RUN ln -s /opt/iobroker/node_modules/ /root/.node_modules
+# Needed to use git-ssh in devcontainer
+RUN apt-get update \\
+	&& apt-get -y --no-install-recommends install openssh-client
 `;
 	return template.trim();
 };
diff --git a/test/baselines/devcontainer/.devcontainer/iobroker/Dockerfile b/test/baselines/devcontainer/.devcontainer/iobroker/Dockerfile
index f0e8e087..20080af3 100644
--- a/test/baselines/devcontainer/.devcontainer/iobroker/Dockerfile
+++ b/test/baselines/devcontainer/.devcontainer/iobroker/Dockerfile
@@ -1,2 +1,5 @@
 FROM iobroker/iobroker:latest
-RUN ln -s /opt/iobroker/node_modules/ /root/.node_modules
\ No newline at end of file
+RUN ln -s /opt/iobroker/node_modules/ /root/.node_modules
+# Needed to use git-ssh in devcontainer
+RUN apt-get update \
+	&& apt-get -y --no-install-recommends install openssh-client
\ No newline at end of file