diff --git a/CHANGELOG.md b/CHANGELOG.md
index 693f8748057..64804b2ba9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * Fix #2537: Checking for Readiness of DeploymentConfig
 * Fix #2300: Remove job extensions/v1beta1 from backward compatibiliy interceptor
 * Fix #2514: SharedIndexInformer watches only pods of its own namespace when run in the cluster
+* Fix #2596: Add buildable references for Container, Port and Volume
 
 #### Improvements
 * Fix #2507: Add a test for creating a Job with generateName
diff --git a/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java b/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java
index 14cf15b4f03..75c6acd84cf 100755
--- a/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java
+++ b/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java
@@ -58,8 +58,11 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
         .param("generateBuilderPackage", false)
         .param("builderPackage", "io.fabric8.kubernetes.api.builder");
 
-      buildable.paramArray("refs").annotate(BuildableReference.class)
-        .param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.ObjectMeta"));
+      buildable.paramArray("refs")
+        .annotate(BuildableReference.class).param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.ObjectMeta"))
+        .annotate(BuildableReference.class).param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.Container"))
+        .annotate(BuildableReference.class).param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.Port"))
+        .annotate(BuildableReference.class).param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.Volume"));
 
       if (isCRD(clazz, propertiesNode) || isCRDList(clazz, propertiesNode)) { // add CRD-specific annotations
         String apiVersion = getApiVersion(propertiesNode);