diff --git a/.launch/Build and deploy SCViewer.launch b/.launch/Build and deploy SCViewer.launch
index 7bc07d3..9603745 100644
--- a/.launch/Build and deploy SCViewer.launch	
+++ b/.launch/Build and deploy SCViewer.launch	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
     <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
     <stringAttribute key="M2_GOALS" value="package"/>
     <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
@@ -12,10 +13,11 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
 </launchConfiguration>
diff --git a/releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant b/releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant
index cbfff8a..26ea363 100644
--- a/releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant
+++ b/releng/com.minres.scviewer.updateSite/packaging-p2-composite.ant
@@ -1,30 +1,9 @@
 <?xml version="1.0"?>
 <project name="project">
 
-    <target name="getMajorMinorVersion">
-        <script language="javascript">
-            <![CDATA[
-
-                  // getting the value
-                  buildnumber = project.getProperty("unqualifiedVersion");
-                  index = buildnumber.lastIndexOf(".");
-                  counter = buildnumber.substring(0, index);
-            project.setProperty("majorMinorVersion",counter);
-
-              ]]>
-        </script>
-    </target>
-
-    <target name="test_getMajorMinor" depends="getMajorMinorVersion">
-        <echo message="majorMinorVersion: ${majorMinorVersion}"/>
-    </target>
-
-    <!--
-    site.label      The name/title/label of the created composite site
-    unqualifiedVersion  The version without any qualifier replacement
-    buildQualifier    The build qualifier
-  -->
-    <target name="compute.child.repository.data" depends="getMajorMinorVersion">
+	<!-- site.label The name/title/label of the created composite site unqualifiedVersion 
+		The version without any qualifier replacement buildQualifier The build qualifier -->
+	<target name="compute.child.repository.data">
         <property name="full.version" value="${unqualifiedVersion}" />
 
         <property name="software.download.area" location="${user.home}/p2.repositories" />
diff --git a/releng/com.minres.scviewer.updateSite/pom.xml b/releng/com.minres.scviewer.updateSite/pom.xml
index 446a3a3..2b757f5 100644
--- a/releng/com.minres.scviewer.updateSite/pom.xml
+++ b/releng/com.minres.scviewer.updateSite/pom.xml
@@ -64,7 +64,7 @@
 						<version>${tycho-version}</version>
 						<configuration>
 							<!-- IMPORTANT: DO NOT split the arg line -->
-							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2-composite.ant p2.composite.add -Dsite.label="SCViewer Software Repository" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -Dsoftware.download.area="${software.download.area}/SCViewer-GHP/repository"</appArgLine>
+							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile packaging-p2-composite.ant p2.composite.add -Dsite.label="SCViewer Software Repository" -Dproject.build.directory=${project.build.directory} -DmajorMinorVersion=${parsedVersion.majorVersion}.${parsedVersion.minorVersion} -DunqualifiedVersion=${unqualifiedVersion} -Dsoftware.download.area="${software.download.area}/SCViewer-GHP/repository"</appArgLine>
 							<repositories>
 								<repository>
 									<id>2021-12</id>