diff --git a/Dockerfile b/Dockerfile
index c50b9a2e..71a6cad3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,7 @@ LABEL maintainer="Christian Goll <cgoll@suse.com>"
 
 COPY --from=builder /usr/bin/wwctl /usr/bin/wwctl
 COPY --from=builder /var/lib/warewulf /var/lib/warewulf
+COPY --from=builder /usr/share/warewulf /usr/share/warewulf
 COPY --from=builder /etc/warewulf /etc/warewulf
 COPY --from=builder /warewulf-src/container-scripts /container-scripts 
 
@@ -67,7 +68,7 @@ RUN zypper  -n install \
   container-scripts/wwctl \
   container-scripts/warewulf.service \
   container-scripts/warewulf-container-manage.sh \
-  container-scripts/config-warewul \
+  container-scripts/config-warewulf \
   /container &&\
   mkdir -p /usr/share/bash_completion/completions/ &&\
   cp /etc/warewulf/bash_completion.d/warewulf /usr/share/bash_completion/completions/wwctl &&\
diff --git a/container-scripts/config-warewulf b/container-scripts/config-warewulf
index c7074527..cd4dfbd5 100755
--- a/container-scripts/config-warewulf
+++ b/container-scripts/config-warewulf
@@ -70,4 +70,5 @@ fi
 # configure the services of the host by building the host overlay
 echo "-- Running wwctl --"
 wwctl overlay build
-wwctl configure tftp
+# enable tftp if systemd is running
+test -e /run/systemd/system && wwctl configure tftp
diff --git a/container-scripts/label-install b/container-scripts/label-install
index 063c00a0..35c99e33 100755
--- a/container-scripts/label-install
+++ b/container-scripts/label-install
@@ -13,7 +13,6 @@ CHROOTDIR=/var/lib/warewulf/chroots
 CONTAINERDIR=/var/lib/warewulf/container
 WAREWULFCONF=/etc/warewulf
 BASHCOMPLETION=/usr/share/bash_completion/completions/wwctl
-CONFSCRIPT=/container/config-warewulf
 
 echo "LABEL INSTALL"
 # ensure all scripts will be present on the host 
@@ -75,6 +74,3 @@ fi
 
 # containerdir
 mkdir -p /host/$CONTAINERDIR
-
-# now config the container
-$CONFSCRIPT