diff --git a/pkg/apis/rabbitmq/v1/rabbitmq_types.go b/pkg/apis/rabbitmq/v1/rabbitmq_types.go
index 8ea1060..15e5d97 100644
--- a/pkg/apis/rabbitmq/v1/rabbitmq_types.go
+++ b/pkg/apis/rabbitmq/v1/rabbitmq_types.go
@@ -76,6 +76,9 @@ type RabbitmqSpec struct {
 	// working now, but will be ignored in future versions
 	RabbitmqMemoryHighWatermark string `json:"memory_high_watermark,omitempty"`
 
+	// set disk_free_limit.absolute value
+	RabbitmqDiskFreeLimit string `json:"disk_free_limit,omitempty"`
+
 	// Hipe
 	RabbitmqHipeCompile bool `json:"hipe_compile,omitempty"`
 
diff --git a/pkg/apis/rabbitmq/v1/zz_generated.deepcopy.go b/pkg/apis/rabbitmq/v1/zz_generated.deepcopy.go
index 0c8594f..37c6261 100644
--- a/pkg/apis/rabbitmq/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/rabbitmq/v1/zz_generated.deepcopy.go
@@ -163,6 +163,11 @@ func (in *RabbitmqSpec) DeepCopyInto(out *RabbitmqSpec) {
 	in.RabbitmqPdb.DeepCopyInto(&out.RabbitmqPdb)
 	out.RabbitmqSSL = in.RabbitmqSSL
 	in.RabbitmqAuth.DeepCopyInto(&out.RabbitmqAuth)
+	if in.RabbitmqStorageClass != nil {
+		in, out := &in.RabbitmqStorageClass, &out.RabbitmqStorageClass
+		*out = new(string)
+		**out = **in
+	}
 	if in.RabbitmqPolicies != nil {
 		in, out := &in.RabbitmqPolicies, &out.RabbitmqPolicies
 		*out = make([]RabbitmqPolicy, len(*in))
diff --git a/pkg/controller/rabbitmq/rabbitmq_configmaps.go b/pkg/controller/rabbitmq/rabbitmq_configmaps.go
index d3751d9..d6a15ae 100644
--- a/pkg/controller/rabbitmq/rabbitmq_configmaps.go
+++ b/pkg/controller/rabbitmq/rabbitmq_configmaps.go
@@ -36,6 +36,7 @@ cluster_partition_handling = {{ .Spec.RabbitmqClusterPartitionHandling | default
 loopback_users.guest = false
 hipe_compile = {{ .Spec.RabbitmqHipeCompile | default "false" }}
 vm_memory_high_watermark.absolute = {{ .Spec.RabbitmqMemoryHighWatermark }}
+disk_free_limit.absolute = {{ .Spec.RabbitmqDiskFreeLimit }}
 `
 
 const defaultRabbitmqPlugins = `[