diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle
index 5c0e2a4c..ea3282d2 100644
--- a/HIRS_AttestationCAPortal/build.gradle
+++ b/HIRS_AttestationCAPortal/build.gradle
@@ -97,6 +97,7 @@ ospackage {
     }
 
     // Post Install
+    postInstall "echo ${jarVersion} > /opt/hirs/aca/VERSION"
     postInstall 'bash /opt/hirs/aca/scripts/aca/aca_setup.sh -u'
     // add chrontab to run ACA at boot
     postInstall 'echo "@reboot root /opt/hirs/aca/scripts/aca/aca_bootRun.sh -w" >> /etc/crontab'
diff --git a/tools/tcg_eventlog_tool/build.gradle b/tools/tcg_eventlog_tool/build.gradle
index a35be3d6..f9432773 100644
--- a/tools/tcg_eventlog_tool/build.gradle
+++ b/tools/tcg_eventlog_tool/build.gradle
@@ -1,14 +1,11 @@
 import java.util.concurrent.TimeUnit
 plugins {
       id "java"
-//    id "findbugs"
-//    id "checkstyle"
       id "com.netflix.nebula.ospackage" version "11.4.0"
 }
 // Get version from main project gradle
 def packVersion = properties.get("packageVersion");
 def jarVersion = properties.get("jarVersion");
