diff --git a/distcc/Dockerfile b/apps/distcc/Dockerfile
similarity index 100%
rename from distcc/Dockerfile
rename to apps/distcc/Dockerfile
diff --git a/distcc/distcc-deployment.yaml b/apps/distcc/distcc-deployment.yaml
similarity index 100%
rename from distcc/distcc-deployment.yaml
rename to apps/distcc/distcc-deployment.yaml
diff --git a/docker-registry/README.md b/apps/docker-registry/README.md
similarity index 100%
rename from docker-registry/README.md
rename to apps/docker-registry/README.md
diff --git a/docker-registry/certs/docker-registry.lan b/apps/docker-registry/certs/docker-registry.lan
similarity index 100%
rename from docker-registry/certs/docker-registry.lan
rename to apps/docker-registry/certs/docker-registry.lan
diff --git a/docker-registry/certs/docker-registry.lan.crt b/apps/docker-registry/certs/docker-registry.lan.crt
similarity index 100%
rename from docker-registry/certs/docker-registry.lan.crt
rename to apps/docker-registry/certs/docker-registry.lan.crt
diff --git a/docker-registry/docker-registry-ui.yaml b/apps/docker-registry/docker-registry-ui.yaml
similarity index 100%
rename from docker-registry/docker-registry-ui.yaml
rename to apps/docker-registry/docker-registry-ui.yaml
diff --git a/docker-registry/registry-deployment.yaml b/apps/docker-registry/registry-deployment.yaml
similarity index 96%
rename from docker-registry/registry-deployment.yaml
rename to apps/docker-registry/registry-deployment.yaml
index 3e76151..cfdcd4d 100644
--- a/docker-registry/registry-deployment.yaml
+++ b/apps/docker-registry/registry-deployment.yaml
@@ -11,10 +11,10 @@ kind: PersistentVolumeClaim
 metadata:
   name: docker-registry
   namespace: docker-registry
-  annotations:
-    volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
+  #annotations:
+  #  volume.beta.kubernetes.io/storage-class: "managed-nfs-storage"
 spec:
-  storageClassName: fast
+  storageClassName: csi-s3-slow
   accessModes:
   - ReadWriteOnce
   resources: