diff --git a/03-guam/Dockerfile b/03-guam/Dockerfile
index cf57806..e2cefaa 100644
--- a/03-guam/Dockerfile
+++ b/03-guam/Dockerfile
@@ -1,16 +1,14 @@
 FROM kolab/base:latest
 
 RUN yum -y install guam && \
     yum clean all
 
 ADD /entrypoint.sh /entrypoint.sh
 RUN chmod a+x /entrypoint.sh
 
-ADD /sys.config /etc/guam/sys.config
-
 EXPOSE 143 993
 
 CMD [ \
         "/usr/sbin/guam", \
         "foreground" \
     ]
diff --git a/03-guam/entrypoint.sh b/03-guam/entrypoint.sh
index ebac8a8..ca740db 100755
--- a/03-guam/entrypoint.sh
+++ b/03-guam/entrypoint.sh
@@ -1,19 +1,21 @@
 #!/bin/bash
 
 . /functions.sh
 
 check_var \
     KOLAB_IMAPF_EXT_SERVICE_HOST \
     || exit 1
 
 if [ ! -f "/etc/pki/tls/private/localhost.pem" ]; then
     pushd /etc/pki/tls/certs/
     ./make-dummy-cert ../private/localhost.pem
     popd
 fi
 
 sed -r -i \
     -e "s/host, \"127\.0\.0\.1\"/host, \"${KOLAB_IMAPF_EXT_SERVICE_HOST}\"/g" \
+    -e "s/port, 9143/port, 143/g" \
+    -e "s/port, 9993/port, 993/g" \
     /etc/guam/sys.config
 
 $@
diff --git a/03-guam/sys.config b/03-guam/sys.config
deleted file mode 100644
index def33e7..0000000
--- a/03-guam/sys.config
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-    {
-        kolab_guam, [
-            {
-                imap_servers, [
-                    {
-                        imap, [
-                            { host, "192.168.56.101" },
-                            { port, 143 },
-                            { tls, starttls }
-                        ]
-                    },
-                    {
-                        imaps, [
-                            { host, "192.168.56.101" },
-                            { port, 993 },
-                            { tls, true }
-                        ]
-                    }
-                ]
-            },
-            {
-                listeners, [
-                    {
-                        imap, [
-                            { port, 143 },
-                            { imap_server, imap },
-                            {
-                                rules, [
-                                    { filter_groupware, [] }
-                                ]
-                            },
-                            {
-                                tls_config, [
-                                    { certfile, "/etc/ssl/sample.pem" }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        imaps, [
-                            { port, 993 },
-                            { implicit_tls, true },
-                            { imap_server, imaps },
-                            {
-                                rules, [
-                                    { filter_groupware, [] }
-                                ]
-                            },
-                            {
-                                tls_config, [
-                                    { certfile, "/etc/ssl/sample.pem" }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-
-    {
-        lager, [
-            {
-                handlers, [
-                    { lager_console_backend, debug },
-                    { lager_file_backend, [ { file, "log/error.log"}, { level, error } ] },
-                    { lager_file_backend, [ { file, "log/console.log"}, { level, info } ] }
-                ]
-            }
-        ]
-    },
-
-    %% SASL config
-    {
-        sasl, [
-            { sasl_error_logger, { file, "log/sasl-error.log" } },
-            { errlog_type, error },
-            { error_logger_mf_dir, "log/sasl" },      % Log directory
-            { error_logger_mf_maxbytes, 10485760 },   % 10 MB max file size
-            { error_logger_mf_maxfiles, 5 }           % 5 files max
-        ]
-    }
-].