diff --git a/halyard-deploy/src/main/resources/kubernetes/manifests/deployment.yml b/halyard-deploy/src/main/resources/kubernetes/manifests/deployment.yml
index a1f9868590..bc7c3b1632 100644
--- a/halyard-deploy/src/main/resources/kubernetes/manifests/deployment.yml
+++ b/halyard-deploy/src/main/resources/kubernetes/manifests/deployment.yml
@@ -31,10 +31,10 @@ spec:
   {% endif %}
   template:
     metadata:
-      annotations: {
-      {% for key, value in podAnnotations.items() %}
-              "{{ key }}" : "{{ value }}"{% if not loop.last %}, {% endif %}
-      {% endfor %}}
+      annotations:
+        {% for key, value in podAnnotations.items() %}
+        "{{ key }}": "{{ value }}"
+        {% endfor %}
       labels:
         app: spin
         cluster: spin-{{ name }}
@@ -43,6 +43,6 @@ spec:
         app.kubernetes.io/part-of: spinnaker
         app.kubernetes.io/version: {{ version }}
         {% for key, value in podLabels.items() %}
-        "{{ key }}" : "{{ value }}"{% if not loop.last %}, {% endif %}
+        "{{ key }}": "{{ value }}"
         {% endfor %}
     spec: {{ podSpec }}
diff --git a/halyard-deploy/src/main/resources/kubernetes/manifests/service.yml b/halyard-deploy/src/main/resources/kubernetes/manifests/service.yml
index 90bda8fac6..590f084541 100644
--- a/halyard-deploy/src/main/resources/kubernetes/manifests/service.yml
+++ b/halyard-deploy/src/main/resources/kubernetes/manifests/service.yml
@@ -7,7 +7,7 @@ metadata:
     app: spin
     cluster: spin-{{ name }}
     {% for key, value in serviceLabels.items() %}
-    "{{ key }}" : "{{ value }}"{% if not loop.last %}, {% endif %}
+    "{{ key }}": "{{ value }}"
     {% endfor %}
 spec:
   selector: