diff --git a/server/src/kafka.rs b/server/src/kafka.rs
index 1396e58..7c5e9c9 100644
--- a/server/src/kafka.rs
+++ b/server/src/kafka.rs
@@ -1,5 +1,8 @@
 use std::process::ExitStatus;
+use std::str::FromStr;
 use std::time::Duration;
+use hyper::{Client, Uri};
+use serde::{Deserialize};
 use kafka::client::KafkaClient;
 use kafka::client::metadata::Topic;
 use tokio::process::Command;
@@ -93,30 +96,47 @@ impl KafkaEventReaderImpl {
 }
 
 #[derive(Debug)]
-pub struct KafkaTopicManager {}
+pub struct KafkaTopicManager {
+    partition_management_endpoint: String
+}
 impl KafkaTopicManager {
+
+    pub fn default() -> KafkaTopicManager {
+        KafkaTopicManager {partition_management_endpoint: "kafka:7243/add_partition".to_owned()}
+    }
+
     pub async fn add_partition(&self) -> Result<u32, String> {
-        let topics = vec!["move", "status", "input"];
-        let mut client = KafkaClient::new(vec!["localhost:9092".to_owned()]);
-        client.load_metadata_all().unwrap();
-        let topic_metas: Vec<Topic> = client.topics().into_iter().filter(|t| topics.contains(&t.name())).collect();
-        if topic_metas.len() != 3 {
-            return Err(format!("Can't add_partition, unable to find matching topics: {:?}", topics));
+        let mut client = Client::new();
+        let res = client.get(Uri::from_str(&self.partition_management_endpoint).unwrap()).await;
+        if let Err(e) = res {
+            let error = format!("Failed to add partition: {:?}", e);
+            println!("{}", error);
+            return Err(error);
         }
-        let max_partition_count = topic_metas.into_iter().map(|t| t.partitions().len()).max().unwrap();
-        let next_partition = max_partition_count + 1;
-        println!("Will create next partition: {}", next_partition);
-        // TODO: What if creating one of the partitions fails?
-        for topic in topics {
-            let output = Command::new("/bin/bash").arg(format!("-c bin/kafka-topics.sh --bootstrap-server localhost:9092 --alter --topic {} --partitions {}", topic, next_partition)).output().await;
-            if let Err(e) = output {
-                return Err(format!("{}", e))
-            }
-            let output = output.unwrap();
-            if !output.status.success() {
-                return Err(format!("{:?}", std::str::from_utf8(&*output.stderr)))
-            }
+        let bytes = hyper::body::to_bytes(res.unwrap()).await;
+        if let Err(e) = bytes {
+            let error = format!("Failed to read bytes from response: {:?}", e);
+            println!("{}", error);
+            return Err(error);
         }
-        Ok(next_partition as u32)
+        let bytes = bytes.unwrap().to_vec();
+        let res_str = std::str::from_utf8(&*bytes);
+        if let Err(e) = res_str {
+            let error = format!("Failed to deserialize bytes to string: {:?}", e);
+            println!("{}", error);
+            return Err(error);
+        }
+        let json = serde_json::from_str::<PartitionApiDTO>(res_str.unwrap());
+        if let Err(e) = json {
+            let error = format!("Failed to convert string to json: {:?}", e);
+            println!("{}", error);
+            return Err(error);
+        }
+        Ok(json.unwrap().data)
     }
 }
+
+#[derive(Deserialize)]
+struct PartitionApiDTO {
+    data: u32
+}
diff --git a/server/src/main.rs b/server/src/main.rs
index 748c02e..491e497 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,3 +1,5 @@
+extern crate core;
+
 use crate::http::HttpServer;
 
 pub mod http;
diff --git a/server/src/session.rs b/server/src/session.rs
index 9bae57c..38e8b1f 100644
--- a/server/src/session.rs
+++ b/server/src/session.rs
@@ -12,7 +12,7 @@ impl SessionManager {
     pub fn new() -> SessionManager {
         SessionManager {
             sessions: vec![],
-            topic_manager: KafkaTopicManager {}
+            topic_manager: KafkaTopicManager::default()
         }
     }