-//println "packageVersion is ${projVersion}"
 
 java {
     toolchain {
@@ -25,28 +22,9 @@ dependencies {
     implementation project(':HIRS_Utils')
     implementation libs.jcommander
     implementation libs.commons.io
-//    implementation libs.checkstyle
-//    implementation libs.findbugs
-//    testCompile libs.testng
 }
 
 ext.configDir = new File(projectDir, 'config')
-//ext.checkstyleConfigDir = "$configDir/checkstyle"
-//ext.findbugsConfigDir = "$configDir/findbugs"
-
-//checkstyle {
-//    toolVersion = '5.7'
-//    configFile = checkstyleConfigFile
-//    configProperties.put('basedir', checkstyleConfigDir)
-//    ignoreFailures = false
-//    showViolations = true
-//}
-
-//findbugs {
-//    toolVersion = '3.0.0'
-//    ignoreFailures = false
-//    effort = 'max'
-//}
 
 jar {
     // Keep jar clean:
@@ -73,11 +51,11 @@ ospackage {
     user 'root'
     fileMode = 0755
 
-   into ('/opt/hirs/eventlog/lib') {
+   into ('/opt/eltool/lib') {
        from jar.outputs.files
        from configurations.runtimeClasspath
     }
-    into ('/opt/hirs/eventlog/scripts') {
+    into ('/opt/eltool/scripts') {
       from ('scripts') {
         exclude {
             FileTreeElement details -> 
@@ -85,7 +63,7 @@ ospackage {
         }
       }
     }
-    into ('/opt/hirs/eventlog/docs') {
+    into ('/opt/eltool/docs') {
         from ('docs') {
            exclude {
                FileTreeElement details ->
@@ -100,7 +78,7 @@ ospackage {
        }
     }
     // Copy vendor-table into /tmp to avoid conflict with the ACA 
-    into('/tmp/elt/default-properties') {
+    into('/opt/eltool/default-properties') {
         from ('../../HIRS_Utils/src/main/resources/vendor-table.json') {
          fileMode 0664
          addParentDirs = true
@@ -108,19 +86,12 @@ ospackage {
     }
 
     // place elt link in system path to enable command line access
-    link("/usr/local/bin/elt", "/opt/hirs/eventlog/scripts/eventlog.sh", 0x755)
+    link("/usr/local/bin/elt", "/opt/eltool/scripts/eventlog.sh", 0x755)
 
-    // PostInstall
-     //postInstall "cp ../../HIRS_Utils/build/libs/* /opt/hirs/eventlog/lib/."
-    // Copy files from /opt/elt/default-properties/ to avoid conflicts with the ACA
-     postInstall "cp /tmp/elt/default-properties/* /opt/hirs/default-properties/."
-     postInstall "rm -rf /tmp/elt"
-
-    // Uninstall
-    // copy files to where package manager exspects them and remove project files
-     preUninstall "mkdir -p /tmp/elt/default-properties"
-     preUninstall "cp /opt/hirs/default-properties/vendor-table.json /tmp/elt/default-properties/."
-     postUninstall "rm -rf /tmp/elt"
+    // Post Install
+    postInstall "echo ${jarVersion} > /opt/eltool/VERSION"
+    // Post Uninstall
+    postUninstall 'rm -rf /opt/eltool'
 
     buildRpm {
         arch = X86_64
diff --git a/tools/tcg_eventlog_tool/gradle/wrapper/gradle-4.5.1-all.zip b/tools/tcg_eventlog_tool/gradle/wrapper/gradle-4.5.1-all.zip
deleted file mode 100644
index 1f4e97f9..00000000
Binary files a/tools/tcg_eventlog_tool/gradle/wrapper/gradle-4.5.1-all.zip and /dev/null differ
diff --git a/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.jar b/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.jar
index 94114481..943f0cbf 100644
Binary files a/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.jar and b/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.properties b/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.properties
index 52843533..c30b486a 100644
--- a/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.properties
+++ b/tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 13 15:33:27 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=gradle-4.5.1-all.zip
diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle
index f7785668..bfd32ba3 100644
--- a/tools/tcg_rim_tool/build.gradle
+++ b/tools/tcg_rim_tool/build.gradle
@@ -7,7 +7,6 @@ plugins {
 // Get version from main project gradle
 def packVersion = properties.get("packageVersion");
 def jarVersion = properties.get("jarVersion");
-//println "packageVersion is ${projVersion}"
 
 java {
     toolchain {
@@ -34,9 +33,6 @@ dependencies {
 	implementation libs.jackson.databind
 	implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
 	implementation libs.guava
-//    implementation libs.javax.json
- //   implementation libs.javax.jaxb
-//    implementation libs.javax.annotation
 
 	compileOnly libs.lombok
     implementation libs.lombok
@@ -73,13 +69,13 @@ ospackage {
     user 'root'
     fileMode = 0755
 
-    into ('/opt/hirs/rimtool/lib') {
+    into ('/opt/rimtool/lib') {
         from jar.outputs.files
         from configurations.runtimeClasspath
         from 'libs'
     }
 
-    into ('/opt/hirs/rimtool/scripts') {
+    into ('/opt/rimtool/scripts') {
       from ('scripts') {
         exclude {
             FileTreeElement details ->
@@ -87,7 +83,7 @@ ospackage {
         }
       }
     }
-    into ('/opt/hirs/rimtool/docs') {
+    into ('/opt/rimtool/docs') {
       from('./') {
          include {
              FileTreeElement details ->
@@ -95,11 +91,16 @@ ospackage {
           }        
        }
        }
-    into ('/opt/hirs/rimtool/data') {
+    into ('/opt/rimtool/data') {
       from('src/test/resources/') {
        }
      }
-     link("/usr/local/bin/rim", "/opt/hirs/rimtool/scripts/rimtool.sh", 0x755)
+    link("/usr/local/bin/rim", "/opt/rimtool/scripts/rimtool.sh", 0x755)
+
+    // Post Install
+    postInstall "echo ${jarVersion} > /opt/rimtool/VERSION"
+    // Post Uninstall
+    postUninstall 'rm -rf /opt/rimtool'
 }
 
 buildRpm {
@@ -109,4 +110,3 @@ buildRpm {
 buildDeb {
     arch = 'amd64'
 }
-
diff --git a/tools/tcg_rim_tool/gradle/wrapper/gradle-4.5.1-all.zip b/tools/tcg_rim_tool/gradle/wrapper/gradle-4.5.1-all.zip
deleted file mode 100644
index 1f4e97f9..00000000
Binary files a/tools/tcg_rim_tool/gradle/wrapper/gradle-4.5.1-all.zip and /dev/null differ
diff --git a/tools/tcg_rim_tool/gradle/wrapper/gradle-wrapper.jar b/tools/tcg_rim_tool/gradle/wrapper/gradle-wrapper.jar
index 94114481..943f0cbf 100644
Binary files a/tools/tcg_rim_tool/gradle/wrapper/gradle-wrapper.jar and b/tools/tcg_rim_tool/gradle/wrapper/gradle-wrapper.jar differ