diff --git a/ceph/templates/service-rgw.yaml b/ceph/templates/service-rgw.yaml
new file mode 100644
index 0000000000..4ae4055c96
--- /dev/null
+++ b/ceph/templates/service-rgw.yaml
@@ -0,0 +1,32 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if .Values.rgw.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ceph-rgw
+  labels:
+    app: ceph
+    daemon: rgw
+spec:
+  ports:
+  - port: {{ .Values.network.port.rgw_ingress }}
+    protocol: TCP
+    targetPort: {{ .Values.network.port.rgw_target }}
+  selector:
+    app: ceph
+    daemon: rgw
+{{- end }}
diff --git a/ceph/templates/service.yaml b/ceph/templates/service.yaml
index 39e3d4075d..ef6d98e0a9 100644
--- a/ceph/templates/service.yaml
+++ b/ceph/templates/service.yaml
@@ -37,22 +37,3 @@ spec:
     app: ceph
     daemon: mon
   clusterIP: None
-
-{{- if .Values.rgw.enabled }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: ceph-rgw
-  labels:
-    app: ceph
-    daemon: rgw
-spec:
-  ports:
-  - port: {{ .Values.network.port.rgw_ingress }}
-    protocol: TCP
-    targetPort: {{ .Values.network.port.rgw_target }}
-  selector:
-    app: ceph
-    daemon: rgw
-{{- end }}