diff --git a/charts/service-gateway/templates/gateway-tls/certificate.yaml b/charts/service-gateway/templates/gateway-tls/certificate.yaml
index a0e2b2b10..dbb7ed6b6 100644
--- a/charts/service-gateway/templates/gateway-tls/certificate.yaml
+++ b/charts/service-gateway/templates/gateway-tls/certificate.yaml
@@ -26,14 +26,10 @@ spec:
     - {{ include "tenant.name" . }}-s3proxy
     - {{ include "tenant.name" . }}-s3proxy.{{ .Release.Namespace }}.svc
     - {{ include "tenant.name" . }}-s3proxy.{{ .Release.Namespace }}.svc.cluster.local
-    {{- if eq .Release.Namespace "monitoring" }}
-    - prom-label-proxy
-    - prom-label-proxy.{{ .Release.Namespace }}.svc
-    - prom-label-proxy.{{ .Release.Namespace }}.svc.cluster.local
-    {{- end }}
   {{- end }}
 
   {{- if eq .Values.infra.hostType "domain" }}
+  commonName: {{ include "gateway.domain" . }}
   dnsNames:
     - {{ include "gateway.domain" . }}
     {{- if and (eq (dig "mode" "" (.Values.gatewayClass.annotations | default dict)) "hosted") (eq .Values.infra.host "appscode.com") }}
@@ -41,7 +37,12 @@ spec:
     - "api.{{ .Values.infra.host }}"
     - "api.byte.builders"
     {{- end }}
-  commonName: {{ include "gateway.domain" . }}
+  {{- end }}
+
+  {{- if eq .Release.Namespace "monitoring" }}
+    - prom-label-proxy
+    - prom-label-proxy.{{ .Release.Namespace }}.svc
+    - prom-label-proxy.{{ .Release.Namespace }}.svc.cluster.local
   {{- end }}
   usages:
     - key agreement
