diff --git a/pom.xml b/pom.xml
index dd3802d..b6e88f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,13 +9,12 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <version.allay>master-SNAPSHOT</version.allay>
         <version.waterdogpe>2.0.3-SNAPSHOT</version.waterdogpe>
-        <version.powernukkitx>master-SNAPSHOT</version.powernukkitx>
+        <version.powernukkitx>2.0.0-SNAPSHOT</version.powernukkitx>
         <version.nukkit>1.0-SNAPSHOT</version.nukkit>
     </properties>
 
@@ -48,6 +47,10 @@
             <id>lpmc-redstonecloud</id>
             <url>https://repo.lostplacemc.eu/redstonecloud</url>
         </repository>
+        <repository>
+            <id>pnx-releases</id>
+            <url>https://repo.powernukkitx.org/releases</url>
+        </repository>
     </repositories>
 
     <distributionManagement>
@@ -66,8 +69,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.PowerNukkitX</groupId>
-            <artifactId>PowerNukkitX</artifactId>
+            <groupId>org.powernukkitx</groupId>
+            <artifactId>server</artifactId>
             <version>${version.powernukkitx}</version>
             <scope>provided</scope>
             <exclusions>
@@ -89,13 +92,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.allaymc.allay</groupId>
-            <artifactId>api</artifactId>
-            <version>${version.allay}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>cn.nukkit</groupId>
             <artifactId>nukkit</artifactId>
@@ -106,7 +102,7 @@
         <dependency>
             <groupId>de.redstonecloud</groupId>
             <artifactId>api</artifactId>
-            <version>0.1-beta</version>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java
index 15e649e..d7b3b2b 100644
--- a/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java
+++ b/src/main/java/de/redstonecloud/bridge/cloudinterface/components/BridgeServer.java
@@ -33,6 +33,7 @@ public static BridgeServer readFromCache(String serverName) {
                 .type(data.serverType())
                 .isProxy(data.proxy())
                 .extraData(data.extraData())
+                .address(data.address())
                 .build();
 
         return server;
@@ -47,6 +48,7 @@ public static BridgeServer readFromCache(String serverName) {
     protected boolean isProxy;
     protected UUID uuid;
     protected JsonObject extraData;
+    protected String address;
 
     @Override
     public long getCreatedAt() {
@@ -55,7 +57,7 @@ public long getCreatedAt() {
 
     @Override
     public HostAndPort getAddress() {
-        return HostAndPort.fromParts("0.0.0.0", port);
+        return HostAndPort.fromParts(address, port);
     }
 
     @Override
diff --git a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java b/src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java
deleted file mode 100644
index 4779585..0000000
--- a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package de.redstonecloud.bridge.platform.allay;
-
-import com.google.common.net.HostAndPort;
-import de.redstonecloud.api.components.ICloudPlayer;
-import de.redstonecloud.bridge.cloudinterface.components.BridgeExecutor;
-import de.redstonecloud.bridge.cloudinterface.components.BridgeServer;
-import org.allaymc.api.entity.interfaces.EntityPlayer;
-import org.allaymc.api.scheduler.Task;
-import org.allaymc.api.scheduler.TaskCreator;
-import org.allaymc.api.server.Server;
-
-import java.util.Objects;
-import java.util.UUID;
-
-public class AllayExecutor implements BridgeExecutor {
-    private static Server server = Server.getInstance();
-
-    public EntityPlayer getPlayerByCloudPlayer(ICloudPlayer player) {
-        return server.getPlayerManager().getPlayers().get(player.getUUID());
-    }
-
-    public void sendMessage(ICloudPlayer cloudPlayer, String message) {
-        Objects.requireNonNull(getPlayerByCloudPlayer(cloudPlayer)).sendMessage(message);
-    }
-
-    @Override
-    public void sendTitle(ICloudPlayer cloudPlayer, String title) {
-        Objects.requireNonNull(getPlayerByCloudPlayer(cloudPlayer)).sendTitle(title);
-    }
-
-    @Override
-    public void kick(ICloudPlayer player) {
-        Objects.requireNonNull(getPlayerByCloudPlayer(player)).disconnect();
-    }
-
-    @Override
-    public void kick(ICloudPlayer player, String reason) {
-        Objects.requireNonNull(getPlayerByCloudPlayer(player)).disconnect(reason);
-    }
-
-    @Override
-    public void sendActionbar(ICloudPlayer player, String message) {
-        Objects.requireNonNull(getPlayerByCloudPlayer(player)).sendActionBar(message);
-    }
-
-    @Override
-    public void sendToast(ICloudPlayer player, String title, String message) {
-        Objects.requireNonNull(getPlayerByCloudPlayer(player)).sendToast(title, message);
-    }
-
-    @Override
-    public void runDelayed(Runnable code, int tickDelay) {
-        server.getScheduler().scheduleDelayed(Server.getInstance(), () -> {
-            code.run();
-            return true;
-        }, tickDelay);
-    }
-
-
-    public void addServer(String name, HostAndPort address) {}
-
-    public void removeServer(String name) {}
-
-    public boolean hasServer(String name) {
-        return false;
-    }
-
-    public BridgeServer determineServer(String serverName) {
-        return null;
-    }
-
-    public void connect(ICloudPlayer player, String name) {}
-}
diff --git a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java b/src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java
deleted file mode 100644
index 7d7f09b..0000000
--- a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package de.redstonecloud.bridge.platform.allay;
-
-import de.redstonecloud.bridge.cloudinterface.CloudInterface;
-import org.allaymc.api.entity.interfaces.EntityPlayer;
-import org.allaymc.api.eventbus.EventHandler;
-import org.allaymc.api.eventbus.event.player.PlayerLoginEvent;
-import org.allaymc.api.eventbus.event.player.PlayerQuitEvent;
-
-public class AllayListener {
-    @EventHandler
-    public void onLogin(PlayerLoginEvent ev) {
-        EntityPlayer player = ev.getPlayer();
-
-        CloudInterface.getInstance().playerLogin(player.getOriginName(), player.getLoginData().getUuid().toString(), player.getSocketAddress().toString());
-    }
-
-    @EventHandler
-    public void onDisconnect(PlayerQuitEvent ev) {
-        EntityPlayer player = ev.getPlayer();
-
-        CloudInterface.getInstance().playerDisconnect(player.getLoginData().getUuid().toString());
-    }
-}
diff --git a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayPlugin.java b/src/main/java/de/redstonecloud/bridge/platform/allay/AllayPlugin.java
deleted file mode 100644
index 20632a1..0000000
--- a/src/main/java/de/redstonecloud/bridge/platform/allay/AllayPlugin.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.redstonecloud.bridge.platform.allay;
-
-import de.redstonecloud.bridge.cloudinterface.CloudInterface;
-import org.allaymc.api.plugin.Plugin;
-import org.allaymc.api.server.Server;
-
-public class AllayPlugin extends Plugin {
-    public CloudInterface cloudInterface;
-
-    @Override
-    public void onLoad() {
-        cloudInterface = CloudInterface.getInstance();
-    }
-
-    @Override
-    public void onEnable() {
-        cloudInterface.start(new AllayExecutor());
-        Server.getInstance().getEventBus().registerListener(new AllayListener());
-    }
-
-    @Override
-    public void onDisable() {
-        cloudInterface.shutdown();
-    }
-}
\ No newline at end of file