diff --git a/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go b/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go
index 732b41622..9d5764357 100644
--- a/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go
+++ b/builtin/providers/openstack/resource_openstack_fw_firewall_v1.go
@@ -92,7 +92,7 @@ func resourceFWFirewallV1Create(d *schema.ResourceData, meta interface{}) error
 
 	d.SetId(firewall.ID)
 
-	return nil
+	return resourceFWFirewallV1Read(d, meta)
 }
 
 func resourceFWFirewallV1Read(d *schema.ResourceData, meta interface{}) error {
@@ -183,7 +183,12 @@ func resourceFWFirewallV1Update(d *schema.ResourceData, meta interface{}) error
 
 	_, err = stateConf.WaitForState()
 
-	return firewalls.Update(networkingClient, d.Id(), opts).Err
+	err = firewalls.Update(networkingClient, d.Id(), opts).Err
+	if err != nil {
+		return err
+	}
+
+	return resourceFWFirewallV1Read(d, meta)
 }
 
 func resourceFWFirewallV1Delete(d *schema.ResourceData, meta interface{}) error {
diff --git a/builtin/providers/openstack/resource_openstack_fw_policy_v1.go b/builtin/providers/openstack/resource_openstack_fw_policy_v1.go
index 7837e5a43..815059752 100644
--- a/builtin/providers/openstack/resource_openstack_fw_policy_v1.go
+++ b/builtin/providers/openstack/resource_openstack_fw_policy_v1.go
@@ -104,7 +104,7 @@ func resourceFWPolicyV1Create(d *schema.ResourceData, meta interface{}) error {
 
 	d.SetId(policy.ID)
 
-	return nil
+	return resourceFWPolicyV1Read(d, meta)
 }
 
 func resourceFWPolicyV1Read(d *schema.ResourceData, meta interface{}) error {
@@ -188,7 +188,12 @@ func resourceFWPolicyV1Update(d *schema.ResourceData, meta interface{}) error {
 
 	log.Printf("[DEBUG] Updating firewall policy with id %s: %#v", d.Id(), opts)
 
-	return policies.Update(networkingClient, d.Id(), opts).Err
+	err = policies.Update(networkingClient, d.Id(), opts).Err
+	if err != nil {
+		return err
+	}
+
+	return resourceFWPolicyV1Read(d, meta)
 }
 
 func resourceFWPolicyV1Delete(d *schema.ResourceData, meta interface{}) error {
diff --git a/builtin/providers/openstack/resource_openstack_fw_rule_v1.go b/builtin/providers/openstack/resource_openstack_fw_rule_v1.go
index 607d02b21..f4dbb2fc7 100644
--- a/builtin/providers/openstack/resource_openstack_fw_rule_v1.go
+++ b/builtin/providers/openstack/resource_openstack_fw_rule_v1.go
@@ -110,7 +110,7 @@ func resourceFWRuleV1Create(d *schema.ResourceData, meta interface{}) error {
 
 	d.SetId(rule.ID)
 
-	return nil
+	return resourceFWRuleV1Read(d, meta)
 }
 
 func resourceFWRuleV1Read(d *schema.ResourceData, meta interface{}) error {
@@ -229,7 +229,12 @@ func resourceFWRuleV1Update(d *schema.ResourceData, meta interface{}) error {
 
 	log.Printf("[DEBUG] Updating firewall rules: %#v", opts)
 
-	return rules.Update(networkingClient, d.Id(), opts).Err
+	err = rules.Update(networkingClient, d.Id(), opts).Err
+	if err != nil {
+		return err
+	}
+
+	return resourceFWRuleV1Read(d, meta)
 }
 
 func resourceFWRuleV1Delete(d *schema.ResourceData, meta interface{}) error {