diff --git a/Dockerfile b/Dockerfile
index a1e806e0..40fa5e34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN cd /warewulf-src &&\
     SRVDIR=/var/lib \
     TFTPDIR=/srv/tftpboot \
     SYSTEMDDIR=/usr/lib/systemd/system \
-    BASHCOMPDIR=/etc/bash_completion.d/ \
+    BASHCOMPDIR=/etc/warewulf/bash_completion.d/ \
     FIREWALLDDIR=/usr/lib/firewalld/services \
     WWCLIENTDIR=/warewulf &&\
   make lint &&\ 
@@ -34,7 +34,12 @@ FROM opensuse/tumbleweed:latest
 LABEL Description="Warewulf Base Container"
 LABEL maintainer="Christian Goll <cgoll@suse.com>"
 
-RUN zypper  -n install --no-recommends \
+COPY --from=builder /usr/bin/wwctl /usr/bin/wwctl
+COPY --from=builder /var/lib/warewulf /var/lib/warewulf
+COPY --from=builder /etc/warewulf /etc/warewulf
+COPY --from=builder /warewulf-src/container-scripts /container-scripts 
+
+RUN zypper  -n install \
   cpio \
   gzip \
   pigz \
@@ -43,11 +48,8 @@ RUN zypper  -n install --no-recommends \
   less \
   dhcp-server \
   tftp \
-  go1.18 \
-  git \
   systemd \
   && \
-  zypper -n install -t pattern devel_basis && \
   zypper clean -a && \
   systemctl enable dhcpd && \
   systemctl enable tftp.socket &&\
@@ -65,70 +67,11 @@ RUN zypper  -n install --no-recommends \
   container-scripts/wwctl \
   container-scripts/warewulf.service \
   /container &&\
-  mkdir -p /usr/share/bash-completion/completions/ &&\
-  cp -v /etc/bash_completion.d/warewulf /usr/share/bash-completion/completions/wwctl &&\
+  mkdir -p /usr/share/bash_completion/completions/ &&\
+  cp /etc/warewulf/bash_completion.d/warewulf /usr/share/bash_completion/completions/wwctl &&\
   mv -v container-scripts/ww4-config.service /etc/systemd/system/ &&\
   systemctl enable ww4-config
 
-# now build the warewulf
-COPY . /warewulf-src
-
-RUN cd /warewulf-src &&\
-  make contclean &&\
-  make genconfig \
-    PREFIX=/usr \
-    BINDIRa=/usr/bin \
-    SYSCONFDIR=/etc \
-    DATADIR=/usr/share \
-    LOCALSTATEDIR=/var/lib \
-    SHAREDSTATEDIR=/var/lib \
-    MANDIR=/usr/share/man \
-    INFODIR=/usr/share/info \
-    DOCDIR=/usr/share/doc \
-    SRVDIR=/var/lib \
-    TFTPDIR=/srv/tftpboot \
-    SYSTEMDDIR=/usr/lib/systemd/system \
-    BASHCOMPDIR=/etc/bash_completion.d/ \
-    FIREWALLDDIR=/usr/lib/firewalld/services \
-    WWCLIENTDIR=/warewulf &&\
-  make lint &&\ 
-  make &&\
-  make install &&\
-  export DHCPDCONF=/etc/sysconfig/dhcpd; test -e $DHCPDCONF && \ 
-	sed -i 's/^DHCPD_INTERFACE=""/DHCPD_INTERFACE="ANY"/' $DHCPDCONF && \
-	sed -i 's/^DHCPD_RUN_CHROOTED="yes"/DHCPD_RUN_CHROOTED="no"/' $DHCPDCONF && \
-  WW4CONF=/etc/warewulf/warewulf.conf; test -e $WW4CONF && \
-  sed -i 's/^ipaddr:.*/ipaddr: EMPTY/' $WW4CONF && \
-  sed -i 's/^netmask:.*/netmask: EMPTY/' $WW4CONF && \
-  sed -i 's/^network:.*/network: EMPTY/' $WW4CONF && \
-  sed -i 's/^  range start:.*/  range start: EMPTY/' $WW4CONF && \
-  sed -i 's/^  range end:.*/  range end: EMPTY/' $WW4CONF && \
-  mkdir -p /container && \
-  cp -vr container-scripts/label-* \
-  container-scripts/wwctl \
-  container-scripts/warewulf.service \
-  /container &&\
-  mkdir -p /usr/share/bash-completion/completions/ &&\
-  cp -v /etc/bash_completion.d/warewulf /usr/share/bash-completion/completions/wwctl &&\
-  mv -v container-scripts/ww4-config.service /etc/systemd/system/ &&\
-  systemctl enable ww4-config
-
-
-
-
-CMD  [ "/usr/sbin/init" ]
-
-EXPOSE 67/udp 68/udp 69/udp 9873
-
-LABEL INSTALL="/usr/bin/docker run --env IMAGE=IMAGE --rm --privileged -v /:/host IMAGE /bin/bash /container/label-install"
-LABEL UNINSTALL="/usr/bin/docker run --rm --privileged -v /:/host IMAGE /bin/bash /container/label-uninstall"
-LABEL PURGE="/usr/bin/docker run -ti --rm --privileged -v /:/host IMAGE /bin/bash /container/label-purge"
-LABEL RUN="/usr/bin/docker run -d --replace --name \${NAME} --privileged --net=host -v /:/host -v /etc/warewulf:/etc/warewulf -v /var/lib/warewulf/:/var/lib/warewulf/ -e NAME=\${NAME} -e IMAGE=\${IMAGE} \${IMAGE}"
-
-
-
-
-
 CMD  [ "/usr/sbin/init" ]
 
 EXPOSE 67/udp 68/udp 69/udp 9873
diff --git a/Makefile b/Makefile
index c546eb87..55165968 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ else
 endif
 
 # OS-Specific Service Locations
-VARLIST += TFTPDIR FIREWALLDDIR SYSTEMDDIR
+VARLIST += TFTPDIR FIREWALLDDIR SYSTEMDDIR BASHCOMPDIR
 SYSTEMDDIR ?= /usr/lib/systemd/system
 BASHCOMPDIR ?= /etc/bash_completion.d
 FIREWALLDDIR ?= /usr/lib/firewalld/services