diff --git a/helmfile.d/rabbitmq.yaml.gotmpl b/helmfile.d/rabbitmq.yaml.gotmpl
index 794d9302..5fa1c1c7 100644
--- a/helmfile.d/rabbitmq.yaml.gotmpl
+++ b/helmfile.d/rabbitmq.yaml.gotmpl
@@ -16,8 +16,8 @@ releases:
   version: 12.9.0
   condition: rabbitmq.enabled
   values:
-  - ../values/rabbitmq/values/values.yaml.gotmpl
-  - ../values/rabbitmq/values/values-{{ .Environment.Name }}.yaml.gotmpl
+  - ../values/rabbitmq/values/values.yaml
+  - ../values/rabbitmq/values/values-{{ .Environment.Name }}.yaml
   postRenderer: ../bin/kustomizer
   postRendererArgs:
   - ../values/rabbitmq/kustomize/{{ .Environment.Name }}
diff --git a/values/rabbitmq/manifests/CiliumNetworkPolicy-allow-inter-node-traffic.yaml b/values/rabbitmq/network.bak/CiliumNetworkPolicy-allow-inter-node-traffic.yaml
similarity index 100%
rename from values/rabbitmq/manifests/CiliumNetworkPolicy-allow-inter-node-traffic.yaml
rename to values/rabbitmq/network.bak/CiliumNetworkPolicy-allow-inter-node-traffic.yaml
diff --git a/values/rabbitmq/manifests/CiliumNetworkPolicy-allow-operator-traffic.yaml b/values/rabbitmq/network.bak/CiliumNetworkPolicy-allow-operator-traffic.yaml
similarity index 100%
rename from values/rabbitmq/manifests/CiliumNetworkPolicy-allow-operator-traffic.yaml
rename to values/rabbitmq/network.bak/CiliumNetworkPolicy-allow-operator-traffic.yaml
diff --git a/values/rabbitmq/manifests/CiliumNetworkPolicy-allow-rabbitmq-traffic.yaml b/values/rabbitmq/network.bak/CiliumNetworkPolicy-allow-rabbitmq-traffic.yaml
similarity index 100%
rename from values/rabbitmq/manifests/CiliumNetworkPolicy-allow-rabbitmq-traffic.yaml
rename to values/rabbitmq/network.bak/CiliumNetworkPolicy-allow-rabbitmq-traffic.yaml
diff --git a/values/rabbitmq/manifests/network/policy-allow-rabbitmq.yaml b/values/rabbitmq/network.bak/policy-allow-rabbitmq.yaml
similarity index 100%
rename from values/rabbitmq/manifests/network/policy-allow-rabbitmq.yaml
rename to values/rabbitmq/network.bak/policy-allow-rabbitmq.yaml
diff --git a/values/rabbitmq/values/values-prod.yaml b/values/rabbitmq/values/values-prod.yaml
index 4bec8ba2..49f2d0ce 100644
--- a/values/rabbitmq/values/values-prod.yaml
+++ b/values/rabbitmq/values/values-prod.yaml
@@ -1,16 +1,18 @@
 replicaCount: 3
+
 auth:
   erlangCookie: prod-rabbitmq
   existingErlangSecret: prod-rabbitmq
   existingPasswordSecret: prod-rabbitmq
   password: ""
   username: user
+
 ingress:
+  enabled: true
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     oceanbox.io/expose: internal
-  enabled: true
   extraHosts: []
   extraPaths: []
   extraRules: []
diff --git a/values/rabbitmq/values/values-staging.yaml b/values/rabbitmq/values/values-staging.yaml
index 35c756e6..75fa903f 100644
--- a/values/rabbitmq/values/values-staging.yaml
+++ b/values/rabbitmq/values/values-staging.yaml
@@ -1,16 +1,18 @@
 replicaCount: 1
+
 auth:
   erlangCookie: staging-rabbitmq
   existingErlangSecret: staging-rabbitmq
   existingPasswordSecret: staging-rabbitmq
   password: ""
   username: user
+
 ingress:
+  enabled: true
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-staging
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     oceanbox.io/expose: internal
-  enabled: true
   ingressClassName: ""
   extraHosts:
    - name: rabbitmq.dev.oceanbox.io