diff --git a/Containerfile b/Dockerfile
similarity index 100%
rename from Containerfile
rename to Dockerfile
diff --git a/_service b/_service
index a85734a..b85eb93 100644
--- a/_service
+++ b/_service
@@ -1,28 +1,32 @@
 <services>
-  <service name="obs_scm" mode="disabled">
+  <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
     <param name="url">https://github.com/openSUSE/samba-container.git</param>
     <param name="revision">master</param>
-    <param name="subdir">images/server</param>
-    <param name="extract">Containerfile</param>
-    <param name="extract">nsswitch.conf</param>
-    <param name="extract">smb.conf</param>
     <param name="changesgenerate">enable</param>
+    <param name="filename">samba-container</param>
+    <param name="exclude">.git</param>
   </service>
-  <service name="obs_scm" mode="disabled">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/openSUSE/samba-container.git</param>
-    <param name="revision">master</param>
-    <param name="extract">LICENSE</param>
+  <service name="extract_file" mode="disabled">
+    <param name="archive">*.tar</param>
+    <param name="files">*/images/server/Containerfile</param>
+    <param name="outfilename">Dockerfile</param>
+  </service>
+  <service name="extract_file" mode="disabled">
+    <param name="archive">*.tar</param>
+    <param name="files">*/images/server/nsswitch.conf
+                        */images/server/smb.conf
+                        */LICENSE
+    </param>
   </service>
   <service name="replace_using_package_version" mode="buildtime">
-      <param name="file">Containerfile</param>
+      <param name="file">Dockerfile</param>
       <param name="regex">%%PKG_VERSION%%</param>
       <param name="parse-version">patch</param>
       <param name="package">samba-server</param>
   </service>
   <service name="replace_using_package_version" mode="buildtime">
-      <param name="file">Containerfile</param>
+      <param name="file">Dockerfile</param>
       <param name="regex">%%MINOR%%</param>
       <param name="parse-version">minor</param>
       <param name="package">samba-server</param>
diff --git a/_servicedata b/_servicedata
index 212447d..4fe6546 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,4 @@
 <servicedata>
- <service name="tar_scm">
-  <param name="url">https://github.com/openSUSE/samba-container.git</param>
-  <param name="changesrevision">602a44991137144e1cda297069fdb961268ef499</param>
- </service>
-</servicedata>
\ No newline at end of file
+<service name="tar_scm">
+                <param name="url">https://github.com/openSUSE/samba-container.git</param>
+              <param name="changesrevision">602a44991137144e1cda297069fdb961268ef499</param></service></servicedata>
\ No newline at end of file