diff --git a/client/Containerfile b/client/Containerfile
index fe2d3aa..8a85f77 100644
--- a/client/Containerfile
+++ b/client/Containerfile
@@ -5,7 +5,7 @@ ARG AMANDA_VERSION=tag-community-3.5.4
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \ 
                         flex perl libperl-dev libglib2.0-dev swig \
-                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl
+                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl procps
 WORKDIR /src
 
 RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive
@@ -21,7 +21,7 @@ FROM debian:stable-slim
 
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \ 
-                        libxslt1.1 libxml-simple-perl libjson-perl openbsd-inetd
+                        libxslt1.1 libxml-simple-perl libjson-perl openbsd-inetd procps
 
 RUN apt-get -qy install tini
 
diff --git a/server/Containerfile b/server/Containerfile
index 10ff916..56fed43 100644
--- a/server/Containerfile
+++ b/server/Containerfile
@@ -5,14 +5,13 @@ ARG AMANDA_VERSION=tag-community-3.5.4
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \ 
                         flex perl libperl-dev libglib2.0-dev swig \
-                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl
+                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl procps
 
 
 WORKDIR /src
 
 RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive
 
-
 RUN cd amanda && ./autogen
 RUN cd amanda && ./configure --without-client --without-bsd-security --with-ssl-security --with-ssh-security --with-readline --with-ipv6 --with-user=backup --with-group=backup
 RUN cd amanda && make
@@ -22,10 +21,15 @@ FROM debian:stable-slim
 
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \ 
-                        libxslt1.1 libxml-simple-perl libjson-perl
+                        libxslt1.1 libxml-simple-perl libjson-perl procps
 
 COPY --from=builder /usr/local/ /usr/local/
 
+RUN mkdir /usr/local/etc/amanda/ssl
+RUN mkdir /usr/local/etc/amanda/Backup/
+COPY conf/amanda.conf /usr/local/etc/amanda/Backup
+RUN chown backup:backup /usr/local/etc/amanda
+
 ENV LD_LIBRARY_PATH /usr/local/share/perl5/site_perl/auto/Amanda/Debug/
 
 USER backup