diff --git a/Dockerfile b/Dockerfile
index 9d27384..cee6b85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,15 +4,18 @@
 #!BuildTag: opensuse/samba-ad-server:%%PKG_VERSION%%
 #!BuildTag: opensuse/samba-ad-server:%%PKG_VERSION%%-%RELEASE%
 
+# OBS doesn't allow a fully qualified image registry name for the offline build
 FROM opensuse/tumbleweed
-LABEL maintainer="David Mulder <dmulder@suse.com>"
+ARG SAMBA_SPECIFICS=
+
+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.opencontainers.image.vendor="Samba in Kubernetes"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.reference="registry.opensuse.org/opensuse/samba-ad-server:%%PKG_VERSION%%-%RELEASE%"
 # endlabelprefix
@@ -29,13 +32,15 @@ RUN zypper --non-interactive install --no-recommends \
   samba-winbind \
   python3-dnspython \
   krb5-server \
-  sambacc
+  sambacc && \
+  zypper clean;
 RUN ln -sf /usr/share/sambacc/examples/addc.json /etc/samba/container.json
+RUN rm -rf /etc/samba/smb.conf
 
 
 ENV SAMBACC_CONFIG="/etc/samba/container.json:/etc/samba/users.json"
 ENV SAMBA_CONTAINER_ID="demo"
-ENV SAMBA_SPECIFICS="daemon_cli_debug_output"
+ENV SAMBA_SPECIFICS="$SAMBA_SPECIFICS"
 ENTRYPOINT ["samba-dc-container"]
 CMD ["run", "--setup=provision", "--setup=populate"]
 
diff --git a/_service b/_service
index de651e9..5d5348e 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
-    <param name="url">https://github.com/openSUSE/samba-container.git</param>
+    <param name="url">https://github.com/samba-in-kubernetes/samba-container.git</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">samba-container</param>
@@ -9,7 +9,7 @@
   </service>
   <service name="extract_file" mode="disabled">
     <param name="archive">*.tar</param>
-    <param name="files">*/images/ad-server/Containerfile</param>
+    <param name="files">*/images/ad-server/Containerfile.opensuse</param>
     <param name="outfilename">Dockerfile</param>
   </service>
   <service name="extract_file" mode="disabled">
diff --git a/_servicedata b/_servicedata
index 500d2af..94eadfc 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,10 @@
 <servicedata>
- <service name="tar_scm">
-  <param name="url">https://github.com/openSUSE/samba-container.git</param>
-  <param name="changesrevision">924c983f879afa0ecc8daed3af737f660b84052c</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">924c983f879afa0ecc8daed3af737f660b84052c</param>
+  </service>
+  <service name="tar_scm">
+    <param name="url">https://github.com/samba-in-kubernetes/samba-container.git</param>
+    <param name="changesrevision">94e313043630982eee3d2e63b37038c487f4290b</param>
+  </service>
+</servicedata>
diff --git a/samba-ad-server.changes b/samba-ad-server.changes
index 21c82b0..a025c87 100644
--- a/samba-ad-server.changes
+++ b/samba-ad-server.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Feb 10 16:42:04 UTC 2023 - dmulder@suse.com
+
+- Update to version 1675868083.94e3130:
+  * toolbox: Add openSUSE specific Containerfile
+  * toolbox: Make Containerfile Fedora specific
+  * client: Add openSUSE specific Containerfile
+  * client: Make Containerfile Fedora specific
+  * ad-server: Add openSUSE specific Containerfile
+  * ad-server: Make Containerfile Fedora specific
+  * server: Add openSUSE specific Containerfile
+  * server: Make Containerfile Fedora specific
+  * github: fix minor "spelling" mistake in mergify rules
+  * workflows: Share samba-client image for building toolbox
+
 -------------------------------------------------------------------
 Tue Jan 31 15:32:40 UTC 2023 - dmulder@suse.com