diff --git a/build.gradle b/build.gradle
index de245bda3..2850504a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,14 +37,21 @@ buildscript {
 ext.versions = [
         archaiusVersion: "latest.release",
         avroVersion : "1.10.2",
+        cliParserVersion : '1.1.1',
+        configMagicVersion : '0.11',
+        curatorVersion : '2.12.+',
         flink    : "1.14.2",
         gsonVersion : "2.8.+",
         hadoop   : "2.7.7",
+        hdrHistogramVersion : '2.+',
         icebergVersion : "0.14.+",
         jctoolsVersion : "1.+",
+        jodaTimeVersion : '2.+',
+        jsonVersion : '20180813',
         junit4   : "4.11",
         junit5   : "5.4.+",
         kafkaVersion : "2.2.+",
+        mesosVersion : '1.7.2',
         mockito  : "2.0.+",
         mockito3 : "3.+",
         nettyVersion : "4.1.34.Final",
@@ -52,6 +59,7 @@ ext.versions = [
         snappyVersion : "1.1.+",
         spectator: "1.3.+",
         slf4j    : "1.7.0",
+        testngVersion : '6.14.+',
         vavr     : "0.9.2",
 ]
 
@@ -62,6 +70,8 @@ ext.libraries = [
         avro           : "org.apache.avro:avro:${versions.avroVersion}",
         commonsIo      : "commons-io:commons-io:2.11.0",
         commonsLang3   : 'org.apache.commons:commons-lang3:3.5',
+        configMagic    : "org.skife.config:config-magic:${versions.configMagicVersion}",
+        cliParser      : "com.github.spullara.cli-parser:cli-parser:${versions.cliParserVersion}",
         flinkCore      : "org.apache.flink:flink-core:${versions.flink}",
         flinkRpcApi    : [
                 "org.apache.flink:flink-rpc-core:${versions.flink}",
@@ -77,12 +87,15 @@ ext.libraries = [
         hadoopCommon   : "org.apache.hadoop:hadoop-common:${versions.hadoop}",
         hadoopS3       : "org.apache.hadoop:hadoop-aws:${versions.hadoop}",
         hamcrest       : "org.hamcrest:hamcrest-core:1.3",
+        hdrHistogram   : "org.hdrhistogram:HdrHistogram:${versions.hdrHistogramVersion}",
         icebergApi     : "org.apache.iceberg:iceberg-api:${versions.icebergVersion}",
         icebergCore    : "org.apache.iceberg:iceberg-core:${versions.icebergVersion}",
         icebergData    : "org.apache.iceberg:iceberg-data:${versions.icebergVersion}",
         icebergParquet : "org.apache.iceberg:iceberg-parquet:${versions.icebergVersion}", 
         jcip           : "net.jcip:jcip-annotations:1.0",
         jctools        : "org.jctools:jctools-core:${versions.jctoolsVersion}",
+        jodaTime       : "joda-time:joda-time:${versions.jodaTimeVersion}",
+        json           : "org.json:json:${versions.jsonVersion}",
         junitJupiter   : [
                 "org.junit.jupiter:junit-jupiter-api:${versions.junit5}",
                 "org.junit.jupiter:junit-jupiter-engine:${versions.junit5}",
@@ -90,6 +103,7 @@ ext.libraries = [
         ],
         kafkaClients   : "org.apache.kafka:kafka-clients:${versions.kafkaVersion}",
         mantisShaded   : "io.mantisrx:mantis-shaded:2.0.2",
+        mesos          : "org.apache.mesos:mesos:${versions.mesosVersion}",
         mockitoAll     : "org.mockito:mockito-all:${versions.mockito}",
         mockitoCore    : "org.mockito:mockito-core:${versions.mockito}",
         mockitoCore3   : "org.mockito:mockito-core:${versions.mockito3}",
@@ -189,4 +203,4 @@ subprojects {
     }
 }
 
-apply from: file('baseline.gradle')
+apply from: file('baseline.gradle')
\ No newline at end of file
diff --git a/mantis-control-plane/mantis-control-plane-core/build.gradle b/mantis-control-plane/mantis-control-plane-core/build.gradle
index be4274b21..0ef73211b 100644
--- a/mantis-control-plane/mantis-control-plane-core/build.gradle
+++ b/mantis-control-plane/mantis-control-plane-core/build.gradle
@@ -15,34 +15,23 @@
  */
 apply plugin: 'java-test-fixtures'
 
-ext {
-
-    cliParserVersion = '1.1.1'
-    configMagicVersion = '0.11'
-    curatorVersion = '2.11.0'
-    hdrHistogramVersion = '2.+'
-    jodaTimeVersion = '2.+'
-    jsonVersion = '20180813'
-    mesosVersion = '1.7.2'
-    testngVersion = '6.14.+'
-}
 
 dependencies {
 
     api project(":mantis-common")
 
-    api "org.skife.config:config-magic:$configMagicVersion"
+    api libraries.configMagic
     api libraries.flinkRpcApi
     api libraries.flinkRpcImpl
     api libraries.flinkCore
 
-    api "org.apache.mesos:mesos:$mesosVersion"
-    api "org.json:json:$jsonVersion"
-    api "org.hdrhistogram:HdrHistogram:$hdrHistogramVersion"
-    api "com.github.spullara.cli-parser:cli-parser:$cliParserVersion"
-    api "joda-time:joda-time:$jodaTimeVersion"
+    api libraries.mesos
+    api libraries.json
+    api libraries.hdrHistogram
+    api libraries.cliParser
+    api libraries.jodaTime
 
 
     testImplementation libraries.junit4
     testImplementation libraries.mockitoAll
-}
+}
\ No newline at end of file