diff --git a/flux/statefulset.yaml b/flux/deployment.yaml
similarity index 82%
rename from flux/statefulset.yaml
rename to flux/deployment.yaml
index 7229a8d..209617e 100644
--- a/flux/statefulset.yaml
+++ b/flux/deployment.yaml
@@ -1,14 +1,14 @@
 ---
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: devcontainer-${NAME}
 spec:
-  replicas: 1
   template:
     metadata:
       labels:
-        app: devcontainer-${NAME}
+        app: devcontainer
+        instance: ${NAME}
     spec:
       securityContext:
         fsGroup: 1000
@@ -44,8 +44,10 @@ spec:
             - name: HAPPY_EXPERIMENTAL
               value: "true"
           envFrom:
-            - configMapRef: ${ENV_CONFIGMAP}
-            - secretRef: ${ENV_SECRETS}
+            - configMapRef:
+                name: ${ENV_CONFIGMAP}
+            - secretRef:
+                name: ${ENV_SECRETS}
           resources:
             requests:
               memory: "2Gi"
@@ -68,12 +70,6 @@ spec:
       volumes:
         - name: workspace
           emptyDir: {}
-  volumeClaimTemplates:
-    - metadata:
-        name: userhome
-      spec:
-        accessModes: ["ReadWriteMany"]
-        storageClassName: "ceph-filesystem"
-        resources:
-          requests:
-            storage: 10Gi
+        - name: userhome
+          persistentVolumeClaim:
+            claimName: userhome-${NAME}
diff --git a/flux/kustomization.yaml b/flux/kustomization.yaml
index 8346be1..1f8591d 100644
--- a/flux/kustomization.yaml
+++ b/flux/kustomization.yaml
@@ -3,7 +3,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   #  - configmap.yaml
-  - statefulset.yaml
+  - deployment.yaml
+  - pvc.yaml
   - service.yaml
 
 commonLabels:
diff --git a/flux/pvc.yaml b/flux/pvc.yaml
new file mode 100644
index 0000000..d1a6229
--- /dev/null
+++ b/flux/pvc.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: userhome
+spec:
+  accessModes:
+    - ReadWriteMany
+  storageClassName: ceph-filesystem
+  resources:
+    requests:
+      storage: 32Gi
diff --git a/flux/service.yaml b/flux/service.yaml
index 0652d0f..ff8edc0 100644
--- a/flux/service.yaml
+++ b/flux/service.yaml
@@ -4,10 +4,12 @@ metadata:
   name: devcontainer-${NAME}
   labels:
     app: devcontainer
+    instance: ${NAME}
 spec:
   ports:
     - port: 5800
       name: vnc-web
       protocol: TCP
   selector:
-    app: devcontainer-${NAME}
+    app: devcontainer
+    instance: ${NAME}