diff --git a/kie-config-cli/src/main/java/org/kie/config/cli/command/impl/CreateOrganizationalUnitCliCommand.java b/kie-config-cli/src/main/java/org/kie/config/cli/command/impl/CreateOrganizationalUnitCliCommand.java
index afa3d53c3a..8da1002808 100644
--- a/kie-config-cli/src/main/java/org/kie/config/cli/command/impl/CreateOrganizationalUnitCliCommand.java
+++ b/kie-config-cli/src/main/java/org/kie/config/cli/command/impl/CreateOrganizationalUnitCliCommand.java
@@ -49,6 +49,9 @@ public String execute( CliContext context ) {
         System.out.print( ">>Organizational Unit owner:" );
         String owner = input.nextLine();
 
+        System.out.print( ">>Default Group Id for this Organizational Unit:" );
+        String defaultGroupId = input.nextLine();
+
         System.out.print( ">>Repositories (comma separated list):" );
         String repos = input.nextLine();
         Collection<Repository> repositories = new ArrayList<Repository>();
@@ -64,7 +67,7 @@ public String execute( CliContext context ) {
             }
         }
 
-        OrganizationalUnit organizationalUnit = organizationalUnitService.createOrganizationalUnit( name, owner, repositories );
+        OrganizationalUnit organizationalUnit = organizationalUnitService.createOrganizationalUnit( name, owner, defaultGroupId, repositories );
         result.append( "Organizational Unit " + organizationalUnit.getName() + " successfully created" );
         return result.toString();
     }
diff --git a/kie-drools-wb/kie-drools-wb-webapp/src/main/java/org/kie/workbench/drools/backend/server/AppSetup.java b/kie-drools-wb/kie-drools-wb-webapp/src/main/java/org/kie/workbench/drools/backend/server/AppSetup.java
index 6d75103ebd..40a90e29b1 100644
--- a/kie-drools-wb/kie-drools-wb-webapp/src/main/java/org/kie/workbench/drools/backend/server/AppSetup.java
+++ b/kie-drools-wb/kie-drools-wb-webapp/src/main/java/org/kie/workbench/drools/backend/server/AppSetup.java
@@ -203,6 +203,7 @@ private void loadExampleRepositories( final String exampleRepositoriesRoot ) {
                 final List<Repository> repositories = new ArrayList<Repository>();
                 organizationalUnit = organizationalUnitService.createOrganizationalUnit( OU_NAME,
                                                                                          OU_OWNER,
+                                                                                         null,
                                                                                          repositories );
                 logger.info( "Created Organizational Unit '" + OU_NAME + "'." );
 
@@ -335,6 +336,7 @@ private OrganizationalUnit createOU( Repository repository,
             repositories.add( repository );
             organizationalUnitService.createOrganizationalUnit( ouName,
                                                                 ouOwner,
+                                                                null,
                                                                 repositories );
         }
         return ou;
diff --git a/kie-wb-smoke-tests/src/test/java/org/kie/smoke/wb/util/RestRepositoryDeploymentUtil.java b/kie-wb-smoke-tests/src/test/java/org/kie/smoke/wb/util/RestRepositoryDeploymentUtil.java
index cde1f4099b..468073144f 100644
--- a/kie-wb-smoke-tests/src/test/java/org/kie/smoke/wb/util/RestRepositoryDeploymentUtil.java
+++ b/kie-wb-smoke-tests/src/test/java/org/kie/smoke/wb/util/RestRepositoryDeploymentUtil.java
@@ -63,7 +63,7 @@ public void createAndDeployRepository(String repoUrl, String repositoryName, Str
         }
 
         JobRequest createRepoJob = createRepository(repositoryName, repoUrl);
-        JobRequest createOrgUnitJob = createOrganizationalUnit(orgUnit, user, repositoryName);
+        JobRequest createOrgUnitJob = createOrganizationalUnit(orgUnit, user, orgUnit, repositoryName);
         waitForJobsToFinish(sleepSecs, createRepoJob, createOrgUnitJob);
         
         JaxbDeploymentJobResult deployJob = createDeploymentUnit(deploymentId, strategy);
@@ -121,8 +121,9 @@ private JobRequest createRepository(String repositoryName, String cloneRepoUrl)
      * @param repositories The list of repositories that the org unit should own
      * @return A {@link JobRequest} instance returned by the request with the initial status of the request
      */
-    private JobRequest createOrganizationalUnit(String name, String owner, String... repositories) {
-        logger.info("Creating organizational unit '{}' owned by '{}' containing [{}]", name, owner, repositories);
+    private JobRequest createOrganizationalUnit(String name, String owner, String defaultGroupId, String... repositories) {
+        logger.info("Creating organizational unit '{}' owned by '{}' with default group id {}, containing [{}]",
+                        name, owner, defaultGroupId, repositories);
         OrganizationalUnit ou = new OrganizationalUnit();
         ou.setRepositories(new ArrayList<String>());
         for (int i = 0; repositories != null && i < repositories.length; ++i) {
@@ -130,6 +131,7 @@ private JobRequest createOrganizationalUnit(String name, String owner, String...
         }
         ou.setName(name);
         ou.setOwner(owner);
+        ou.setDefaultGroupId( defaultGroupId );
         String input = serializeToJsonString(ou);
         return post(createRequest("organizationalunits/", input), CreateOrganizationalUnitRequest.class);
     }
diff --git a/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/backend/AppSetup.java b/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/backend/AppSetup.java
index 959f0c21f2..3b4df2ff0f 100644
--- a/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/backend/AppSetup.java
+++ b/kie-wb/kie-wb-webapp/src/main/java/org/kie/workbench/backend/AppSetup.java
@@ -194,6 +194,7 @@ private void loadExampleRepositories( final String exampleRepositoriesRoot ) {
                 final List<Repository> repositories = new ArrayList<Repository>();
                 organizationalUnit = organizationalUnitService.createOrganizationalUnit( OU_NAME,
                                                                                          OU_OWNER,
+                                                                                         null,
                                                                                          repositories );
                 logger.info( "Created Organizational Unit '" + OU_NAME + "'." );