diff --git a/modules/end-user-guide/examples/che-go-configure-goproxy.adoc b/modules/end-user-guide/examples/che-go-configure-goproxy.adoc
new file mode 100644
index 0000000000..026a51bf15
--- /dev/null
+++ b/modules/end-user-guide/examples/che-go-configure-goproxy.adoc
@@ -0,0 +1,13 @@
+[source,yaml]
+----
+components:
+- mountSources: true
+  type: dockerimage
+  alias: go-cli
+  image: 'quay.io/eclipse/che-golang-1.12:7.7.0'
+  ...
+  - value: /tmp/.cache
+    name: GOCACHE
+  - value: 'http://your.athens.host'
+    name: GOPROXY
+----
\ No newline at end of file
diff --git a/modules/end-user-guide/examples/che-go-use-self-signed-cert.adoc b/modules/end-user-guide/examples/che-go-use-self-signed-cert.adoc
new file mode 100644
index 0000000000..083d022b39
--- /dev/null
+++ b/modules/end-user-guide/examples/che-go-use-self-signed-cert.adoc
@@ -0,0 +1,17 @@
+[source,yaml]
+----
+components:
+- mountSources: true
+  type: dockerimage
+  alias: go-cli
+  image: 'quay.io/eclipse/che-golang-1.12:7.7.0'
+  ...
+  - value: /tmp/.cache
+    name: GOCACHE
+  - value: 'http://your.athens.host'
+    name: GOPROXY
+  - value: 'on'
+    name: GO111MODULE
+  - value: '/projects/tls/rootCA.crt'
+    name: SSL_CERT_FILE
+----
diff --git a/modules/end-user-guide/partials/proc_configuring-go-to-use-a-non-standard-registry.adoc b/modules/end-user-guide/partials/proc_configuring-go-to-use-a-non-standard-registry.adoc
index f4f97acd4a..644efb56c3 100644
--- a/modules/end-user-guide/partials/proc_configuring-go-to-use-a-non-standard-registry.adoc
+++ b/modules/end-user-guide/partials/proc_configuring-go-to-use-a-non-standard-registry.adoc
@@ -9,16 +9,4 @@ Athens is a Go module datastore and proxy with many configuration options. It ca
 
 * To work with Athens, configure the `GOPROXY` environment variable in the devfile of your CLI container:
 +
-[source,yaml]
-----
-components:
-- mountSources: true
-  type: dockerimage
-  alias: go-cli
-  image: 'quay.io/eclipse/che-golang-1.12:7.7.0'
-  ...
-  - value: /tmp/.cache
-    name: GOCACHE
-  - value: 'http://your.athens.host'
-    name: GOPROXY
-----
+include::example${project-context}-go-configure-goproxy.adoc[]
diff --git a/modules/end-user-guide/partials/proc_using-self-signed-certificates-in-go-projects.adoc b/modules/end-user-guide/partials/proc_using-self-signed-certificates-in-go-projects.adoc
index 49b731b038..29c2e5f096 100644
--- a/modules/end-user-guide/partials/proc_using-self-signed-certificates-in-go-projects.adoc
+++ b/modules/end-user-guide/partials/proc_using-self-signed-certificates-in-go-projects.adoc
@@ -17,20 +17,4 @@ Go uses certificates from a file defined in the `SSL_CERT_FILE` environment vari
 
 . Add the appropriate environment variables to your devfile:
 +
-[source,yaml]
-----
-components:
-- mountSources: true
-  type: dockerimage
-  alias: go-cli
-  image: 'quay.io/eclipse/che-golang-1.12:7.7.0'
-  ...
-  - value: /tmp/.cache
-    name: GOCACHE
-  - value: 'http://your.athens.host'
-    name: GOPROXY
-  - value: 'on'
-    name: GO111MODULE
-  - value: '/projects/tls/rootCA.crt'
-    name: SSL_CERT_FILE
-----
+include::example${project-context}-go-use-self-signed-cert.adoc[]