diff --git a/server.yaml b/server.yaml
index 868dd61cd41011147d3800130c05e308a0e5b87e_c2VydmVyLnlhbWw=..a8b683853e67dacf1334ddc9aeeee809957aa3ef_c2VydmVyLnlhbWw= 100644
--- a/server.yaml
+++ b/server.yaml
@@ -110,5 +110,5 @@
   operation_groups:
     - name: operation_init_prometheus
       source: server/operationInitPrometheus.gotmpl
-      target: "{{ joinFilePath .Target .ServerPackage .APIPackage (snakize (pascalize .Name)) }}"
-      file_name: "prometheus.go"
+      target: "{{ if .Name }}{{ joinFilePath .Target .ServerPackage .APIPackage (snakize (pascalize .Name))  }}{{ else }}{{ joinFilePath .Target .ServerPackage .Package  }}{{ end }}"
+      file_name: "prometheus_register.go"
diff --git a/templates/server/initPrometheus.gotmpl b/templates/server/initPrometheus.gotmpl
index 868dd61cd41011147d3800130c05e308a0e5b87e_dGVtcGxhdGVzL3NlcnZlci9pbml0UHJvbWV0aGV1cy5nb3RtcGw=..a8b683853e67dacf1334ddc9aeeee809957aa3ef_dGVtcGxhdGVzL3NlcnZlci9pbml0UHJvbWV0aGV1cy5nb3RtcGw= 100644
--- a/templates/server/initPrometheus.gotmpl
+++ b/templates/server/initPrometheus.gotmpl
@@ -27,6 +27,7 @@
         "api_version": "{{ .Info.Version }}",
     }, prometheus.DefaultRegisterer)
 
+    {{ if gt (len .Tags) 0 }}
     {{range .OperationGroups}}
     {{ .Name }}.RegisterPrometheus(reg)
     {{- end}}
@@ -30,4 +31,7 @@
     {{range .OperationGroups}}
     {{ .Name }}.RegisterPrometheus(reg)
     {{- end}}
+    {{- else }}
+    RegisterPrometheus(reg)
+    {{- end }}
 }
diff --git a/templates/server/operationInitPrometheus.gotmpl b/templates/server/operationInitPrometheus.gotmpl
index 868dd61cd41011147d3800130c05e308a0e5b87e_dGVtcGxhdGVzL3NlcnZlci9vcGVyYXRpb25Jbml0UHJvbWV0aGV1cy5nb3RtcGw=..a8b683853e67dacf1334ddc9aeeee809957aa3ef_dGVtcGxhdGVzL3NlcnZlci9vcGVyYXRpb25Jbml0UHJvbWV0aGV1cy5nb3RtcGw= 100644
--- a/templates/server/operationInitPrometheus.gotmpl
+++ b/templates/server/operationInitPrometheus.gotmpl
@@ -13,6 +13,7 @@
 )
 
 func RegisterPrometheus(reg prometheus.Registerer) {
+    {{- if gt (len .GenOpts.Tags) 0 }}
     reg = prometheus.WrapRegistererWith(prometheus.Labels{
         "api_operation_group": "{{ .Name }}",
     }, reg)
@@ -16,4 +17,5 @@
     reg = prometheus.WrapRegistererWith(prometheus.Labels{
         "api_operation_group": "{{ .Name }}",
     }, reg)
+    {{- end }}
 
@@ -19,5 +21,5 @@
 
-    {{ range .Operations}}
+    {{- range .Operations}}
     reg.MustRegister(
         {{ camelize .Name }}HandlerDuration,
         {{ camelize .Name }}HandlerInFlight,