diff --git a/go.mod b/go.mod
index 6c5bf93c6..a5962a893 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module go.bytebuilders.dev/installer
 go 1.25.6
 
 require (
-	go.bytebuilders.dev/catalog v0.0.25-0.20260706073121-789173bab27a
+	go.bytebuilders.dev/catalog v0.1.0
 	go.bytebuilders.dev/resource-model v0.4.0
 	go.bytebuilders.dev/ui-wizards v0.36.0
 	go.openviz.dev/installer v0.0.0-20260619044110-702becd1dd97
@@ -12,7 +12,7 @@ require (
 	k8s.io/apimachinery v0.34.3
 	k8s.io/autoscaler/vertical-pod-autoscaler v1.0.0
 	kmodules.xyz/client-go v0.34.3
-	kmodules.xyz/image-packer v0.0.0-20260816165133-2fd27b057a22
+	kmodules.xyz/image-packer v0.0.0-20260821065815-3bdf20c5e1c0
 	kmodules.xyz/objectstore-api v0.34.0
 	kmodules.xyz/resource-metadata v0.48.1-0.20260713095944-b5ef2148513d
 	kmodules.xyz/schema-checker v0.4.3
diff --git a/go.sum b/go.sum
index 7aad3cdfd..318506790 100644
--- a/go.sum
+++ b/go.sum
@@ -211,8 +211,8 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 go.appscode.dev/alerts v0.2.1-0.20260516020454-00c8e56b1991 h1:juyyBSMLxf/D/py8QidUT0wZUIhisivkdeCIvwXvob8=
 go.appscode.dev/alerts v0.2.1-0.20260516020454-00c8e56b1991/go.mod h1:oG1OnN2JTilTTqGAHv4CCoqnvT3u0J8c7YgNny0Rj7g=
-go.bytebuilders.dev/catalog v0.0.25-0.20260706073121-789173bab27a h1:isqMBmEUshUGEiaCP7kFeJc6Y/q9zE+TN99jBHcbz9c=
-go.bytebuilders.dev/catalog v0.0.25-0.20260706073121-789173bab27a/go.mod h1:zXAS4yNzCueduM3glK0JDuPuJd2MDvCx2PtauRtzT7I=
+go.bytebuilders.dev/catalog v0.1.0 h1:nJ4NaHm/B00cSBGfJwNimA1i1KvHWXTU2ap0lpr4uOY=
+go.bytebuilders.dev/catalog v0.1.0/go.mod h1:zXAS4yNzCueduM3glK0JDuPuJd2MDvCx2PtauRtzT7I=
 go.bytebuilders.dev/resource-model v0.4.0 h1:wDXg4SGYn3zNRuOj17gGo0qeSE//ytdzGPSxkHa8JvA=
 go.bytebuilders.dev/resource-model v0.4.0/go.mod h1:wGndjj3y+Yjh7+e8Wjc6joqzZCC16WZfKNx9adAFVkw=
 go.bytebuilders.dev/ui-wizards v0.36.0 h1:HAq89ZSY6aoQU2jc4rg9/DPckTGYhMm4pf+b5sOtJNM=
@@ -337,8 +337,8 @@ kmodules.xyz/custom-resources v0.34.0 h1:ljkIYzIq0A3Awj87kkpuYqS9aifuyR3Hr9q2OVK
 kmodules.xyz/custom-resources v0.34.0/go.mod h1:pcA/n/CnrycjKCRNtU9Z+l5svhzFncLY2Kn9pqeXDVs=
 kmodules.xyz/go-containerregistry v0.0.15 h1:PRY5FDOzb6u23KOulQ4SWNdeUkBKmezLyJXP88q4EPw=
 kmodules.xyz/go-containerregistry v0.0.15/go.mod h1:rO0DEbYYEu1BfVcZ1pXV+3RgzVXr/k5hXcO+BQYVVDI=
-kmodules.xyz/image-packer v0.0.0-20260816165133-2fd27b057a22 h1:D6WYRFFlDJo4YGAS8e8b5Vg5OeOB+k5oTUI1cbgQoIk=
-kmodules.xyz/image-packer v0.0.0-20260816165133-2fd27b057a22/go.mod h1:qGW7hgwWT+13A9GOvjuRiRpuDUoHIwda1huOt9W7hHs=
+kmodules.xyz/image-packer v0.0.0-20260821065815-3bdf20c5e1c0 h1:PWCCATsNZB0iEtF73e5XFxBq53tuecFlbdlMbWcjYQ8=
+kmodules.xyz/image-packer v0.0.0-20260821065815-3bdf20c5e1c0/go.mod h1:qGW7hgwWT+13A9GOvjuRiRpuDUoHIwda1huOt9W7hHs=
 kmodules.xyz/monitoring-agent-api v0.34.0 h1:SNgKvC1j8oYWQcdClyV2T5GsOQoG40c3pK9aYKm0j8A=
 kmodules.xyz/monitoring-agent-api v0.34.0/go.mod h1:XFDfMHDZQeNEPdTDeDr4M0dT4UCWs+4IYzgHw7JDlms=
 kmodules.xyz/objectstore-api v0.34.0 h1:h16QGeKAJB27mj0rhvm3I0q0ulE99TgIulob/UkXzRc=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index b66a9dca7..b054c3622 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -317,7 +317,7 @@ github.com/zeebo/xxh3
 ## explicit; go 1.25
 go.appscode.dev/alerts/apis/alerts
 go.appscode.dev/alerts/apis/alerts/v1alpha1
-# go.bytebuilders.dev/catalog v0.0.25-0.20260706073121-789173bab27a
+# go.bytebuilders.dev/catalog v0.1.0
 ## explicit; go 1.25.6
 go.bytebuilders.dev/catalog/api/gateway/v1alpha1
 # go.bytebuilders.dev/resource-model v0.4.0
@@ -928,7 +928,7 @@ kmodules.xyz/custom-resources/crds
 # kmodules.xyz/go-containerregistry v0.0.15
 ## explicit; go 1.24.0
 kmodules.xyz/go-containerregistry/name
-# kmodules.xyz/image-packer v0.0.0-20260816165133-2fd27b057a22
+# kmodules.xyz/image-packer v0.0.0-20260821065815-3bdf20c5e1c0
 ## explicit; go 1.25.0
 kmodules.xyz/image-packer/pkg/lib
 # kmodules.xyz/monitoring-agent-api v0.34.0