diff --git a/docker-compose.yaml b/docker-compose.yaml
index 38665ab..718c16f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,6 +28,15 @@ x-volume-configs:
   registry_ui: &registry_ui_volumes
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
+  pypi: &pypi_volumes
+    - /mnt/omnissiah-vault/configs/auth:/auth:ro
+
+    - type: bind
+      source: /mnt/omnissiah-vault/data/pypi
+      target: /data
+      bind:
+        create_host_path: true
+
 services:
   registry-ui:
     image: joxit/docker-registry-ui:latest
@@ -122,3 +131,21 @@ services:
     restart: always
     profiles:
       - server-pi
+
+  pypi-server:
+    image: pypiserver/pypiserver:latest
+    container_name: pypi-server
+    restart: unless-stopped
+    ports:
+      - "6006:8080"
+    volumes: *pypi_volumes
+    environment:
+      - PYPISERVER_AUTH=update,download,list
+    command:
+      - -P
+      - /auth/htpasswd
+      - -a
+      - update,download,list
+      - /data/packages
+    profiles:
+      - server-pi