diff --git a/README.md b/README.md
index 31a2d48d..3620385a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 | bitmagnet | ghcr.io/bitmagnet-io/bitmagnet:latest |
 | bitmagnet-pg-db | postgres:17-alpine |
 | bitwarden | vaultwarden/server:latest |
-| bluesky-pds | ghcr.io/bluesky-social/pds:latest |
+| bluesky-pds | code.modernleft.org/gravityfargo/bluesky-pds:v0.4.98 |
 | browserless | ghcr.io/browserless/chromium:latest |
 | bunkerweb | bunkerity/bunkerweb:1.6.0 |
 | bunkerweb-scheduler | bunkerity/bunkerweb-scheduler:1.6.0 |
@@ -52,8 +52,6 @@
 | gotify | gotify/server |
 | guacamole | flcontainers/guacamole:latest |
 | homepage | ghcr.io/gethomepage/homepage:latest |
-| hortusfox | ghcr.io/danielbrendel/hortusfox-web:latest |
-| hugo | hugomods/hugo:exts |
 | immich-server | ghcr.io/immich-app/immich-server:release |
 | immich-machine-learning | ghcr.io/immich-app/immich-machine-learning:release |
 | immich-pg-db | tensorchord/pgvecto-rs:pg14-v0.2.1 |
@@ -63,8 +61,6 @@
 | invidious | quay.io/invidious/invidious:latest |
 | invidious-sig-helper | quay.io/invidious/inv-sig-helper:latest |
 | invidious-db | docker.io/library/postgres:14 |
-| invoice-ninja | invoiceninja/invoiceninja-debian:5 |
-| invoice-ninja_proxy | nginx |
 | it-tools | ghcr.io/corentinth/it-tools:latest |
 | jellyfin | jellyfin/jellyfin |
 | jitsi-etherpad | etherpad/etherpad:1.8.6 |
@@ -82,6 +78,7 @@
 | libretranslate | libretranslate/libretranslate |
 | lidarr | lscr.io/linuxserver/lidarr:latest |
 | lidify | thewicklowwolf/lidify:latest |
+| linkstack | linkstackorg/linkstack:latest |
 | lldap | lldap/lldap:stable |
 | maloja | krateng/maloja:latest |
 | manyfold | lscr.io/linuxserver/manyfold:latest |
@@ -96,24 +93,14 @@
 | n8n | docker.n8n.io/n8nio/n8n |
 | navidrome | deluan/navidrome:latest |
 | netalertx | jokobsk/netalertx:latest |
-| netbird-dashboard | netbirdio/dashboard:latest |
-| netbird-signal | netbirdio/signal:latest |
-| netbird-relay | netbirdio/relay:latest |
-| netbird-management | netbirdio/management:latest |
-| netbird-coturn | coturn/coturn:latest |
 | nextcloud | nextcloud/all-in-one:latest |
 | ollama | ollama/ollama |
 | ombi | lscr.io/linuxserver/ombi:latest |
 | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest |
 | parseable | containers.parseable.com/parseable/parseable:latest |
-| peppermint | pepperlabs/peppermint:latest |
-| peppermint-pg-db | postgres:17-alpine |
 | pgbackweb | eduardolat/pgbackweb:latest |
 | pgbackweb-db | postgres:16-alpine |
 | plantuml-server | plantuml/plantuml-server:jetty |
-| plausible | ghcr.io/plausible/community-edition:v2.1.0 |
-| plausible_db | postgres:16-alpine |
-| plausible_events_db | clickhouse/clickhouse-server:24.3.3.102-alpine |
 | portainer | portainer/portainer-ce:2.27.0-alpine |
 | portall | need4swede/portall:latest |
 | postal-smtp | ghcr.io/postalserver/postal:latest |
@@ -143,7 +130,6 @@
 | soulseek | slskd/slskd |
 | sourcebot | ghcr.io/sourcebot-dev/sourcebot:latest |
 | speedtest-tracker | lscr.io/linuxserver/speedtest-tracker:latest |
-| spotisub | blastbeng/spotisub:latest |
 | stable-diffusion-download | git.trez.wtf/trez.one/stable-diffusion-download:v9.0.0 |
 | stable-diffusion-webui | git.trez.wtf/trez.one/stable-diffusion-ui:v9.0.0 |
 | swag | lscr.io/linuxserver/swag:latest |
diff --git a/ansible/app-configs/homepage_settings.yaml.j2 b/ansible/app-configs/homepage_settings.yaml.j2
index 9974c8c2..90dbaac3 100644
--- a/ansible/app-configs/homepage_settings.yaml.j2
+++ b/ansible/app-configs/homepage_settings.yaml.j2
@@ -32,7 +32,7 @@ layout:
     columns: 4
   Social:
     style: row
-    columns: 3
+    columns: 4
   Lifestyle:
     style: row
     columns: 5
diff --git a/docker-compose.yml b/docker-compose.yml
index d5a4edf8..ebac91ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -478,7 +478,7 @@ services:
       LOG_ENABLED: true
     expose:
       - 3000
-    image: ghcr.io/bluesky-social/pds:latest
+    image: code.modernleft.org/gravityfargo/bluesky-pds:v0.4.98
     labels:
       swag: enable
       swag_port: 3000
@@ -3053,6 +3053,33 @@ services:
         source: /etc/localtime
         target: /etc/localtime
         type: bind
+  linkstack:
+    container_name: linkstack
+    image: linkstackorg/linkstack:latest
+    environment:
+      TZ: ${TZ}
+      SERVER_ADMIN: noreply@${MY_TLD}
+      HTTP_SERVER_NAME: profile.${MY_TLD}
+      HTTPS_SERVER_NAME: profile.${MY_TLD}
+      LOG_LEVEL: info
+      PHP_MEMORY_LIMIT: 256M
+      UPLOAD_MAX_FILESIZE: 64M
+    labels:
+      homepage.group: Social
+      homepage.name: LinkStack
+      homepage.href: https://profile.${MY_TLD}
+      homepage.icon: linkstack.svg
+      homepage.description: Personal profile
+      swag: enable
+      swag_proto: https
+      swag_url: profile.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://profile.${MY_TLD}
+    ports:
+      - 8190:443
+    restart: unless-stopped
+    volumes:
+      - linkstack_data:/htdocs
   lldap:
     container_name: lldap
     environment:
@@ -5553,6 +5580,8 @@ volumes:
     name: jitsi-web-admin-upload
   joplin_data:
     name: joplin_data
+  linkstack_data:
+    name: linkstack_data
   librechat-pg-data:
     name: librechat-pg-data
   libretranslate_models: