diff --git a/Dockerfile b/Dockerfile
index 16ac6ec..df02f68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,6 @@ ADD . /antora/
 
 RUN antora generate --stacktrace site.yml
 
-FROM registry.access.redhat.com/rhscl/httpd-24-rhel7
+FROM registry.access.redhat.com/ubi8/httpd-24
 
 COPY --from=builder /antora/gh-pages/ /var/www/html/
diff --git a/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml b/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml
index 87ec3c3..b4f3adf 100644
--- a/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml
+++ b/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml
@@ -4,7 +4,7 @@ metadata:
   name: bgd-helm
 spec:
   destination:
-    namespace: user1-bgdh
+    namespace: user%USERNUM%-bgdh
     server: 'https://kubernetes.default.svc'
   source:
     path: documentation/modules/ROOT/examples/bgd-helm-chart
diff --git a/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml b/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml
index 4e22716..bbc0251 100644
--- a/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml
+++ b/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml
@@ -4,7 +4,7 @@ metadata:
   name: bgd-helm
 spec:
   destination:
-    namespace: user1-bgdh
+    namespace: user%USERNUM%-bgdh
     server: 'https://kubernetes.default.svc'
   source:
     path: documentation/modules/ROOT/examples/bgd-helm-chart
diff --git a/documentation/modules/ROOT/examples/bgd-app-helm.yaml b/documentation/modules/ROOT/examples/bgd-app-helm.yaml
index d01f457..75bb34e 100644
--- a/documentation/modules/ROOT/examples/bgd-app-helm.yaml
+++ b/documentation/modules/ROOT/examples/bgd-app-helm.yaml
@@ -4,7 +4,7 @@ metadata:
   name: bgd-helm
 spec:
   destination:
-    namespace: user1-bgdh
+    namespace: user%USERNUM%-bgdh
     server: 'https://kubernetes.default.svc'
   source:
     path: documentation/modules/ROOT/examples/bgd-helm-chart
diff --git a/documentation/modules/ROOT/pages/04-helm.adoc b/documentation/modules/ROOT/pages/04-helm.adoc
index db51857..e259a13 100644
--- a/documentation/modules/ROOT/pages/04-helm.adoc
+++ b/documentation/modules/ROOT/pages/04-helm.adoc
@@ -207,17 +207,17 @@ You should see the following output:
 include::ROOT:example$bgd-app-helm.yaml[]
 ----
 
-This YAML configuration defines an Argo CD Application named "bgd-helm" that deploys a Helm chart from a specific Git repository to the "user1-bgdh" namespace.
+This YAML configuration defines an Argo CD Application named "bgd-helm" that deploys a Helm chart from a specific Git repository to the "%USERNUM%-bgdh" namespace.
 
 ==== Step 2: Deploy/Observe the Argo CD Application
 
 
-Apply the configuration in the file to create the Argo CD Application in the namespace user1-argocd. This application will deploy the Helm chart for the BGD app:
+Apply the configuration in the file to create the Argo CD Application in the namespace user%USERNUM%-argocd. This application will deploy the Helm chart for the BGD app:
 
 [.console-input]
 [source,bash,subs="attributes+,+macros"]
 ----
-oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm.yaml -n user1-argocd
+oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm.yaml -n user%USERNUM%-argocd
 ----
 
 In the ArgoCD interface you should see the successful deployment of the "bgd-helm" application.
@@ -308,7 +308,7 @@ Now, apply the custom values file to the initial application using Argo CD:
 [.console-input]
 [source,bash,subs="attributes+,+macros"]
 ----
-oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml -n user1-argocd
+oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-custom.yaml -n user%USERNUM%-argocd
 ----
 
 ==== Step 4: Verify the Changes
@@ -368,7 +368,7 @@ Apply this parameterised configuration to Argo CD:
 [.console-input]
 [source,bash,subs="attributes+,+macros"]
 ----
-oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml -n user1-argocd
+oc apply -f ~/openshift-gitops-workshop/documentation/modules/ROOT/examples/bgd-app-helm-para.yaml -n user%USERNUM%-argocd
 ----
 
 Return to the ArgoCD interface and navigate to the 'App Details' section. Click on 'Parameters.' You will notice that the custom values file, which was present in the previous example, has been successfully removed from the ArgoCD Application.