diff --git a/pom.xml b/pom.xml
index 56c60ea..5b74856 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Update this value and redeploy site when new versions of NXRM are released. -->
-    <version-number-latest-nexus-repo-release-number>3.15.2-01</version-number-latest-nexus-repo-release-number>
+    <version_number_latest_nexus_repo_release_number>3.15.2-01</version_number_latest_nexus_repo_release_number>
   </properties>
 
   <build>
@@ -111,7 +111,7 @@
           <artifactId>maven-site-plugin</artifactId>
           <!-- maven-site-plugin is still borked, unless new doxia dependency is explicitly defined. -->
           <!-- latest version of maven-site-plugin causes deploy issues. -->
-          <version>3.7.1</version>
+          <version>3.21.0</version>
           <configuration>
             <!-- we use maven-scm-publish-plugin to deploy, so skip this. -->
             <skipDeploy>true</skipDeploy>
@@ -142,7 +142,7 @@
             <dependency>
               <groupId>org.apache.maven.doxia</groupId>
               <artifactId>doxia-core</artifactId>
-              <version>1.8</version>
+              <version>2.0.0</version>
             </dependency>
           </dependencies>
         </plugin>
diff --git a/src/site/markdown/nexussetup.md.vm b/src/site/markdown/nexussetup.md.vm
index 067e8e2..d602635 100644
--- a/src/site/markdown/nexussetup.md.vm
+++ b/src/site/markdown/nexussetup.md.vm
@@ -104,7 +104,7 @@ Nexus Setup
     
         -------------------------------------------------
         
-        Started Sonatype Nexus OSS ${version-number-latest-nexus-repo-release-number}
+        Started Sonatype Nexus OSS ${version_number_latest_nexus_repo_release_number}
         
         -------------------------------------------------
 
diff --git a/src/site/markdown/obsolete/nexusdaemonsetup.md.vm b/src/site/markdown/obsolete/nexusdaemonsetup.md.vm
index c709395..2fd7127 100644
--- a/src/site/markdown/obsolete/nexusdaemonsetup.md.vm
+++ b/src/site/markdown/obsolete/nexusdaemonsetup.md.vm
@@ -25,7 +25,7 @@ Nexus Deamon Setup
         # Description:       Enable nexus as a system service provided by daemon.
         ### END INIT INFO
 ]]#
-        NEXUS_HOME="/home/pi/nexus/nexus-${version-number-latest-nexus-repo-release-number}"
+        NEXUS_HOME="/home/pi/nexus/nexus-${version_number_latest_nexus_repo_release_number}"
         NEXUS_USER="pi"
         
         . /lib/lsb/init-functions
diff --git a/src/site/markdown/obsolete/nexussetup.md.vm b/src/site/markdown/obsolete/nexussetup.md.vm
index 62a94a3..693aabf 100644
--- a/src/site/markdown/obsolete/nexussetup.md.vm
+++ b/src/site/markdown/obsolete/nexussetup.md.vm
@@ -24,12 +24,12 @@ Nexus Setup
       
      then: 
   
-        my-pc$ scp ~/Downloads/nexus-${version-number-latest-nexus-repo-release-number}-unix.tar.gz pi@the-Pi-IP-address:/home/pi/nexus/
+        my-pc$ scp ~/Downloads/nexus-${version_number_latest_nexus_repo_release_number}-unix.tar.gz pi@the-Pi-IP-address:/home/pi/nexus/
       
   4. Unzip/untar the Nexus bundle:
   
         pi@raspberrypi:~ $ cd nexus
-        pi@raspberrypi:~/nexus $ tar -zxvf nexus-${version-number-latest-nexus-repo-release-number}-unix.tar.gz
+        pi@raspberrypi:~/nexus $ tar -zxvf nexus-${version_number_latest_nexus_repo_release_number}-unix.tar.gz
 
   5. If you try to launch Nexus now, you will likely see an error like the one below:
   
@@ -38,14 +38,14 @@ Nexus Setup
         # There is insufficient memory for the Java Runtime Environment to continue.
         # Native memory allocation (mmap) failed to map 419430400 bytes for committing reserved memory.
         # An error report file with more information is saved as:
-        # /home/pi/nexus/nexus-${version-number-latest-nexus-repo-release-number}/hs_err_pid1755.log
+        # /home/pi/nexus/nexus-${version_number_latest_nexus_repo_release_number}/hs_err_pid1755.log
         
      A Pi currently only has 1GB of RAM, so you need to configure Nexus to use less RAM than
      normal, and allocate more to direct memory for use by the 
      [database](https://support.sonatype.com/hc/en-us/articles/115007093447-Optimizing-OrientDB-Database-Memory-).
      Move into the nexus bin dir, and edit the `nexusvm.options` file:
      
-        pi@raspberrypi:~/nexus/nexus-${version-number-latest-nexus-repo-release-number}/bin $ vi nexus.vmoptions
+        pi@raspberrypi:~/nexus/nexus-${version_number_latest_nexus_repo_release_number}/bin $ vi nexus.vmoptions
         
      Change:
      
@@ -63,7 +63,7 @@ Nexus Setup
 
     To see the log output on the console, use this command:
 
-        pi@raspberrypi:~/nexus/nexus-${version-number-latest-nexus-repo-release-number}/bin $ ./nexus run
+        pi@raspberrypi:~/nexus/nexus-${version_number_latest_nexus_repo_release_number}/bin $ ./nexus run
 
     Startup can take a while. The command above will print messages to the console while Nexus is
     starting. You could also 'tail' the nexus log file to watch startup progress using a command like this:
@@ -74,7 +74,7 @@ Nexus Setup
     
         -------------------------------------------------
         
-        Started Sonatype Nexus OSS ${version-number-latest-nexus-repo-release-number}
+        Started Sonatype Nexus OSS ${version_number_latest_nexus_repo_release_number}
         
         -------------------------------------------------
 
diff --git a/src/site/resources/scripts/nexusd b/src/site/resources/scripts/nexusd
index f1d5341..0f34922 100755
--- a/src/site/resources/scripts/nexusd
+++ b/src/site/resources/scripts/nexusd
@@ -9,7 +9,7 @@
 # Description:       Enable nexus to run as a system service provided by daemon.
 ### END INIT INFO
 
-NEXUS_HOME="/home/pi/nexus/nexus-${version-number-latest-nexus-repo-release-number}"
+NEXUS_HOME="/home/pi/nexus/nexus-${version_number_latest_nexus_repo_release_number}"
 NEXUS_USER="pi"
 
 . /lib/lsb/init-functions