diff --git a/Dockerfile b/Dockerfile
index 2d4d142..3ffe461 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,9 +27,9 @@ RUN chgrp -h radiusd /etc/raddb/mods-enabled/sql
 #install Daloradius
 
 
-COPY container_files/docker-entrypoint.sh /
-RUN chmod 755 /docker-entrypoint.sh
+#COPY container_files/docker-entrypoint.sh /
+#RUN chmod 755 /docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["radiusd"]
+#ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/usr/sbin/radiusd","-f"]
diff --git a/test-compose/db/Dockerfile b/test-compose/db/Dockerfile
index 0b20eb9..713621c 100644
--- a/test-compose/db/Dockerfile
+++ b/test-compose/db/Dockerfile
@@ -33,9 +33,9 @@ RUN mysql_install_db \
     && echo "mysql -e 'DROP DATABASE IF EXISTS test;'" >> /tmp/config \
     && echo "mysql -e 'DELETE FROM mysql.db WHERE Db=\"test\" OR Db=\"test\\_%\";'" >> /tmp/config \
     && echo "mysql -e 'CREATE DATABASE ${DB_NAME};'" >> /tmp/config \
+    && echo "mysql -u root --password=${DB_PWD} ${DB_NAME} < /rad-schema.sql" >> /tmp/config \
     && echo "mysql -e 'GRANT ALL ON ${DB_NAME}.* TO ${DB_USER}@localhost IDENTIFIED BY \"${DB_USER_PWD}\";'" >> /tmp/config \
     && echo "mysql -e 'FLUSH PRIVILEGES;'" >> /tmp/config \
-    && echo "mysql -u root --password=${DB_PWD} radius < /rad-schema.sql" >> /tmp/config \
     && bash /tmp/config \
     && rm -f /tmp/config
 
diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index 792cb50..597f61a 100644
--- a/test-compose/docker-compose.yml
+++ b/test-compose/docker-compose.yml
@@ -15,8 +15,8 @@ services:
      - front
      - back
     ports:
-     - "1812/udp:1812/udp"
-     - "1813/udp:1813/udp"
+     - "1812:1812/udp"
+     - "1813:1813/udp"
      - "443:443"
 
   db:
@@ -36,13 +36,14 @@ services:
     volumes:
      - radius_db:/var/lib/mysql
 
+networks:
   front:
     driver: bridge
-  back:    
+  back:
     driver: bridge
 
  
 volumes:
-  radius_db:  
+  radius_db:
     driver: local
 
diff --git a/test-compose/radius/Dockerfile b/test-compose/radius/Dockerfile
index 2429d89..70f161e 100644
--- a/test-compose/radius/Dockerfile
+++ b/test-compose/radius/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/eduroam-radius:3.0_20200221
+FROM tier/eduroam-freeradius:3.0-20200221
 
 
 COPY container_files/rad-sql.cfg /etc/raddb/mods-available/sql
diff --git a/test-compose/radius/container_files/rad-sql.cfg b/test-compose/radius/container_files/rad-sql.cfg
index bc46c34..1bc71cd 100644
--- a/test-compose/radius/container_files/rad-sql.cfg
+++ b/test-compose/radius/container_files/rad-sql.cfg
@@ -88,7 +88,7 @@ sql {
 
         # Connection info:
         #
-        server = "localhost"
+        server = "db"
         port = 3306
         login = "radius"
         password = "MySecretPassword"