diff --git a/dynamic/services.yaml b/dynamic/services.yaml
index adaea6c..45d44d9 100644
--- a/dynamic/services.yaml
+++ b/dynamic/services.yaml
@@ -176,7 +176,7 @@ http:
         - redirect-to-https
       service: noop@internal
 
-    devpi-http:
+    pypiserver-http:
       rule: "Host(`pip.aetoskia.com`)"
       entryPoints:
         - web
@@ -340,11 +340,11 @@ http:
       tls:
         certResolver: aetoskia
 
-    devpi:
+    pypiserver:
       rule: "Host(`pip.aetoskia.com`)"
       entryPoints:
         - websecure
-      service: devpi-svc
+      service: pypiserver-svc
       tls:
         certResolver: aetoskia
 
@@ -445,7 +445,7 @@ http:
         servers:
           - url: "http://server-pi:6001"
 
-    devpi-svc:
+    pypiserver-svc:
       loadBalancer:
         servers:
           - url: "http://server-pi:6006"