diff --git a/assets/client-config.json b/assets/client-config.json
index 76e7637..7bfa1b1 100644
--- a/assets/client-config.json
+++ b/assets/client-config.json
@@ -1,5 +1,4 @@
 {
   "serverIP": "localhost",
-  "tcpPort": 9090,
-  "udpPort": 9091
+  "port": 9090
 }
diff --git a/core/src/main/java/io/github/eldek0/config/ClientConfig.java b/core/src/main/java/io/github/eldek0/config/ClientConfig.java
index 6e2066a..ddf05fe 100644
--- a/core/src/main/java/io/github/eldek0/config/ClientConfig.java
+++ b/core/src/main/java/io/github/eldek0/config/ClientConfig.java
@@ -2,6 +2,5 @@ package io.github.eldek0.config;
 
 public class ClientConfig {
     public String serverIP;
-    public int udpPort;
-    public int tcpPort;
+    public int port;
 }
diff --git a/core/src/main/java/io/github/eldek0/network/GameClient.java b/core/src/main/java/io/github/eldek0/network/GameClient.java
index 410f075..1ea84d2 100644
--- a/core/src/main/java/io/github/eldek0/network/GameClient.java
+++ b/core/src/main/java/io/github/eldek0/network/GameClient.java
@@ -17,8 +17,7 @@ public class GameClient {
     private final Client client;
     private final Map<Integer, NetworkPackets.PlayerState> players = new ConcurrentHashMap<>();
     private int myId = -1;
-    private int udpPort = Network.DEFAULT_UDP_PORT;
-    private int tcpPort = Network.DEFAULT_TCP_PORT;
+    private int port = Network.DEFAULT_PORT;
     private String serverIP;
 
     public GameClient() {
@@ -68,7 +67,7 @@ public class GameClient {
 
     public void connect(String name) throws IOException {
         client.start();
-        client.connect(5000, this.serverIP, this.tcpPort, this.udpPort);
+        client.connect(5000, this.serverIP, this.port, this.port);
 
         NetworkPackets.Login login = new NetworkPackets.Login();
         login.name = name;
@@ -106,8 +105,7 @@ public class GameClient {
         ClientConfig config = null;
         try {
             config = new Gson().fromJson(new FileReader("client-config.json"), ClientConfig.class);
-            this.udpPort = config.udpPort;
-            this.tcpPort = config.tcpPort;
+            this.port = config.port;
             this.serverIP = config.serverIP;
         } catch (FileNotFoundException e) {
             throw new RuntimeException(e);
diff --git a/core/src/main/java/io/github/eldek0/network/Network.java b/core/src/main/java/io/github/eldek0/network/Network.java
index 8a52881..56a0e02 100644
--- a/core/src/main/java/io/github/eldek0/network/Network.java
+++ b/core/src/main/java/io/github/eldek0/network/Network.java
@@ -5,8 +5,7 @@ import com.esotericsoftware.kryonet.EndPoint;
 import java.util.ArrayList;
 
 public class Network {
-    public static final int DEFAULT_TCP_PORT = 54555;
-    public static final int DEFAULT_UDP_PORT = 54777;
+    public static final int DEFAULT_PORT = 54555;
 
     public static void register(EndPoint endPoint) {
         Kryo kryo = endPoint.getKryo();
diff --git a/server/server-config.json b/server/server-config.json
index 7bbec53..a13d52b 100644
--- a/server/server-config.json
+++ b/server/server-config.json
@@ -1,4 +1,3 @@
 {
-  "tcpPort": 9090,
-  "udpPort": 9091
+  "port": 9090
 }
diff --git a/server/src/main/java/io/github/eldek0/GameServer.java b/server/src/main/java/io/github/eldek0/GameServer.java
index 5c47728..9b840a7 100644
--- a/server/src/main/java/io/github/eldek0/GameServer.java
+++ b/server/src/main/java/io/github/eldek0/GameServer.java
@@ -18,8 +18,7 @@ public class GameServer {
 
     private final Server server;
     private final Map<Integer, NetworkPackets.PlayerState> players = new ConcurrentHashMap<>();
-    private int udpPort = Network.DEFAULT_UDP_PORT;
-    private int tcpPort = Network.DEFAULT_TCP_PORT;
+    private int port = Network.DEFAULT_PORT;
 
     public GameServer() {
         server = new Server();
@@ -62,8 +61,7 @@ public class GameServer {
         ServerConfig config = null;
         try {
             config = new Gson().fromJson(new FileReader("server-config.json"), ServerConfig.class);
-            this.udpPort = config.udpPort;
-            this.tcpPort = config.tcpPort;
+            this.port = config.port;
         } catch (FileNotFoundException e) {
             throw new RuntimeException(e);
         }
@@ -112,7 +110,7 @@ public class GameServer {
 
     public void start() throws IOException {
         server.start();
-        server.bind(this.tcpPort, this.udpPort);
+        server.bind(this.port, this.port);
         System.out.println("Servidor iniciado.");
     }
 
diff --git a/server/src/main/java/io/github/eldek0/config/ServerConfig.java b/server/src/main/java/io/github/eldek0/config/ServerConfig.java
index 522c10c..9be4492 100644
--- a/server/src/main/java/io/github/eldek0/config/ServerConfig.java
+++ b/server/src/main/java/io/github/eldek0/config/ServerConfig.java
@@ -1,6 +1,5 @@
 package io.github.eldek0.config;
 
 public class ServerConfig {
-    public int tcpPort;
-    public int udpPort;
+    public int port;
 }