diff --git a/rabbitmq/applicationset.yaml b/rabbitmq/applicationset.yaml
index 6fcab646..9019202f 100644
--- a/rabbitmq/applicationset.yaml
+++ b/rabbitmq/applicationset.yaml
@@ -26,7 +26,7 @@ spec:
           targetRevision: 12.9.0
           chart: rabbitmq
           helm:
-            valueFiles:
+            valueFile:
               - $values/rabbitmq/{{ env }}-values.yaml
         - repoURL: https://gitlab.com/oceanbox/manifests.git
           targetRevision: HEAD
diff --git a/redis/application.yaml b/redis/application.yaml
deleted file mode 100644
index ce87679b..00000000
--- a/redis/application.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: redis
-  namespace: argocd
-spec:
-  project: atlantis
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: atlantis
-  sources:
-    - repoURL: https://charts.bitnami.com/bitnami
-      targetRevision: 18.9.1
-      chart: redis
-      helm:
-        values: |
-          architecture: replication
-          auth:
-            enabled: true
-            sentinel: true
-            password: ""
-            existingSecret: ""
-            existingSecretPasswordKey: ""
-            usePasswordFiles: false
-    - repoURL: https://gitlab.com/oceanbox/manifests
-      targetRevision: HEAD
-      path: redis/manifests
diff --git a/redis/applicationset.yaml b/redis/applicationset.yaml
new file mode 100644
index 00000000..fe16839d
--- /dev/null
+++ b/redis/applicationset.yaml
@@ -0,0 +1,34 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: redis
+  namespace: argocd
+spec:
+  generators:
+  - list:
+      elements:
+      - cluster: https://kubernetes.default.svc
+        env: prod
+        hostname: redis.srv.oceanbox.io
+      - cluster: https://kubernetes.default.svc
+        env: staging
+        hostname: redis.beta.oceanbox.io
+  template:
+    metadata:
+      name: '{{ env }}-redis'
+    spec:
+      project: atlantis
+      destination:
+        server: https://kubernetes.default.svc
+        namespace: redis
+      sources:
+        - repoURL: https://charts.bitnami.com/bitnami
+          targetRevision: 18.9.1
+          chart: redis
+          helm:
+            valueFiles:
+              - $values/redis/values.yaml
+        - repoURL: https://gitlab.com/oceanbox/manifests.git
+          targetRevision: HEAD
+          path: redis/{{ env }}
+          ref: values
diff --git a/redis/manifests/nodeport.yaml b/redis/prod/nodeport.yaml
similarity index 100%
rename from redis/manifests/nodeport.yaml
rename to redis/prod/nodeport.yaml
diff --git a/redis/staging/nodeport.yaml b/redis/staging/nodeport.yaml
new file mode 100644
index 00000000..3e5da974
--- /dev/null
+++ b/redis/staging/nodeport.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-nodeport
+  namespace: oceanbox
+spec:
+  externalTrafficPolicy: Cluster
+  ports:
+  - name: redis
+    nodePort: 31379
+    port: 6379
+    protocol: TCP
+    targetPort: 6379
+  selector:
+    app.kubernetes.io/instance: redis
+    app.kubernetes.io/name: redis
+  sessionAffinity: None
+  type: NodePort
diff --git a/redis/values.yaml b/redis/values.yaml
new file mode 100644
index 00000000..f7bc7f49
--- /dev/null
+++ b/redis/values.yaml
@@ -0,0 +1,9 @@
+architecture: replication
+auth:
+  enabled: true
+  sentinel: true
+  password: ""
+  existingSecret: ""
+  existingSecretPasswordKey: ""
+  usePasswordFiles: false
+