diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 47a5b254..df81f519 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -162,19 +162,11 @@
             </exclusions>
         </dependency>
 
-		<!--Geyser for Bedrock Edition support-->
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
 		<!--Floodgate for Xbox Live Authentication-->
         <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>floodgate-bukkit</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>org.geysermc.floodgate</groupId>
+            <artifactId>api</artifactId>
+            <version>2.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
index 358776d2..cc333449 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
@@ -13,7 +13,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
-import org.geysermc.connector.GeyserConnector;
+import org.geysermc.floodgate.api.FloodgateApi;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 /**
@@ -48,7 +48,8 @@ public class ConnectionListener implements Listener {
             // having the login session from the login process
             BukkitLoginSession session = plugin.getSession(player.getAddress());
             
-            if (GeyserConnector.getInstance().getPlayerByUuid(player.getUniqueId()) != null) {
+            if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate") &&
+            		FloodgateApi.getInstance().getPlayer(player.getUniqueId()) != null) {
                 Runnable floodgateAuthTask = new FloodgateAuthTask(plugin, player);
                 Bukkit.getScheduler().runTaskAsynchronously(plugin, floodgateAuthTask);
             } else if (session == null) {
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
index d8da3d3c..e2b04a76 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
@@ -15,9 +15,8 @@ import java.util.Random;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.floodgate.api.FloodgateApi;
+import org.geysermc.floodgate.api.player.FloodgatePlayer;
 
 public class NameCheckTask extends JoinManagement<Player, CommandSender, ProtocolLibLoginSource>
         implements Runnable {
@@ -48,7 +47,7 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         try {
             // check if the player is connecting through Geyser
             if (!plugin.getCore().getConfig().getString("allowFloodgateNameConflict").equalsIgnoreCase("false")
-                    && getGeyserPlayer(username) != null) {
+                    && getFloodgatePlayer(username) != null) {
                 plugin.getLog().info("Skipping name conflict checking for player {}", username);
                 return;
             }
@@ -97,17 +96,12 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         plugin.putSession(player.getAddress(), loginSession);
     }
     
-    private static GeyserSession getGeyserPlayer(String username) {
-        if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate-bukkit") &&
-                Bukkit.getServer().getPluginManager().isPluginEnabled("Geyser-Spigot") &&
-                GeyserConnector.getInstance().getDefaultAuthType() == AuthType.FLOODGATE) {
+    private static FloodgatePlayer getFloodgatePlayer(String username) {
+        if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate"))  {
             // the Floodgate API requires UUID, which is inaccessible at NameCheckTask.java
-            // the Floodgate API has a return value for Java (non-bedrock) players, if they
-            // are linked to a Bedrock account
-            // workaround: iterate over Geyser's player's usernames
-            for (GeyserSession geyserPlayer : GeyserConnector.getInstance().getPlayers()) {
-                if (geyserPlayer.getName().equals(username)) {
-                    return geyserPlayer;
+            for (FloodgatePlayer floodgatePlayer : FloodgateApi.getInstance().getPlayers()) {
+                if (floodgatePlayer.getUsername().equals(username)) {
+                    return floodgatePlayer;
                 }
             }
         }
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
index 465c5d78..ae8a85e9 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
@@ -2,8 +2,8 @@ package com.github.games647.fastlogin.bukkit.task;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.geysermc.floodgate.FloodgateAPI;
-import org.geysermc.floodgate.FloodgatePlayer;
+import org.geysermc.floodgate.api.FloodgateApi;
+import org.geysermc.floodgate.api.player.FloodgatePlayer;
 
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
@@ -22,13 +22,13 @@ public class FloodgateAuthTask implements Runnable {
 
     @Override
     public void run() {
-        FloodgatePlayer floodgatePlayer = FloodgateAPI.getPlayer(player.getUniqueId());
+        FloodgatePlayer floodgatePlayer = FloodgateApi.getInstance().getPlayer(player.getUniqueId());
         plugin.getLog().info(
                 "Player {} is connecting through Geyser Floodgate.",
                 player.getName());
         String allowNameConflict = plugin.getCore().getConfig().getString("allowFloodgateNameConflict");
         // check if the Bedrock player is linked to a Java account 
-        boolean isLinked = floodgatePlayer.fetchLinkedPlayer() != null;
+        boolean isLinked = floodgatePlayer.getLinkedPlayer() != null;
         if (allowNameConflict.equalsIgnoreCase("linked") && !isLinked) {
             plugin.getLog().info(
                     "Bedrock Player {}'s name conflits an existing Java Premium Player's name",