diff --git a/external/os-autoinst-common/.editorconfig b/external/os-autoinst-common/.editorconfig
new file mode 100644
index 00000000000..503c34cfdf9
--- /dev/null
+++ b/external/os-autoinst-common/.editorconfig
@@ -0,0 +1,12 @@
+[*]
+indent_style = space
+indent_size = 4
+binary_next_line = true
+switch_case_indent = true
+space_redirects = true
+
+[.bpan/**]
+ignore = true
+
+[*~]
+ignore = true
diff --git a/external/os-autoinst-common/.gitrepo b/external/os-autoinst-common/.gitrepo
index 6abd47a1e32..c651bbf36d8 100644
--- a/external/os-autoinst-common/.gitrepo
+++ b/external/os-autoinst-common/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:os-autoinst/os-autoinst-common.git
 	branch = master
-	commit = a94b58b23be8ddb5bf85a7b1f87914ba9e71b9e6
-	parent = 1e9bfef6f182ff6e30268174f6414bf48c35b89c
+	commit = fbd66e7f61d2397f55bc8b6143a405c8ed639008
+	parent = dc3c200d28283b7a117182b837546ce3f598e8f3
 	method = merge
 	cmdver = 0.4.6