diff --git a/nbr/build-bin-nbr.sh b/nbr/build-bin-nbr.sh
index 6461cc568..ce7104717 100755
--- a/nbr/build-bin-nbr.sh
+++ b/nbr/build-bin-nbr.sh
@@ -1,151 +1,70 @@
 #!/usr/bin/env bash
 
+#
+# Copyright (c) 2022 nosqlbench
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 set -e
 set -x
 
-JAVA_VERSION="16"
-APPDIR=target/NBR.AppDir
+APPDIR=target/NB.AppDir
+JAR_NAME="nbr.jar"
+BIN_NAME="nbr"
+JAVA_VERSION="17"
+
+
 mkdir -p ${APPDIR}
 
 
-BUILD_OPENJ9="false"
-if [ "$1" = "--with-openj9" ]
+if [ ! -f target/${JAR_NAME} ]
 then
- BUILD_OPENJ9="true"
- printf "using openj9 for build\n"
- shift;
-fi
-
-if [ ! -f target/nbr.jar ]
-then
- printf "target/nbr.jar does not exist"
+ printf "target/${JAR_NAME} does not exist"
  exit 2
 fi
 
-#if [ -x "target/nbr" ]
-#then
-# printf "Removing stale target/nbr...\n"
-# rm target/nbr
-#fi
-
 rsync -av appimage/skel/ "${APPDIR}/"
-cp target/nbr.jar "${APPDIR}/usr/bin/nbr.jar"
+cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
 
 mkdir -p "${APPDIR}/usr/bin/jre"
 
-if [ "$JAVA_VERSION" == "16" ]
+if [ "$JAVA_VERSION" == "17" ]
 then
-  if [ ! -d "cache/jre16" ] ; then
-    printf "getting jre once into cache/jre15\n";
+  if [ ! -d "cache/jdk17" ] ; then
+    printf "getting jdk17 once into cache/jdk17\n";
     mkdir -p cache
     (cd cache && (
-     if [ "$BUILD_OPENJ9" = "true" ]
-     then
-      printf "BUILD_OPENJ9 is not supported in this version yet\n"
-      exit 2
-     else
-      wget -c 'https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1+9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz'
-      tar xf OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz
-      mv jdk-16.0.1+9-jre jre16
-     fi
+      wget -c https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz
+      tar -xf OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz
+      mv jdk-17.0.1+12 jdk17
+      rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz
     ))
   fi
-  rsync -av cache/jre16/ "${APPDIR}/usr/bin/jre/"
-elif [ "$JAVA_VERSION" == "15" ]
-then
-  if [ ! -d "cache/jre15" ] ; then
-    printf "getting jre once into cache/jre15\n";
-    mkdir -p cache
-    (cd cache && (
-     if [ "$BUILD_OPENJ9" = "true" ]
-     then
-      wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-      tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-      mv jdk-15.0.1+9-jre jre15
-      rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-     else
-      wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-      tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-      mv jdk-15.0.1+9-jre jre15
-     fi
-    ))
-  fi
-  rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
-# Java 14 should run binaries targeted to Java 11 bytecode
-elif [ "$JAVA_VERSION" == "14" ] ; then
-  if [ ! -d "cache/jre14" ] ; then
-    printf "getting jre once into cache/jre14\n";
-    mkdir -p cache
-    (cd cache && (
-     if [ "$BUILD_OPENJ9" = "true" ]
-     then
-      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
-      tar xf OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
-      mv jdk-14.0.1+7-jre jre14
-      rm OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
-     else
-      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
-      tar xf OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
-      mv jdk-14.0.1+7-jre jre14
-     fi
-    ))
-  fi
-  rsync -av cache/jre14/ "${APPDIR}/usr/bin/jre/"
+  rsync -av cache/jdk17/ "${APPDIR}/usr/bin/jre/"
 else
   printf "Unknown java version indicated in $0"
   exit 2
-   # wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
-   # tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
-   # mv jdk-12.0.2+10-jre jre
-   # rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
 fi
 
-
-
 if [ ! -f "${APPDIR}/AppRun" ]
   then
   ( cd ${APPDIR} && (
    printf "Linking AppRun...\n";
-   ln -s usr/bin/nbr AppRun
+   ln -s usr/bin/${BIN_NAME} AppRun
   ))
 fi
 
-#( cd ${APPDIR} && (
-#  rsync -av ..
-#  if [ ! -d "usr/bin/jre" ]
-#  then
-#   printf "getting jre...\n";
-#
-#   # JRE 12
-#   wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
-#   tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
-#   mv jdk-12.0.2+10-jre usr/bin/jre
-#   rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
-#
-#   # JRE 13
-#   # wget -c https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz
-#   # tar xf OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz
-#   #mv jdk-13+33-jre usr/bin/jre
-#   #rm OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz
-#  else
-#   printf "jre directory present, skipping...\n";
-#  fi
-#
-#  if [ -f "AppRun" ]
-#  then
-#   printf "Removing stale AppRun...\n";
-#   rm AppRun
-#  fi
-#
-#  if [ ! -f "AppRun" ]
-#  then
-#   printf "Linking AppRun...\n";
-#   ln -s usr/bin/nbr AppRun
-#  fi
-#
-# )
-#)
-
 printf "getting appimage tool and building image...\n";
 
 ( cd target && (
@@ -155,13 +74,13 @@ printf "getting appimage tool and building image...\n";
    chmod +x appimagetool-x86_64.AppImage
   fi
 
-  ARCH=x86_64 ./appimagetool-x86_64.AppImage NBR.AppDir nbr
-  # && chmod +x nbr
+  ARCH=x86_64 ./appimagetool-x86_64.AppImage NB.AppDir ${BIN_NAME}
+  # && chmod +x ${BIN_NAME}
  )
 )
 
-if [ -x "target/nbr" ]
+if [ -x "target/${BIN_NAME}" ]
 then
- printf "nosqlbench AppImage binary was built at target/nbr\n";
+ printf "nosqlbench AppImage binary was built at target/${BIN_NAME}\n";
 fi
 
diff --git a/nbr/pom.xml b/nbr/pom.xml
index 85a156a1b..49f7c1790 100644
--- a/nbr/pom.xml
+++ b/nbr/pom.xml
@@ -150,13 +150,14 @@
     </build>
     <profiles>
         <profile>
-            <id>build-nb-appimage</id>
+            <id>build-nbr-appimage</id>
             <activation>
                 <os>
                     <family>unix</family>
                     <name>linux</name>
                     <arch>amd64</arch>
                 </os>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <build>
                 <plugins>