diff --git a/docker-setup/config/grafana.ini b/docker-setup/config/grafana.ini
index 68694ff76167204004b4176d6b029e98ebf36900..438a5432605ddf6ca76843df97b0360f80727594 100644
--- a/docker-setup/config/grafana.ini
+++ b/docker-setup/config/grafana.ini
@@ -57,8 +57,7 @@ logging = true
 
 [database]
 # Either "mysql", "postgres" or "sqlite3", it's your choice
-type = postgres
-host = postgres
+type = sqlite3
 name = grafana
 user = grafana
 password = grafana
diff --git a/docker-setup/docker-compose.yaml b/docker-setup/docker-compose.yaml
index 5847a3c0bc31faabd55368a991a41d2ca5eb565e..a4512b0181f4c67469955a8a4dc7290d4001daa2 100644
--- a/docker-setup/docker-compose.yaml
+++ b/docker-setup/docker-compose.yaml
@@ -10,17 +10,4 @@ services:
         - ./config:/etc/grafana/
       environment: 
         - GF_INSTALL_PLUGINS=grafana-simple-json-datasource
-    postgres:
-      restart: always
-      build:
-          context: .
-          args:
-              DBUSER: grafana
-              DBPASS: grafana
-              DBNAME: grafana
-      hostname: postgres
-      ports:
-          - "5432:5432"
-      volumes:
-          - ./postgresdata:/var/lib/postgresql:z
 
diff --git a/docker-setup/entrypoint.sh b/docker-setup/entrypoint.sh
deleted file mode 100755
index e85d1e5e753e8bf2d83f74c71d77073d15330c75..0000000000000000000000000000000000000000
--- a/docker-setup/entrypoint.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Entrypoint for the containerized database
-# Ensures the required setup is performed on the share before
-# starting the database
-
-if [ "$PGDATA" = "" ]
-then
-    echo "Environment variable PGDATA is not set"
-    exit 1
-fi
-
-if [ ! -d "$PGDATA" ]
-then
-    echo "Directory $PGDATA does not exist - no volume mounted?"
-    exit 2
-fi
-
-# Postgres will refuse to work on a non-empty folder when initializing and the
-# mount point might have a dotfile
-PGDATA="$PGDATA/9.6"
-
-echo $PGDATA
-echo $DBNAME
-echo $DBUSER
-
-if [ ! -d "$PGDATA" ]
-then
-    echo "Database seems to be uninitialized - doing so"
-    mkdir $PGDATA
-    initdb --pgdata=$PGDATA && \
-        pg_ctl start && \
-        sleep 4 && \
-        createuser -d -l -s $DBUSER && \
-        createdb -O $DBUSER $DBNAME && \
-        psql -c "ALTER ROLE $DBUSER WITH PASSWORD '$DBPASS'" && \
-        psql -a $DBNAME -c 'CREATE EXTENSION "uuid-ossp" WITH SCHEMA pg_catalog' && \
-        echo "host all all all md5" >> $PGDATA/pg_hba.conf && \
-        echo "listen_addresses = '0.0.0.0'" >> $PGDATA/postgresql.conf && \
-        pg_ctl stop
-fi
-
-exec /usr/bin/postgres