diff --git a/.gitignore b/.gitignore
index 02ec6e3..63a18b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ coverage.xml
 # Translations
 *.mo
 *.pot
+
+#macOS
+.DS_Store
diff --git a/imagestreams/golang-centos7.json b/imagestreams/golang-centos7.json
index 578ab36..8e538d9 100644
--- a/imagestreams/golang-centos7.json
+++ b/imagestreams/golang-centos7.json
@@ -10,8 +10,9 @@
     "spec": {
         "tags": [
             {
+                "name": "latest",
                 "annotations": {
-                    "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major versions updates.",
+                    "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.",
                     "iconClass": "icon-go-gopher",
                     "openshift.io/display-name": "Go (Latest)",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",
@@ -21,28 +22,28 @@
                 },
                 "from": {
                     "kind": "ImageStreamTag",
-                    "name": "1.8"
+                    "name": "1.10"
                 },
-                "name": "latest",
                 "referencePolicy": {
                     "type": "Local"
                 }
             },
             {
+                "name": "1.10",
                 "annotations": {
-                  "description": "Build and run Go applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major versions updates.",
+                  "description": "Build and run Go 1.10 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.10/README.md.",
                   "iconClass": "icon-go-gopher",
-                  "openshift.io/display-name": "Go (1.8)",
+                  "openshift.io/display-name": "Go 1.10",
                   "openshift.io/provider-display-name": "Red Hat, Inc.",
                   "sampleRepo": "https://github.com/sclorg/golang-ex.git",
                   "supports": "golang",
-                  "tags": "builder,golang,go"
+                  "tags": "builder,golang,go",
+                  "version": "1.10"
                 },
                 "from": {
                     "kind": "DockerImage",
                     "name": "docker.io/centos/go-toolset-7-centos7:latest"
                 },
-                "name": "1.8",
                 "referencePolicy": {
                     "type": "Local"
                 }
diff --git a/imagestreams/golang-rhel7.json b/imagestreams/golang-rhel7.json
index 41d80dc..6dcc9bc 100644
--- a/imagestreams/golang-rhel7.json
+++ b/imagestreams/golang-rhel7.json
@@ -10,8 +10,9 @@
     "spec": {
         "tags": [
             {
+                "name": "latest",
                 "annotations": {
-                    "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.",
+                    "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.11/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.",
                     "iconClass": "icon-go-gopher",
                     "openshift.io/display-name": "Go (Latest)",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",
@@ -23,26 +24,26 @@
                     "kind": "ImageStreamTag",
                     "name": "1.11.5"
                 },
-                "name": "latest",
                 "referencePolicy": {
                     "type": "Local"
                 }
             },
             {
+                "name": "1.11.5",
                 "annotations": {
-                  "description": "Build and run Go applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Go available on OpenShift, including major version updates.",
+                  "description": "Build and run Go 1.11 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/golang-container/blob/master/1.11/README.md",
                   "iconClass": "icon-go-gopher",
-                  "openshift.io/display-name": "Go (1.11.5)",
+                  "openshift.io/display-name": "Go 1.11.5",
                   "openshift.io/provider-display-name": "Red Hat, Inc.",
                   "sampleRepo": "https://github.com/sclorg/golang-ex.git",
                   "supports": "golang",
-                  "tags": "builder,golang,go"
+                  "tags": "builder,golang,go",
+                  "version": "1.11.5"
                 },
                 "from": {
                     "kind": "DockerImage",
                     "name": "registry.redhat.io/devtools/go-toolset-rhel7:1.11.5"
                 },
-                "name": "1.11.5",
                 "referencePolicy": {
                     "type": "Local"
                 }