diff --git a/src/_data/services.json b/src/_data/services.json
index 6d1754e..3c8ce56 100644
--- a/src/_data/services.json
+++ b/src/_data/services.json
@@ -4,7 +4,7 @@
     "name": "Matrix",
     "icon": "i-comments",
     "url": "https://chat.sp-codes.de",
-    "status": "https://matrix.sp-codes.de/_matrix/static/",
+    "status": "1",
     "summary": {
       "de": "Die offene Plattform für sichere und dezentrale Kommunikation.",
       "en": "The open platform for secure and decentralized communication."
@@ -15,7 +15,7 @@
     "name": "Jitsi Meet",
     "icon": "i-users",
     "url": "https://jitsi.sp-codes.de",
-    "status": "https://jitsi.sp-codes.de",
+    "status": "2",
     "summary": {
       "de": "Einfache Videokonferenzen mit Leichtigkeit.",
       "en": "Easy video conferencing with ease."
@@ -26,7 +26,7 @@
     "name": "Mastodon",
     "icon": "i-mastodon",
     "url": "https://social.sp-codes.de",
-    "status": "https://social.sp-codes.de/health",
+    "status": "7",
     "summary": {
       "de": "Das soziale Netzwerk für dezentrale und sichere Interaktion.",
       "en": "The social network for decentralized and secure interaction."
@@ -37,7 +37,7 @@
     "name": "PeerTube",
     "icon": "i-peertube",
     "url": "https://tube.sp-codes.de",
-    "status": "https://tube.sp-codes.de",
+    "status": "9",
     "summary": {
       "de": "Die freie und dezentrale Plattform für gemeinsames Video-Streaming.",
       "en": "The free and decentralized platform for collaborative video streaming."
@@ -48,7 +48,7 @@
     "name": "Pixelfed",
     "icon": "i-pixelfed",
     "url": "https://pixel.sp-codes.de",
-    "status": "https://pixel.sp-codes.de",
+    "status": "11",
     "beta": true,
     "summary": {
       "de": "Das soziale Netzwerk für den Austausch von Bildern und Fotografie.",
@@ -60,7 +60,7 @@
     "name": "Forgejo",
     "icon": "i-git",
     "url": "https://git.sp-codes.de",
-    "status": "https://git.sp-codes.de",
+    "status": "13",
     "summary": {
       "de": "Die Plattform für einfaches und sicheres Code-Hosting.",
       "en": "The platform for easy and secure code hosting."
@@ -70,7 +70,7 @@
     "id": "connectivitycheck",
     "name": "Captive Portal Check",
     "icon": "i-wifi",
-    "status": "https://connectivitycheck.sp-codes.de/generate204",
+    "status": "19",
     "summary": {
       "de": "Überprüfung der Verfügbarkeit von Internetzugang.",
       "en": "Verification of Internet access availability."
@@ -81,7 +81,7 @@
     "name": "ntfy",
     "icon": "i-cloud-download",
     "url": "https://ntfy.sp-codes.de",
-    "status": "https://ntfy.sp-codes.de",
+    "status": "18",
     "summary": {
       "de": "Echtzeitbenachrichtigungen mit UnifiedPush-Unterstützung.",
       "en": "Real-time notifications with UnifiedPush support."
@@ -92,7 +92,7 @@
     "name": "Etherpad",
     "icon": "i-pencil-square",
     "url": "https://pad.sp-codes.de",
-    "status": "https://pad.sp-codes.de",
+    "status": "17",
     "summary": {
       "de": "Gemeinsame Echtzeit-Textbearbeitung für effektive Zusammenarbeit.",
       "en": "Collaborative real-time text editing for effective collaboration."
@@ -103,7 +103,7 @@
     "name": "Shields",
     "icon": "i-tags",
     "url": "https://shields.sp-codes.de",
-    "status": "https://shields.sp-codes.de",
+    "status": "20",
     "summary": {
       "de": "Visuelle Badges zur Anzeige von Projektinformationen und Status.",
       "en": "Visual badges for displaying project information and status."
diff --git a/src/_data/strings.json b/src/_data/strings.json
index fa99388..324ebe1 100644
--- a/src/_data/strings.json
+++ b/src/_data/strings.json
@@ -32,7 +32,7 @@
     "en": "Online"
   },
   "outage": {
-    "de": "Fehler",
+    "de": "Ausfall",
     "en": "Error"
   },
   "maintenance": {
diff --git a/src/_includes/services-extended.html b/src/_includes/services-extended.html
index 6d1ee22..eee08df 100644
--- a/src/_includes/services-extended.html
+++ b/src/_includes/services-extended.html
@@ -12,7 +12,7 @@
             {% if service.status %}
             <div class="mb-2">
                 <a href="https://status.sp-codes.de" target="_blank">
-                    <img alt="{{strings.state[locale]}}" src="https://shields.sp-codes.de/endpoint?label={{strings.state[locale]}}&url=https%3A%2F%2Fstatus.sp-codes.de%2Fapi%2Fbadge%3Fservice%3D{{service.status}}%26operational%3D{{strings.operational[locale]}}%26outage%3D{{strings.outage[locale]}}%26maintenance%3D{{strings.maintenance[locale]}}">
+                    <img alt="{{strings.state[locale]}}" src="https://status.sp-codes.de/api/badge/{{service.status}}/status?label={{strings.state[locale]}}&upLabel={{strings.operational[locale]}}&downLabel={{strings.outage[locale]}}&maintenanceLabel={{strings.maintenance[locale]}}">
                 </a>
             </div>
             {% endif %}