diff --git a/Chart.yaml b/Chart.yaml
index fff2212..b582732 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: task-containers
 description: Contains the Tekton Tasks to manage container images
 type: application
-version: 0.3.1
+version: 0.3.2
diff --git a/templates/spec-s2i.tpl b/templates/spec-s2i.tpl
index 1e71107..b71f620 100644
--- a/templates/spec-s2i.tpl
+++ b/templates/spec-s2i.tpl
@@ -24,6 +24,10 @@ params:
     type: string
     description: |
       Fully qualified container image name to be built by s2i.
+  - name: VERSION
+    description: The tag of go imagestream for go version
+    default: latest
+    type: string
   - name: IMAGE_SCRIPTS_URL
     type: string
     default: image:///usr/libexec/s2i         
@@ -45,6 +49,7 @@ stepTemplate:
   env:
 {{- $variables := list
       "params.IMAGE"
+      "params.VERSION"
       "params.IMAGE_SCRIPTS_URL"
       "params.CONTEXT"
       "params.FORMAT"
@@ -71,7 +76,7 @@ steps:
     workingDir: $(workspaces.source.path)
     env:
       - name: S2I_BUILDER_IMAGE
-        value: {{ $s2iBuilderImage }}
+        value: "{{ $s2iBuilderImage }}:$(params.VERSION)"
     command:
       - /scripts/s2i-generate.sh
     args:
diff --git a/values.yaml b/values.yaml
index 0ddeb58..75f8839 100644
--- a/values.yaml
+++ b/values.yaml
@@ -9,14 +9,14 @@ images:
 # source-to-image builder images, each language represents a distinct ecosystem the builder supports,
 # sometimes it includes a specific version
 s2iBuilders:
-  python: registry.access.redhat.com/ubi8/python-39:latest
-  ruby: registry.access.redhat.com/ubi9/ruby-31:1-102
-  perl: registry.access.redhat.com/ubi9/perl-532:1-145
-  go: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5.1713833129
-  nodejs: registry.access.redhat.com/ubi8/nodejs-18:latest
-  php: registry.access.redhat.com/ubi9/php-81:1-54
-  dotnet: registry.access.redhat.com/ubi8/dotnet-60:6.0-48
-  java: registry.access.redhat.com/ubi8/openjdk-11:latest
+  python: image-registry.openshift-image-registry.svc:5000/openshift/python
+  ruby: image-registry.openshift-image-registry.svc:5000/openshift/ruby
+  perl: image-registry.openshift-image-registry.svc:5000/openshift/perl
+  go: image-registry.openshift-image-registry.svc:5000/openshift/golang
+  nodejs: image-registry.openshift-image-registry.svc:5000/openshift/nodejs
+  php: image-registry.openshift-image-registry.svc:5000/openshift/php
+  dotnet: image-registry.openshift-image-registry.svc:5000/openshift/dotnet
+  java: image-registry.openshift-image-registry.svc:5000/openshift/java
 
 annotations:
   tekton.dev/pipelines.minVersion: "0.41.0"