diff --git a/docker-compose.yaml b/docker-compose.yaml
index 05447f6..f398d79 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,9 +28,9 @@ x-volume-configs:
   registry_ui: &registry_ui_volumes
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
-  devpi: &devpi_volumes
+  pypiserver: &pypiserver_volumes
     - type: bind
-      source: /mnt/omnissiah-vault/configs/devpi
+      source: /mnt/omnissiah-vault/data/pypiserver
       target: /data
       bind:
         create_host_path: true
@@ -130,15 +130,13 @@ services:
     profiles:
       - server-pi
 
-  devpi:
-    image: ghcr.io/devpi/devpi:latest
-    container_name: devpi
+  pypiserver:
+    image: pypiserver/pypiserver:latest
+    container_name: pypiserver
     restart: unless-stopped
     ports:
-      - "6006:3141"
-    volumes: *devpi_volumes
-    environment:
-      - DEVPI_SERVERDIR=/data
-      - DEVPI_PASSWORD=admin
+      - "6006:8080"
+    volumes: *pypiserver_volumes
+    command: -P . -a . /data
     profiles:
       - server-pi
\ No newline at end of file