diff --git a/.trivyignore b/.trivyignore
index 1d44b3fa..58f06840 100644
--- a/.trivyignore
+++ b/.trivyignore
@@ -1,2 +1,2 @@
 # openssl
-CVE-2023-0464 exp:2023-05-01
+CVE-2023-0464 exp:2023-08-01
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index ef3aeb49..b1e07b48 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{- if eq .Values.chartType "application" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -105,3 +106,4 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8}}
     {{- end }}
+{{- end }}
diff --git a/helm/templates/hpa.yaml b/helm/templates/hpa.yaml
index 74893314..21389e69 100644
--- a/helm/templates/hpa.yaml
+++ b/helm/templates/hpa.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.hpa.enabled }}
+{{- if and .Values.hpa.enabled (eq .Values.chartType "application") }}
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
diff --git a/helm/templates/logconfig.yaml b/helm/templates/logconfig.yaml
index 1a42795e..018f8c35 100644
--- a/helm/templates/logconfig.yaml
+++ b/helm/templates/logconfig.yaml
@@ -1,3 +1,4 @@
+{{- if eq .Values.chartType "application" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -39,3 +40,4 @@ data:
     {{- if .Values.logConfig.appender.rolling.enabled }}
     rootLogger.appenderRef.rolling.ref = ROLLING_FILE
     {{- end }}
+{{- end }}
diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
index b34ebb2c..9f522994 100644
--- a/helm/templates/service.yaml
+++ b/helm/templates/service.yaml
@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Chart.Name }}
+  name: {{ .Values.service.name }}
   labels:
     release: {{ .Release.Name }}
 spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: {{ .Values.containerPortName }}
+      targetPort: {{ .Values.containerPort }}
       name: {{ .Values.containerPortName }}-{{ .Chart.Name }}
   selector:
     {{- toYaml .Values.serviceSelectorLabels | nindent 4 }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 6fb76c1a..2b38f8a7 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -4,6 +4,8 @@
 replicaCount: 1
 maxUnavailable: 0
 
+chartType: application
+
 image:
   repository: hypertrace/gateway-service
   pullPolicy: IfNotPresent
@@ -18,6 +20,7 @@ containerPortName: grpc
 env: []
 
 service:
+  name: gateway-service
   type: ClusterIP
   port: 50071
   adminPort: 50072