diff --git a/model/src/main/java/org/jboss/pnc/model/ProductVersion.java b/model/src/main/java/org/jboss/pnc/model/ProductVersion.java
index <HASH>..<HASH> 100644
--- a/model/src/main/java/org/jboss/pnc/model/ProductVersion.java
+++ b/model/src/main/java/org/jboss/pnc/model/ProductVersion.java
@@ -281,6 +281,10 @@ public class ProductVersion implements GenericEntity<Integer> {
                 buildConfigurationSet.setProductVersion(productVersion);
             }
             productVersion.setBuildConfigurationSets(buildConfigurationSets);
+
+            for (BuildConfiguration buildConfiguration : buildConfigurations) {
+                buildConfiguration.setProductVersion(productVersion);
+            }
             productVersion.setBuildConfigurations(buildConfigurations);
 
             for (ProductMilestone productMilestone : productMilestones) {
@@ -338,6 +342,16 @@ public class ProductVersion implements GenericEntity<Integer> {
             return this;
         }
 
+        public Builder buildConfigurationSet(Set<BuildConfiguration> buildConfigurationSet) {
+            this.buildConfigurations = buildConfigurationSet;
+            return this;
+        }
+
+        public Builder buildConfigurationSet(BuildConfiguration buildConfigurationSet) {
+            this.buildConfigurations.add(buildConfigurationSet);
+            return this;
+        }
+
         public Builder attributes(Map<String, String> attributes) {
             this.attributes = attributes;
             return this;
[NCL-<I>] fix PV.Builder to also update BuildConfiguration's side