diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fd522e7..78b93ad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 8
+      - name: Set up JDK 16
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
+          java-version: '16'
           distribution: 'adopt-hotspot'
       - name: Cache Maven packages
         uses: actions/cache@v1
diff --git a/pom.xml b/pom.xml
index 2860ad1..c0f56b2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -64,12 +64,6 @@
     </plugins>
   </build>
   <repositories>
-    <!--
-    <repository>
-      <id>public</id>
-      <url>http://repo.mvdw-software.be/content/groups/public/</url>
-    </repository>
-    -->
     <repository>
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
@@ -88,20 +82,17 @@
     </repository>
   </repositories>
   <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.17-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <!--
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.17-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
+    <!--  
+    paper-api (<= 1.16): com.destroystokyo.paper
+    spigot-api: org.spigotmc
+    bukkit: org.bukkit 
     -->
+    <dependency>
+      <groupId>io.papermc.paper</groupId>
+      <artifactId>paper-api</artifactId>
+      <version>1.17-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.bstats</groupId>
       <artifactId>bstats-bukkit-lite</artifactId>