diff --git a/Containerfile b/Containerfile
deleted file mode 100644
index 7891e26..0000000
--- a/Containerfile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Defines the tag for OBS and build script builds:
-#!BuildTag: opensuse/samba-ad-server:latest
-#!BuildTag: opensuse/samba-ad-server:%%MINOR%%
-#!BuildTag: opensuse/samba-ad-server:%%PKG_VERSION%%
-#!BuildTag: opensuse/samba-ad-server:%%PKG_VERSION%%-%RELEASE%
-
-FROM opensuse/tumbleweed
-LABEL maintainer="David Mulder <dmulder@suse.com>"
-
-# labelprefix=org.opensuse.samba-ad-server
-LABEL org.opencontainers.image.title="Samba ADDC container"
-LABEL org.opencontainers.image.description="Samba ADDC container"
-LABEL org.opencontainers.image.created="%BUILDTIME%"
-LABEL org.opencontainers.image.version="%%PKG_VERSION%%-%RELEASE%"
-LABEL org.opencontainers.image.vendor="openSUSE Project"
-LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-ad-server:%%PKG_VERSION%%-%RELEASE%"
-# endlabelprefix
-
-RUN zypper --non-interactive install --no-recommends \
-  findutils \
-  python3-pip \
-  python3-jsonschema \
-  samba-python3 \
-  python3-pyxattr \
-  samba-ad-dc \
-  procps \
-  samba-client \
-  samba-winbind \
-  python3-dnspython \
-  krb5-server \
-  sambacc
-RUN ln -sf /usr/share/sambacc/examples/addc.json /etc/samba/container.json
-
-
-ENV SAMBACC_CONFIG="/etc/samba/container.json:/etc/samba/users.json"
-ENV SAMBA_CONTAINER_ID="demo"
-ENV SAMBA_SPECIFICS="$SAMBA_SPECIFICS"
-ENTRYPOINT ["samba-dc-container"]
-CMD ["run", "--setup=provision", "--setup=populate"]
-
-# vim:set syntax=dockerfile:
diff --git a/_service b/_service
index 2772e86..83ca8e1 100644
--- a/_service
+++ b/_service
@@ -1,26 +1,29 @@
 <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/ad-server</param>
-    <param name="extract">Containerfile</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/ad-server/Containerfile</param>
+    <param name="outfilename">Dockerfile</param>
+  </service>
+  <service name="extract_file" mode="disabled">
+    <param name="archive">*.tar</param>
+    <param name="files">*/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-ad-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-ad-server</param>
diff --git a/_servicedata b/_servicedata
index 212447d..cb18b42 100644
--- a/_servicedata
+++ b/_servicedata
@@ -3,4 +3,4 @@
   <param name="url">https://github.com/openSUSE/samba-container.git</param>
   <param name="changesrevision">602a44991137144e1cda297069fdb961268ef499</param>
  </service>
-</servicedata>
\ No newline at end of file
+</servicedata>