diff --git a/argocd/manifests/devpi/statefulset.yaml b/argocd/manifests/devpi/statefulset.yaml
index 77a4c56..14cdf7e 100644
--- a/argocd/manifests/devpi/statefulset.yaml
+++ b/argocd/manifests/devpi/statefulset.yaml
@@ -18,8 +18,7 @@ spec:
         fsGroup: 1000
       containers:
         - name: devpi
-          # TODO: Tag builds with semantic versions (e.g., v1.0.0) for reproducibility
-          image: registry.ops.eblu.me/blumeops/devpi:latest
+          image: registry.ops.eblu.me/blumeops/devpi:v1.0.0
           env:
             - name: DEVPI_ROOT_PASSWORD
               valueFrom:
diff --git a/argocd/manifests/devpi/Dockerfile b/containers/devpi/Dockerfile
similarity index 100%
rename from argocd/manifests/devpi/Dockerfile
rename to containers/devpi/Dockerfile
diff --git a/argocd/manifests/devpi/start.sh b/containers/devpi/start.sh
similarity index 100%
rename from argocd/manifests/devpi/start.sh
rename to containers/devpi/start.sh