diff --git a/charts/notification/Chart.yaml b/charts/notification/Chart.yaml
index 0bd1766..6cf0e49 100644
--- a/charts/notification/Chart.yaml
+++ b/charts/notification/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/notification/charts/common-0.1.0.tgz b/charts/notification/charts/common-0.1.0.tgz
index d5c69e9..affa62a 100644
Binary files a/charts/notification/charts/common-0.1.0.tgz and b/charts/notification/charts/common-0.1.0.tgz differ
diff --git a/common/templates/_task-git-semver.yaml b/common/templates/_task-git-semver.yaml
index 7d4e029..22b5840 100644
--- a/common/templates/_task-git-semver.yaml
+++ b/common/templates/_task-git-semver.yaml
@@ -25,7 +25,7 @@ spec:
       value: $(params.gitrepositoryurl)
     - name: PARAM_BRANCH
       value: $(params.gitbranch)
-    image: {{ .Values.quayHostname }}/goghvideo/gitversion:latest
+    image: {{ .Values.quayHostname }}/goghvideo/gitversion:5.11.0-alpine.3.13-6.0
     name: clone-and-calculate-semver
     script: |
       #!/usr/bin/env bash
diff --git a/common/templates/_task-s2i-go.yaml b/common/templates/_task-s2i-go.yaml
index 6106d60..d1b7448 100644
--- a/common/templates/_task-s2i-go.yaml
+++ b/common/templates/_task-s2i-go.yaml
@@ -13,7 +13,7 @@ spec:
   description: s2i-go task clones a Git repository and builds and pushes a container
     image using S2I and a Go builder image.
   params:
-  - default: latest
+  - default: "1.22"
     description: The tag of go imagestream for go version
     name: VERSION
     type: string
@@ -29,7 +29,7 @@ spec:
   - description: Location of the repo where image has to be pushed
     name: IMAGE
     type: string
-  - default: registry.redhat.io/rhel8/buildah@sha256:00795fafdab9bbaa22cd29d1faa1a01e604e4884a2c935c1bf8e3d1f0ad1c084
+  - default: quay01.ipa.endofday.com/goghvideo/buildah:latest
     description: The location of the buildah builder image.
     name: BUILDER_IMAGE
     type: string
@@ -50,7 +50,7 @@ spec:
     env:
     - name: HOME
       value: /tekton/home
-    image: registry.redhat.io/ocp-tools-4-tech-preview/source-to-image-rhel8@sha256:98d8cb3a255641ca6a1bce854e5e2460c20de9fb9b28e3cc67eb459f122873dd
+    image: quay01.ipa.endofday.com/goghvideo/openshift-pipeline-s2i:nightly
     name: generate
     script: |
       echo "Processing Build Environment Variables"
@@ -63,7 +63,7 @@ spec:
       echo "Outputting Generated /env-vars/env-file"
       cat /env-vars/env-file
 
-      s2i build $(params.PATH_CONTEXT) image-registry.openshift-image-registry.svc:5000/openshift/golang:$(params.VERSION) \
+      s2i build $(params.PATH_CONTEXT) quay01.ipa.endofday.com/goghvideo/golang:$(params.VERSION) \
       --as-dockerfile /gen-source/Dockerfile.gen --environment-file /env-vars/env-file
 
       echo "Outputting Generated /gen-source/Dockerfile.gen file"
diff --git a/common/templates/_triggertemplate.yaml b/common/templates/_triggertemplate.yaml
index 682d7e0..77d0d6e 100644
--- a/common/templates/_triggertemplate.yaml
+++ b/common/templates/_triggertemplate.yaml
@@ -63,7 +63,7 @@ spec:
       - name: image
         value: {{ .Values.quayHostname }}/{{ .Values.organizationName }}/{{ include "common.name" . }}
       - name: s2i-builder-image
-        value: {{ .Values.quayHostname }}/{{ .Values.organizationName }}/golang-s2i-buildah:v1
+        value: {{ .Values.quayHostname }}/{{ .Values.organizationName }}/golang-s2i-buildah:v1.37
       - name: git-token-secret-name
         value: git-http-credentials
       - name: git-token-secret-key