diff --git a/modules/webstack.nix b/modules/webstack.nix
index 7c53352..fd1528e 100644
--- a/modules/webstack.nix
+++ b/modules/webstack.nix
@@ -86,6 +86,11 @@
         forceSSL = true;
         locations."/" = { proxyPass = "http://localhost:8080/"; };
       };
+      "shiori.coolneng.duckdns.org" = {
+        enableACME = true;
+        forceSSL = true;
+        locations."/" = { proxyPass = "http://localhost:8181/"; };
+      };
     };
   };
 
@@ -100,6 +105,7 @@
           "sync.coolneng.duckdns.org"
           "git.coolneng.duckdns.org"
           "rss.coolneng.duckdns.org"
+          "shiori.coolneng.duckdns.org"
         ];
       };
     };
@@ -114,7 +120,7 @@
   # PostgreSQL databases configuration
   services.postgresql = {
     enable = true;
-    package = pkgs.postgresql_11;
+    package = pkgs.postgresql;
     ensureDatabases = [ "gitea" "wallabag" ];
     ensureUsers = [
       {
@@ -156,11 +162,19 @@
     };
   };
 
+  # Enable shiori service
+  services.shiori = {
+    enable = true;
+    address = "localhost";
+    port = 8181;
+  };
+
   # Restart reverse proxy after services startup
   systemd.services.nginx.after = [
     "gitea.service"
     "syncthing.service"
     "miniflux.service"
     "radicale.service"
+    "shiori.service"
   ];
 }