diff --git a/projects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.jar b/projects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..943f0cbfa7
Binary files /dev/null and b/projects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/projects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.properties b/projects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..05679dc3c1
--- /dev/null
+++ b/projects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudAsyncIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudAsyncIT.java
index 29d094e6ca..7a9da9e7cc 100644
--- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudAsyncIT.java
+++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudAsyncIT.java
@@ -61,8 +61,8 @@ private void checkDeployment() throws Exception {
     Assertions.assertFalse(jobDeployment.getEnabled());
     Assertions.assertEquals(1000, jobDeployment.getResources().getMemoryLimit());
     Assertions.assertEquals(500, jobDeployment.getResources().getMemoryRequest());
-    Assertions.assertEquals(2000, jobDeployment.getResources().getCpuLimit());
-    Assertions.assertEquals(1000, jobDeployment.getResources().getCpuRequest());
+    Assertions.assertEquals(2, jobDeployment.getResources().getCpuLimit());
+    Assertions.assertEquals(1, jobDeployment.getResources().getCpuRequest());
     Assertions.assertNotNull(jobDeployment.getJobVersion());
     Assertions.assertNotNull(jobDeployment.getContacts());
   }
diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java
index e0fa81b3ee..b418085108 100644
--- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java
+++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java
@@ -457,7 +457,7 @@ private void setDefaultCpuRequestIfNeeded(DataJobDeploymentResources resources)
     try {
       if (resources.getCpuRequestCores() == null) {
         String cpu = defaultConfigurations.dataJobRequests().getCpu();
-        resources.setCpuRequestCores(K8SMemoryConversionUtils.getCpuInFloat(cpu));
+        resources.setCpuRequestCores(K8SMemoryConversionUtils.getCpuInCores(cpu));
       }
     } catch (ParseException e) {
       handleResourcesException(e);
@@ -468,7 +468,7 @@ private void setDefaultCpuLimitIfNeeded(DataJobDeploymentResources resources) {
     try {
       if (resources.getCpuLimitCores() == null) {
         String cpu = defaultConfigurations.dataJobLimits().getCpu();
-        resources.setCpuLimitCores(K8SMemoryConversionUtils.getCpuInFloat(cpu));
+        resources.setCpuLimitCores(K8SMemoryConversionUtils.getCpuInCores(cpu));
       }
     } catch (ParseException e) {
       handleResourcesException(e);
diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/K8SMemoryConversionUtils.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/K8SMemoryConversionUtils.java
index 1b890d8808..bc6a162e4d 100644
--- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/K8SMemoryConversionUtils.java
+++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/K8SMemoryConversionUtils.java
@@ -37,7 +37,13 @@ public static int getMemoryInMi(String memory) throws ParseException {
     return getMemoryInMi(memoryAmount, memory);
   }
 
-  public static float getCpuInFloat(String cpu) throws ParseException {
-    return NumberFormat.getInstance().parse(cpu).floatValue();
+  public static float getCpuInCores(String cpu) throws ParseException {
+    float value = NumberFormat.getInstance().parse(cpu).floatValue();
+
+    if (cpu != null && cpu.endsWith("m")) {
+      value = value / 1000;
+    }
+
+    return value;
   }
 }
diff --git a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/deploy/DataJobDefaultConfigurationsTest.java b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/deploy/DataJobDefaultConfigurationsTest.java
index 95e775d91e..9a95ab2d24 100644
--- a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/deploy/DataJobDefaultConfigurationsTest.java
+++ b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/deploy/DataJobDefaultConfigurationsTest.java
@@ -11,6 +11,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.text.ParseException;
+
 @SpringBootTest(classes = ControlplaneApplication.class)
 public class DataJobDefaultConfigurationsTest {
 
@@ -35,16 +37,16 @@ public void testDefaultMemoryLimit() throws Exception {
   @Test
   public void testDefaultCpuRequest() throws Exception {
     Assertions.assertEquals(
-        1000,
-        K8SMemoryConversionUtils.getCpuInFloat(
+        1,
+        K8SMemoryConversionUtils.getCpuInCores(
             dataJobDefaultConfigurations.dataJobRequests().getCpu()));
   }
 
   @Test
   public void testDefaultCpuLimit() throws Exception {
     Assertions.assertEquals(
-        2000,
-        K8SMemoryConversionUtils.getCpuInFloat(
+        2,
+        K8SMemoryConversionUtils.getCpuInCores(
             dataJobDefaultConfigurations.dataJobLimits().getCpu()));
   }
 
@@ -77,4 +79,14 @@ public void testTbConversion() {
   public void testTiConversion() {
     Assertions.assertEquals(2097152, K8SMemoryConversionUtils.getMemoryInMi(2, "Ti"));
   }
+
+  @Test
+  public void testCpuMilicoresConversion() throws ParseException {
+    Assertions.assertEquals(1, K8SMemoryConversionUtils.getCpuInCores("1000m"));
+  }
+
+  @Test
+  public void testCpuCoresConversion() throws ParseException {
+    Assertions.assertEquals(1, K8SMemoryConversionUtils.getCpuInCores("1"));
+  }
 }