diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a891b7ee557..39c428df4ea 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,9 +6,7 @@
   "customizations": {
     "vscode": {
       "settings": {
-        "terminal.integrated.defaultProfile.linux": "zsh",
-        // Speed up extension installation
-        "extensions.verifySignature": false
+        "terminal.integrated.defaultProfile.linux": "zsh"
       },
       "extensions": [
         // Liquid tags auto-complete
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index 14422cbf0a4..a4bc28257f8 100644
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -8,3 +8,11 @@ fi
 
 # Install dependencies for shfmt extension
 curl -sS https://webi.sh/shfmt | sh &>/dev/null
+
+# Add OMZ plugins
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
+git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
+sed -i -E "s/^(plugins=\()(git)(\))/\1\2 zsh-syntax-highlighting zsh-autosuggestions\3/" ~/.zshrc
+
+# Avoid git log use less
+echo -e "\nunset LESS" >>~/.zshrc