diff --git a/service/glance-api.yaml b/service/glance-api.yaml
index 70da05d..b46da33 100644
--- a/service/glance-api.yaml
+++ b/service/glance-api.yaml
@@ -1,43 +1,45 @@
 service:
-    name: glance-api
-    ports:
-        - glance_api_port
-    # TODO(sreshetniak): add probes
-    container:
-        node-selector:
-            openstack-controller: "true"
-    probes:
+  name: glance-api
+  ports:
+    - glance_api_port
+  node-selector:
+    openstack-controller: "true"
+  containers:
+    - name: glance-api
+      image: glance-api
+      # TODO(sreshetniak): add probes
+      probes:
         readiness: "true"
         liveness: "true"
-    pre:
+      pre:
         - name: glance-db-create
           dependencies:
-              - mariadb
+            - mariadb
           type: single
           command:
-              mysql -u root -p{{ db_root_password }} -h mariadb -e "create database {{ glance_db_name }};
-              grant all privileges on {{ glance_db_name }}.* to '{{ glance_db_username }}'@'%' identified by '{{ glance_db_password }}';"
+            mysql -u root -p{{ db_root_password }} -h mariadb -e "create database {{ glance_db_name }};
+            grant all privileges on {{ glance_db_name }}.* to '{{ glance_db_username }}'@'%' identified by '{{ glance_db_password }}';"
         - name: glance-db-sync
           files:
-              - glance-api
+            - glance-api
           dependencies:
-              - glance-db-create
+            - glance-db-create
           type: single
           command: glance-manage db_sync
         - name: glance-service-registry
           dependencies:
-              - keystone
+            - keystone
           type: single
           command:
-              glance-service-registry.sh keystone {{ keystone_admin_port }} {{ openstack_user_name }} {{ openstack_user_password }}
-              {{ openstack_project_name }} default {{ glance_user }} {{ glance_password }}
-    daemon:
+            glance-service-registry.sh keystone {{ keystone_admin_port }} {{ openstack_user_name }} {{ openstack_user_password }}
+            {{ openstack_project_name }} default {{ glance_user }} {{ glance_password }}
+      daemon:
         name: glance-api
         files:
-            - glance-api
+          - glance-api
         command: glance-api
 
 files:
-    glance-api:
-        path: /etc/glance/glance-api.conf
-        content: glance-api.conf.j2
+  glance-api:
+    path: /etc/glance/glance-api.conf
+    content: glance-api.conf.j2
diff --git a/service/glance-registry.yaml b/service/glance-registry.yaml
index e29bdef..d9d25ff 100644
--- a/service/glance-registry.yaml
+++ b/service/glance-registry.yaml
@@ -1,23 +1,23 @@
 service:
-    name: glance-registry
-    ports:
-        - glance_registry_port
-    # TODO(sreshetniak): add probes
-    container:
-        node-selector:
-            openstack-controller: "true"
-    probes:
+  name: glance-registry
+  ports:
+    - glance_registry_port
+  containers:
+    - name: glance-registry
+      image: glance-registry
+      # TODO(sreshetniak): add probes
+      probes:
         readiness: "true"
         liveness: "true"
-    daemon:
+      daemon:
         name: glance-registry
         files:
-            - glance-registry-conf
+          - glance-registry-conf
         dependencies:
-            - glance-api
+          - glance-api
         command: glance-registry
 
 files:
-    glance-registry-conf:
-        path: /etc/glance/glance-registry.conf
-        content: glance-registry.conf.j2
+  glance-registry-conf:
+    path: /etc/glance/glance-registry.conf
+    content: glance-registry.conf.j2