diff --git a/pom.xml b/pom.xml
index 8f02941..0486b2f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
         <dependency>
             <groupId>org.jlab.coat</groupId>
             <artifactId>coat-libs</artifactId>
-            <version>6.3.1-SNAPSHOT</version>
+            <version>13.0.3</version>
             <type>jar</type>
         </dependency>
     </dependencies> 
@@ -23,8 +23,52 @@
 
     <name>JRoot</name>
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <release>21</release>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.6.1</version>
+                <executions>
+                    <execution>
+                        <id>scons-1</id>
+                        <phase>package</phase>
+                        <goals><goal>exec</goal></goals>
+                        <configuration>
+                            <arguments><argument>build/native</argument></arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>scons-2</id>
+                        <phase>package</phase>
+                        <goals><goal>exec</goal></goals>
+                        <configuration>
+                            <arguments><argument></argument></arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>scons</executable>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.5.0</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>build</directory>
+                            <includes>
+                                <include>**/*</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/sconscript b/sconscript
index 9458bb7..28e9888 100644
--- a/sconscript
+++ b/sconscript
@@ -1,18 +1,19 @@
 Import('env')
 
-#env.JavaH(target = 'native', source = 'src/main/java/org/jlab/jroot/JRootJNI.java')
-
 javah = env.Command('native', 'src/main/java/org/jlab/jroot/JRootJNI.java', ['javac -h $TARGET $SOURCE', Delete('src/main/java/org/jlab/jroot/JRootJNI.class')])
 AlwaysBuild(javah)
 
-
 if 'JAVA_HOME' in env['ENV']:
   env['JAVA_HOME'] = env['ENV']['JAVA_HOME']
   env.Append(CPPPATH = ["$JAVA_HOME/include", "$JAVA_HOME/include/linux"])
-if env['PLATFORM'] == 'darwin':
+
+elif env['PLATFORM'] == 'darwin':
   env.ParseConfig("echo -I`/usr/libexec/java_home`/include")
   env.ParseConfig("echo -I`/usr/libexec/java_home`/include/darwin")
+
+if env['PLATFORM'] == 'darwin':
   env.ParseConfig("echo -Wl,-rpath,`root-config --libdir`")
+
 env.Append(CPPPATH = ['native'])
 env.ParseConfig("root-config --libs --cflags")
 env.SharedLibrary('jrootJNI', Glob('src/cpp/*.cpp'))
diff --git a/setup.sh b/setup.sh
index 03d4fce..bf36833 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,5 +2,5 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${DIR}/build
-export JAVA_OPTS="-Djava.library.path=${DIR}/build"
+export JAVA_OPTS="${JAVA_OPTS} -Djava.library.path=${DIR}/build"
 export JYPATH="${DIR}/target/*"