diff --git a/Images/code-server.png b/Images/code-server.png
new file mode 100644
index 0000000..8b06513
Binary files /dev/null and b/Images/code-server.png differ
diff --git a/Template/template.json b/Template/template.json
index b312757..ce04d3f 100644
--- a/Template/template.json
+++ b/Template/template.json
@@ -508,6 +508,60 @@
       }
     ]
   },
+  {
+    "type": 1,
+    "title": "Code Server",
+    "name": "code-server",
+    "description": "Code-server is VS Code running on a remote server, accessible through the browser.",
+    "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/code-server.png",
+    "image": "linuxserver/code-server:latest",
+    "categories": [
+      "Other",
+      "Tools"
+    ],
+    "platform": "linux",
+    "restart_policy": "unless-stopped",
+    "ports": [
+      "8443:8443/tcp"
+    ],
+    "env": [
+      {
+        "name": "PUID",
+        "label": "PUID",
+        "default": "1000",
+        "preset": true
+      },
+      {
+        "name": "GUID",
+        "label": "PUID",
+        "default": "1000",
+        "preset": true
+      },
+      {
+        "name": "TZ",
+        "label": "TZ"
+      },
+      {
+        "name": "PASSWORD",
+        "label": "PASSWORD"
+      },
+      {
+        "name": "SUDO_PASSWORD",
+        "label": "SUDO_PASSWORD"
+      },
+      {
+        "name": "PROXY_DOMAIN",
+        "label": "PROXY_DOMAIN",
+        "default": "example.my.domain"
+      }
+    ],
+    "volumes": [
+      {
+        "container": "/config",
+        "bind": "/portainer/Files/AppData/Config/Code-Server"
+      }
+    ]
+  },
   {
     "type": 1,
     "title": "Codiad",