diff --git a/tools/tcg_eventlog_tool/build.gradle b/tools/tcg_eventlog_tool/build.gradle
index 48f689cd..9a5a917c 100644
--- a/tools/tcg_eventlog_tool/build.gradle
+++ b/tools/tcg_eventlog_tool/build.gradle
@@ -2,7 +2,7 @@ import java.util.concurrent.TimeUnit
 
 plugins {
        id "java"
-       id "nebula.ospackage" version "9.1.1"
+       id "nebula.ospackage" version "9.0.0"
 }
 
 java {
@@ -43,7 +43,7 @@ def packVersion = properties.get("packageVersion");
 
 // Produce packages
 ospackage {
-    packageName = 'tcg_eventlog_tool'
+    packageName = 'tcg-eventlog-tool'
     os = LINUX
     arch = NOARCH
     version = "$packVersion"
@@ -96,9 +96,9 @@ ospackage {
     postInstall file('scripts/vendor-table.sh')
 
     buildRpm {
-        arch = I386
+        arch = X86_64
     }
     buildDeb {
-        arch = I386
+        arch = 'amd64'
     }
 }
diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle
index e40d6b57..804998dd 100644
--- a/tools/tcg_rim_tool/build.gradle
+++ b/tools/tcg_rim_tool/build.gradle
@@ -83,9 +83,9 @@ ospackage {
 }
 
 buildRpm {
-   arch = I386
+   arch = X86_64
 }
 
 buildDeb {
-    arch = I386
+    arch = 'amd64'
 }