diff --git a/images/linux/scripts/installers/ruby.sh b/images/linux/scripts/installers/ruby.sh
index aa2933ff..f0b6ffec 100644
--- a/images/linux/scripts/installers/ruby.sh
+++ b/images/linux/scripts/installers/ruby.sh
@@ -7,5 +7,11 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
+sudo apt-get install ruby-full
+sudo gem update --system
+
 # Install Ruby requirements
 apt-get install -y libz-dev openssl libssl-dev
+
+DocumentInstalledItem "ruby ($(ruby --version 2>&1 | cut -d ' ' -f 2))"
+DocumentInstalledItem "gem ($(gem -v 2>&1 | tail -n 1))"
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Install-Ruby.ps1 b/images/win/scripts/Installers/Install-Ruby.ps1
index 72ad0430..546a4591 100644
--- a/images/win/scripts/Installers/Install-Ruby.ps1
+++ b/images/win/scripts/Installers/Install-Ruby.ps1
@@ -17,4 +17,8 @@ $latestRubyBinPath2_5 = Get-ChildItem -Path $toolcacheRubyPath | Sort-Object {[S
 
 Add-MachinePathItem $latestRubyBinPath2_5
 $env:Path = Get-MachinePath
+
+# Update ruby gem to latest version
+gem update --system
+
 exit 0
diff --git a/images/win/scripts/Installers/Validate-Ruby.ps1 b/images/win/scripts/Installers/Validate-Ruby.ps1
index 73e11a08..88347ee1 100644
--- a/images/win/scripts/Installers/Validate-Ruby.ps1
+++ b/images/win/scripts/Installers/Validate-Ruby.ps1
@@ -40,6 +40,7 @@ else
 $rubyExeOnPath = (Get-Command -Name 'ruby').Path
 $rubyBinOnPath = Split-Path -Path $rubyExeOnPath
 $rubyVersionOnPath = Get-RubyVersion -rubyRootPath $rubyBinOnPath
+$gemVersion = & gem -v
 
 # Add details of available versions in Markdown
 $SoftwareName = "Ruby (x64)"
@@ -48,6 +49,7 @@ $Description = @"
 _Environment:_
 * Location: $rubyBinOnPath
 * PATH: contains the location of ruby.exe version $rubyVersionOnPath
+* Gem Version: $gemVersion
 "@
 
 Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description