diff --git a/.gitignore b/.gitignore
index b0e0314..bae8677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .gradle
 build/**
 */build
+
+ext/ant-javacard/
diff --git a/.gitmodules b/.gitmodules
index 69cb0ed..abfe843 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,6 @@
-[submodule "ext/ant-javacard"]
-	path = ext/ant-javacard
-	url = https://github.com/promovicz/ant-javacard.git
-	branch = master
 [submodule "ext/javacard-sdks"]
 	path = ext/javacard-sdks
 	url = https://github.com/martinpaljak/oracle_javacard_sdks.git
 [submodule "ext/globalplatform-exports"]
 	path = ext/globalplatform-exports
-	url = https://github.com/OpenJavaCard/globalplatform-exports.git
+	url = https://github.com/OpenJavaCard/globalplatform-exports.git
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 5e8cae1..cbb6e08 100644
--- a/build.xml
+++ b/build.xml
@@ -8,25 +8,27 @@
     <property name="ext.ant-javacard" value="ext/ant-javacard"/>
 
     <property name="sdk.globalplatform" value="ext/globalplatform-exports"/>
-    <property name="sdk.jc222" value="ext/javacard-sdks/jc222_kit"/>
+    <property name="sdk.jc" value="ext/javacard-sdks/jc310r20210706_kit"/>
 
     <!-- Cleanup target -->
     <target name="clean" description="Delete build output">
         <delete dir="build"/>
+        <delete dir="ext/ant-javacard"/>
     </target>
 
     <!-- Prepare build tools and directories -->
     <target name="prepare" description="Prepare build">
-        <ant dir="ext/ant-javacard"/>
-        <taskdef name="javacard"
-                 classpath="${ext.ant-javacard}/ant-javacard.jar"
-                 classname="pro.javacard.ant.JavaCard"/>
-
         <mkdir dir="build/javacard"/>
         <mkdir dir="build/classes/advanced"/>
         <mkdir dir="build/classes/full"/>
         <mkdir dir="build/classes/stub"/>
         <mkdir dir="build/classes/tiny"/>
+        <mkdir dir="ext/ant-javacard"/>
+
+        <get src="https://github.com/martinpaljak/ant-javacard/releases/latest/download/ant-javacard.jar" dest="ext/ant-javacard/ant-javacard.jar" skipexisting="true"/>
+        <taskdef name="javacard"
+                 classpath="${ext.ant-javacard}/ant-javacard.jar"
+                 classname="pro.javacard.ant.JavaCard"/>
     </target>
 
     <!-- Build-all target -->
@@ -51,7 +53,7 @@
     </target>
 
     <target name="build-advanced">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-advanced.cap"
                  jar="build/javacard/openjavacard-ndef-advanced.jar"
                  classes="build/classes/advanced"
@@ -67,7 +69,7 @@
     </target>
 
     <target name="build-full">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-full.cap"
                  jar="build/javacard/openjavacard-ndef-full.jar"
                  classes="build/classes/full"
@@ -81,7 +83,7 @@
     </target>
 
     <target name="build-tiny">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-tiny.cap"
                  jar="build/javacard/openjavacard-ndef-tiny.jar"
                  classes="build/classes/tiny"
@@ -95,7 +97,7 @@
     </target>
 
     <target name="build-stub">
-        <javacard jckit="${sdk.jc222}">
+        <javacard jckit="${sdk.jc}">
             <cap output="build/javacard/openjavacard-ndef-stub.cap"
                  jar="build/javacard/openjavacard-ndef-stub.jar"
                  classes="build/classes/stub"
diff --git a/ext/ant-javacard b/ext/ant-javacard
deleted file mode 160000
index 769c722..0000000
--- a/ext/ant-javacard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 769c7223a9d7f93c347de01d1caf1e66ee4ca3d4
diff --git a/ext/javacard-sdks b/ext/javacard-sdks
index 4a69670..e305a1a 160000
--- a/ext/javacard-sdks
+++ b/ext/javacard-sdks
@@ -1 +1 @@
-Subproject commit 4a696701af819af40a3678a3734d8e704a09f4b9
+Subproject commit e305a1a0b9bf6b9a8b0c91a9aad8d73537e7ff1b