diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index e7eaae8..32e01cc 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -78,6 +78,9 @@ jobs:
           - context: tailwindcss
             tag: tailwindcss-language-server
 
+          - context: taplo
+            tag: taplo-language-server
+
           - context: terraformls
             tag: terraform-ls
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9bb80e1..3fd0070 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -106,6 +106,11 @@ services:
     build:
       context: servers/tailwindcss
 
+  taplo:
+    image: lspcontainers/taplo-language-server
+    build:
+      context: servers/taplols
+
   terraformls:
     image: lspcontainers/terraform-ls
     build:
diff --git a/servers/taplols/Dockerfile b/servers/taplols/Dockerfile
new file mode 100644
index 0000000..7c0ede3
--- /dev/null
+++ b/servers/taplols/Dockerfile
@@ -0,0 +1,3 @@
+FROM tamasfe/taplo:full
+
+CMD [ "lsp", "stdio" ]