diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f58176b7d..b3079198c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,9 +5,6 @@
     "forwardPorts": [
         8080
     ],
-    "mounts": [
-        "source=freqtrade-bashhistory,target=/home/ftuser/commandhistory,type=volume"
-    ],
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/freqtrade,type=bind,consistency=cached",
     // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
     "remoteUser": "ftuser",
diff --git a/.github/.devcontainer/Dockerfile b/.github/.devcontainer/Dockerfile
index 1e90ac417..1deab0f54 100644
--- a/.github/.devcontainer/Dockerfile
+++ b/.github/.devcontainer/Dockerfile
@@ -7,16 +7,9 @@ COPY requirements-dev.txt /freqtrade/
 ARG USERNAME=ftuser
 
 RUN apt-get update \
-    && apt-get -y install --no-install-recommends apt-utils dialog \
-    && apt-get -y install --no-install-recommends git sudo ssh vim build-essential \
+    && apt-get -y install --no-install-recommends apt-utils dialog git ssh vim build-essential zsh \
     && apt-get clean \
     && mkdir -p /home/${USERNAME}/.vscode-server /home/${USERNAME}/.vscode-server-insiders /home/${USERNAME}/commandhistory \
-    # Add user to Suders
-    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME \
-    # keep command history
-    && echo "export PROMPT_COMMAND='history -a'" >> /home/${USERNAME}/.bashrc \
-    && echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/${USERNAME}/.bashrc \
     && chown ${USERNAME}:${USERNAME} -R /home/${USERNAME}/.local/ \
     && chown ${USERNAME}: -R /home/${USERNAME}/
 
diff --git a/.github/.devcontainer/devcontainer.json b/.github/.devcontainer/devcontainer.json
index f3ad733df..ca54f9c08 100644
--- a/.github/.devcontainer/devcontainer.json
+++ b/.github/.devcontainer/devcontainer.json
@@ -3,5 +3,11 @@
     "build": {
         "dockerfile": "Dockerfile",
         "context": "../../"
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "configureZshAsDefaultShell": true
+        },
+        "ghcr.io/stuartleeks/dev-container-features/shell-history:0.0.3": {}
     }
 }