diff --git a/charts/static-site/helm-ui.json b/charts/static-site/helm-ui.json
index ca72925..4c83575 100644
--- a/charts/static-site/helm-ui.json
+++ b/charts/static-site/helm-ui.json
@@ -3,14 +3,13 @@
     "schemaIDs": [
       "#/properties/gitCloneUrl",
       "#/properties/buildImage",
-      "#/properties/buildTag",
       "#/properties/buildScript",
       "#/properties/builtAssets"
-
     ],
     "uiSchema": {
-      "#/properties/buildScript":{
-        "ui:widget": "textarea"
+      "#/properties/buildScript": {
+        "ui:widget": "textarea",
+        "ui:rows": 10
       }
     },
     "metaData": {
diff --git a/charts/static-site/templates/deployment.yaml b/charts/static-site/templates/deployment.yaml
index 28a6c8f..f496ed1 100644
--- a/charts/static-site/templates/deployment.yaml
+++ b/charts/static-site/templates/deployment.yaml
@@ -31,7 +31,7 @@ spec:
         emptyDir: {}  
       initContainers:
       - name: init-con
-        image: {{ .Values.buildImage }}:{{ .Values.buildTag }}
+        image: {{ .Values.buildImage }}
         {{- if .Values.buildScript }}
         command:
         - sh 
diff --git a/charts/static-site/tests/deployment_test.yaml b/charts/static-site/tests/deployment_test.yaml
index 90e545a..ef8b270 100644
--- a/charts/static-site/tests/deployment_test.yaml
+++ b/charts/static-site/tests/deployment_test.yaml
@@ -5,11 +5,8 @@ tests:
   - it: Should set image, tag and command
     set:
       gitCloneUrl: https:/github.com/mycompany/myrepo.git
-      buildImage: nginx
-      buildTag: x.y.z
+      buildImage: nginx:x.y.z
     asserts:
       - equal:
           path: spec.template.spec.initContainers[0].image
           value: nginx:x.y.z
-
-
diff --git a/charts/static-site/values.schema.json b/charts/static-site/values.schema.json
index 3110d1c..4e81fca 100644
--- a/charts/static-site/values.schema.json
+++ b/charts/static-site/values.schema.json
@@ -8,8 +8,7 @@
   "examples": [
     {
       "gitCloneUrl": "https://github.com/gimlet-io/hugo-site.git",
-      "buildImage": "node",
-      "buildTag": "latest",
+      "buildImage": "node:latest",
       "buildScript": "npm install && npm install -g gatsby-cli && gatsby build",
       "builtAssets": "public/"
     }
@@ -17,7 +16,6 @@
   "required": [
     "gitCloneUrl",
     "buildImage",
-    "buildTag",
     "buildScript",
     "builtAssets"
   ],
@@ -34,13 +32,7 @@
       "type": "string",
       "title": "Build image",
       "description": "The image that will be used for the build proccess",
-      "default":"bitnami/git"
-    },
-    "buildTag": {
-      "$id": "#/properties/buildTag",
-      "type": "string",
-      "title": "Image tag",
-      "default": "latest"
+      "default": "bitnami/git:latest"
     },
     "buildScript": {
       "$id": "#/properties/buildScript",
@@ -119,7 +111,6 @@
         }
       }
     }
-
   },
   "additionalProperties": true
 }
\ No newline at end of file
diff --git a/charts/static-site/values.yaml b/charts/static-site/values.yaml
index d175538..5847adb 100644
--- a/charts/static-site/values.yaml
+++ b/charts/static-site/values.yaml
@@ -63,8 +63,7 @@ affinity: {}
 
 # values to build and deploy static sites
 gitCloneUrl: https://github.com/gimlet-io/hugo-site.git
-buildImage: bitnami/git # the image must have git installed
-buildTag: latest
+buildImage: bitnami/git:latest # the image must have git installed
 buildScript: |
     # !/usr/bin/env bash
     # pre -reqs