diff --git a/apps/apt-cacher-ng/Dockerfile b/apps/apt-cacher-ng/Dockerfile
new file mode 100644
index 0000000..03311b7
--- /dev/null
+++ b/apps/apt-cacher-ng/Dockerfile
@@ -0,0 +1,16 @@
+FROM debian:stable-slim
+
+RUN apt-get update && apt-get install -y \
+	apt-cacher-ng && \
+	apt-get clean -y && \ 
+	rm -rf /var/lib/apt/lists/*
+
+RUN echo 'PassThroughPattern: .*' >> /etc/apt-cacher-ng/acng.conf
+
+VOLUME      ["/var/cache/apt-cacher-ng"]
+CMD chown apt-cacher-ng:apt-cacher-ng /var/cache/apt-cacher-ng
+EXPOSE      3142
+
+USER apt-cacher-ng
+#CMD     chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*
+CMD /usr/sbin/apt-cacher-ng -c /etc/apt-cacher-ng pidfile=/var/run/apt-cacher-ng/pid SocketPath=/var/run/apt-cacher-ng/socket foreground=1
\ No newline at end of file
diff --git a/apps/apt-cacher-ng-deployment.yaml b/apps/apt-cacher-ng/live-deployment.yaml
similarity index 87%
rename from apps/apt-cacher-ng-deployment.yaml
rename to apps/apt-cacher-ng/live-deployment.yaml
index e85b350..495cfe7 100644
--- a/apps/apt-cacher-ng-deployment.yaml
+++ b/apps/apt-cacher-ng/live-deployment.yaml
@@ -25,13 +25,6 @@ spec:
           volumeMounts:
             - mountPath: /var/cache/apt-cacher-ng
               name: data
-          resources:
-             requests: 
-                memory: 16Mi
-                cpu: 50m
-             limits:
-                memory: 32Mi
-                cpu: 100m
       volumes:
         - name: data
           persistentVolumeClaim:
diff --git a/apps/apt-cacher-ng/test-deployment.yaml b/apps/apt-cacher-ng/test-deployment.yaml
new file mode 100644
index 0000000..a393e95
--- /dev/null
+++ b/apps/apt-cacher-ng/test-deployment.yaml
@@ -0,0 +1,67 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: apt-cacher-ng-test
+  labels:
+    app: apt-cacher-ng-test
+spec:
+  replicas: 1
+  selector:
+      matchLabels:
+          app: apt-cacher-ng-test
+  strategy:
+      type: Recreate
+  template:
+    metadata:
+        labels:
+            app: apt-cacher-ng-test
+    spec:
+      containers:
+        - name: apt-cacher-ng-test
+          image: bkanis/apt-cacher-ng 
+          ports:
+            - containerPort: 3142
+              protocol: TCP
+          volumeMounts:
+            - mountPath: /var/cache/apt-cacher-ng
+              name: data
+          resources:
+             requests: 
+                memory: 64Mi
+                cpu: 50m
+             limits:
+                memory: 128Mi
+                cpu: 100m
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+              claimName: apt-cacher-volume-test
+              #---
+              #apiVersion: v1
+              #kind: Service 
+              #metadata:
+              #  name: apt-cacher-ng
+              #  labels:
+              #    app: apt-cacher-ng
+              #spec:
+              #  type: LoadBalancer
+              #  loadBalancerIP: 172.23.255.1
+              #  ports:
+              #    - name: apt-cacher-ng
+              #      port: 3142
+              #      targetPort: 3142
+              #      protocol: TCP
+              #  selector:
+              #    app: apt-cacher-ng
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: apt-cacher-volume-test 
+spec:
+  storageClassName: csi-s3-slow
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 40Gi
diff --git a/storage-csi-s3 b/storage-csi-s3
index 6a23dba..1d65d2a 160000
--- a/storage-csi-s3
+++ b/storage-csi-s3
@@ -1 +1 @@
-Subproject commit 6a23dbae7249bef08d93c4bfc0333c8cc0d1bf5a
+Subproject commit 1d65d2afbfeace11c1ab229c986150e2da23d0ee