diff --git a/templates/service.yaml b/templates/service.yaml
index 5acb20a..1c8d971 100644
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -1,9 +1,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "drone.fullname" . }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     {{- include "drone.labels" . | nindent 4 }}
+  name: {{ include "drone.fullname" . }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/templates/serviceAccount.yaml b/templates/serviceAccount.yaml
index 00f63d8..13b3dc7 100644
--- a/templates/serviceAccount.yaml
+++ b/templates/serviceAccount.yaml
@@ -1,4 +1,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "drone.labels" . | nindent 4 }}
   name: {{ include "drone.fullname" . }}
\ No newline at end of file
diff --git a/values.yaml b/values.yaml
index 451896d..3b270df 100644
--- a/values.yaml
+++ b/values.yaml
@@ -522,7 +522,11 @@ config: {}
   # https://docs.drone.io/server/reference/drone-webhook-skip-verify/
   # DRONE_WEBHOOK_SKIP_VERIFY: ""
 
+serviceAccount:
+  annotations: {}
+
 service:
+  annotations: {}
   type: ClusterIP
   port: 80