diff --git a/ament_build_type_gradle/package.xml b/ament_build_type_gradle/package.xml
index c6fd0bd..044789f 100644
--- a/ament_build_type_gradle/package.xml
+++ b/ament_build_type_gradle/package.xml
@@ -13,11 +13,6 @@
   <build_depend>ament_java_resources</build_depend>
   <exec_depend>ament_java_resources</exec_depend>
 
-  <test_depend>ament_copyright</test_depend>
-  <test_depend>ament_pep257</test_depend>
-  <test_depend>ament_pep8</test_depend>
-  <test_depend>ament_pyflakes</test_depend>
-
   <export>
     <build_type>ament_python</build_type>
   </export>
diff --git a/ament_build_type_gradle/resource/ament_build_type_gradle b/ament_build_type_gradle/resource/ament_build_type_gradle
new file mode 100644
index 0000000..e69de29
diff --git a/ament_build_type_gradle/setup.py b/ament_build_type_gradle/setup.py
index 3d8c803..b20dec2 100644
--- a/ament_build_type_gradle/setup.py
+++ b/ament_build_type_gradle/setup.py
@@ -3,10 +3,17 @@
 from setuptools import find_packages
 from setuptools import setup
 
+package_name = 'ament_build_type_gradle'
+
 setup(
-    name='ament_build_type_gradle',
+    name=package_name,
     version='0.0.0',
     packages=find_packages(exclude=['test']),
+    data_files=[
+        ('share/' + package_name, ['package.xml']),
+        ('share/ament_index/resource_index/packages',
+            ['resource/' + package_name]),
+    ],
     install_requires=['ament-package', 'osrf_pycommon'],
     zip_safe=True,
     author='Esteve Fernandez',
@@ -24,6 +31,6 @@
     license='Apache License, Version 2.0',
     test_suite='test',
     entry_points={
-        'ament.build_types': ['ament_gradle = ament_build_type_gradle:AmentGradleBuildType', ],
+        'ament.build_types': [f'ament_gradle = {package_name}:AmentGradleBuildType', ],
     },
-    package_data={'ament_build_type_gradle': ['template/environment_hook/*.in']}, )
+    package_data={f'{package_name}': ['template/environment_hook/*.in']}, )
diff --git a/ament_java_resources/CMakeLists.txt b/ament_java_resources/CMakeLists.txt
index a0bbf00..fab14ab 100644
--- a/ament_java_resources/CMakeLists.txt
+++ b/ament_java_resources/CMakeLists.txt
@@ -6,22 +6,12 @@ find_package(ament_cmake REQUIRED)
 
 ament_index_register_resource(
     "templates"
-    CONTENT_FILE "classpath.sh.template"
-    PACKAGE_NAME "ament_build_type_gradle_classpath_sh")
+    CONTENT_FILE "classpath.dsv.template"
+    PACKAGE_NAME "ament_build_type_gradle_classpath_dsv")
 
 ament_index_register_resource(
     "templates"
-    CONTENT_FILE "classpath.bat.template"
-    PACKAGE_NAME "ament_build_type_gradle_classpath_bat")
+    CONTENT_FILE "jni_library_path.dsv.template"
+    PACKAGE_NAME "ament_build_type_gradle_jni_library_path_dsv")
 
-ament_index_register_resource(
-    "templates"
-    CONTENT_FILE "jni_library_path.sh.template"
-    PACKAGE_NAME "ament_build_type_gradle_jni_library_path_sh")
-
-ament_index_register_resource(
-    "templates"
-    CONTENT_FILE "jni_library_path.bat.template"
-    PACKAGE_NAME "ament_build_type_gradle_jni_library_path_bat")
-    
 ament_package()
diff --git a/ament_java_resources/classpath.bat.template b/ament_java_resources/classpath.bat.template
deleted file mode 100644
index 6dc448a..0000000
--- a/ament_java_resources/classpath.bat.template
+++ /dev/null
@@ -1,5 +0,0 @@
-ament_prepend_unique_value CLASSPATH "."
-REM https://ss64.com/nt/for.html
-FOR %%j IN (@_AMENT_EXPORT_JARS_CLASSPATH@) DO (
-  ament_prepend_unique_value CLASSPATH "%%j"
-)
diff --git a/ament_java_resources/classpath.dsv.template b/ament_java_resources/classpath.dsv.template
new file mode 100644
index 0000000..428e14d
--- /dev/null
+++ b/ament_java_resources/classpath.dsv.template
@@ -0,0 +1 @@
+prepend-non-duplicate;CLASSPATH;@_AMENT_EXPORT_JARS_CLASSPATH@
diff --git a/ament_java_resources/classpath.sh.template b/ament_java_resources/classpath.sh.template
deleted file mode 100644
index fc8ace3..0000000
--- a/ament_java_resources/classpath.sh.template
+++ /dev/null
@@ -1,27 +0,0 @@
-if [ -n "$ZSH_VERSION" ]; then
-  if [[ $options[shwordsplit] = off ]]; then
-    _AMENT_JAVA_SH_WORD_SPLIT=1
-    setopt shwordsplit
-  fi
-fi
-
-ament_prepend_unique_value CLASSPATH "."
-_AMENT_JAVA_IFS=$IFS
-IFS=";"
-jars="@_AMENT_EXPORT_JARS_CLASSPATH@"
-
-for jar in $jars
-do
-  ament_prepend_unique_value CLASSPATH "$jar"
-done
-
-IFS=$_AMENT_JAVA_IFS
-
-unset jar
-unset jars
-unset AMENT_JAVA_IFS
-
-if [ -n "$_AMENT_JAVA_SH_WORD_SPLIT" ]; then
-  unsetopt shwordsplit
-  unset _AMENT_JAVA_SH_WORD_SPLIT
-fi
diff --git a/ament_java_resources/jni_library_path.bat.template b/ament_java_resources/jni_library_path.bat.template
deleted file mode 100644
index f759d3a..0000000
--- a/ament_java_resources/jni_library_path.bat.template
+++ /dev/null
@@ -1 +0,0 @@
-ament_prepend_unique_value PATH "%AMENT_CURRENT_PREFIX%\lib\jni"
diff --git a/ament_java_resources/jni_library_path.dsv.template b/ament_java_resources/jni_library_path.dsv.template
new file mode 100644
index 0000000..640bff5
--- /dev/null
+++ b/ament_java_resources/jni_library_path.dsv.template
@@ -0,0 +1 @@
+prepend-non-duplicate;@JNI_LIB_ENV_VAR@;lib/jni
diff --git a/ament_java_resources/jni_library_path.sh.template b/ament_java_resources/jni_library_path.sh.template
deleted file mode 100644
index f2ccd76..0000000
--- a/ament_java_resources/jni_library_path.sh.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# detect if running on Darwin platform
-_UNAME=`uname -s`
-_IS_DARWIN=0
-if [ "$_UNAME" = "Darwin" ]; then
-  _IS_DARWIN=1
-fi
-unset _UNAME
-
-if [ $_IS_DARWIN -eq 0 ]; then
-  ament_prepend_unique_value LD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib/jni"
-else
-  ament_prepend_unique_value DYLD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib/jni"
-fi
-unset _IS_DARWIN