diff --git a/.github/workflows/RedHatUniversalBaseImage.yml b/.github/workflows/RedHatUniversalBaseImage.yml
index fd9e365..e2e1eb8 100644
--- a/.github/workflows/RedHatUniversalBaseImage.yml
+++ b/.github/workflows/RedHatUniversalBaseImage.yml
@@ -1,7 +1,7 @@
 # See: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
 
 # Workflow name
-name: Go Toolset for UBI 8 RPM build
+name: Red Hat Universal Base Image 8 RPM build
 
 # Run on event push
 on: push
@@ -9,16 +9,17 @@ on: push
 jobs:
 
   #
-  # Build with Go Toolset for UBI 8
+  # Build with UBI 8
   #
-  Go-Toolset-for-UBI-8-RPM-build:
+  UBI-8-RPM-build:
     runs-on: ubuntu-latest
-    container: registry.access.redhat.com/ubi8/go-toolset:1.16.12-4.1645821242
+    # See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c359854d70cc534b3a3784e?container-tabs=gti
+    container: registry.access.redhat.com/ubi8/ubi:8.5-226.1645809065
     steps:
 
     # Use dnf to install development packages
     - name: Install development packages
-      run: sudo dnf --assumeyes --disableplugin=subscription-manager group install "Development Tools" "RPM Development Tools"
+      run: dnf --assumeyes --disableplugin=subscription-manager group install "Development Tools" "RPM Development Tools"
 
     # Checkout git repository and submodules
     # fetch-depth must be 0 to use git describe
@@ -31,7 +32,7 @@ jobs:
 
     # Use dnf to install build dependencies
     - name: Install build dependencies
-      run: sudo dnf --assumeyes --disableplugin=subscription-manager builddep scripts/cc-metric-collector.spec
+      run: dnf --assumeyes --disableplugin=subscription-manager builddep scripts/cc-metric-collector.spec
 
     - name: RPM build MetricCollector
       id: rpmbuild
@@ -41,12 +42,12 @@ jobs:
     - name: Save RPM as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: cc-metric-collector RPM build on Go Toolset for UBI 8
+        name: cc-metric-collector RPM build for UBI 8
         path: ${{ steps.rpmbuild.outputs.RPM }}
     - name: Save SRPM as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: cc-metric-collector SRPM build on Go Toolset for UBI 8
+        name: cc-metric-collector SRPM build for UBI 8
         path: ${{ steps.rpmbuild.outputs.SRPM }}
 
     # See: https://github.com/softprops/action-gh-release