diff --git a/geoserver/applicationset.yaml b/geoserver/applicationset.yaml
index 5242782c..8fa0786a 100644
--- a/geoserver/applicationset.yaml
+++ b/geoserver/applicationset.yaml
@@ -36,7 +36,3 @@ spec:
             string: "--skip-tests"
           - name: chart
             string: ncsa/geoserver
-      # - repoURL: https://gitlab.com/oceanbox/manifests.git
-      #   targetRevision: HEAD
-      #   # path: /{{ env }}
-      #   ref: values
diff --git a/rabbitmq/applicationset.yaml b/rabbitmq/applicationset.yaml
index 6437aad3..a80a0425 100644
--- a/rabbitmq/applicationset.yaml
+++ b/rabbitmq/applicationset.yaml
@@ -27,7 +27,7 @@ spec:
       chart: rabbitmq
       helm:
         valuesFiles:
-          - $values/rabbitmq/{{ env }}/-values.yaml
+          - $values/rabbitmq/{{ env }}-values.yaml
     - repoURL: https://gitlab.com/oceanbox/manifests.git
       targetRevision: HEAD
       path: rabbitmq/{{ env }}
diff --git a/rabbitmq/prod/values.yaml b/rabbitmq/prod-values.yaml
similarity index 100%
rename from rabbitmq/prod/values.yaml
rename to rabbitmq/prod-values.yaml
diff --git a/rabbitmq/staging/values.yaml b/rabbitmq/staging-values.yaml
similarity index 100%
rename from rabbitmq/staging/values.yaml
rename to rabbitmq/staging-values.yaml