diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
index a5cad5543..bd6dd49c1 100644
--- a/package/yast2-installation.changes
+++ b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 29 09:25:58 UTC 2022 - Martin Vidner <mvidner@suse.com>
+
+- AutoYaST: move custom file creation past user creation so that
+  the element files/file/file_owner actually has an effect
+  (bsc#1196595)
+- 4.3.51
+
 -------------------------------------------------------------------
 Fri Mar 18 11:20:47 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
 
diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
index dd5b215af..76a1e5611 100644
--- a/package/yast2-installation.spec
+++ b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.3.50
+Version:        4.3.51
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only
diff --git a/src/lib/installation/clients/inst_finish.rb b/src/lib/installation/clients/inst_finish.rb
index 1d8c7d3cf..4046ce323 100644
--- a/src/lib/installation/clients/inst_finish.rb
+++ b/src/lib/installation/clients/inst_finish.rb
@@ -342,7 +342,6 @@ def copy_files_steps
         "ldconfig",
         "save_config",
         "live_save_config",
-        "autoinst_files",
         "default_target",
         "desktop",
         "storage",
@@ -382,6 +381,7 @@ def save_config_steps
         "remote",
         "save_hw_status",
         "users",
+        "autoinst_files",
         "autoinst_scripts2",
         "installation_settings",
         "roles",