diff --git a/docker/Dockerfile b/docker/Dockerfile
index 15693fa03..2672fa22e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,7 @@
-FROM python:3.6-buster
+FROM python:3.8-buster
+
+MAINTAINER Manuel Holtgrewe <manuel.holtgrewe@bih-charite.de>
+LABEL org.opencontainers.image.source https://github.com/bihealth/varfish-server
 
 ARG app_git_url=https://github.com/bihealth/varfish-server.git
 ARG app_git_tag
@@ -110,6 +113,7 @@ RUN cd /usr/src/app && \
     DJANGO_SECRET_KEY=for-build-only \
     DJANGO_SETTINGS_MODULE=config.settings.production \
     DATABASE_URL=postgres://varfish:varfish@fake/varfish \
+    python manage.py geticons && \
     python manage.py collectstatic --no-input
 
 # Define the entry point.
diff --git a/docker/build-docker.sh b/docker/build-docker.sh
index 5c3266fad..dca6d3bb0 100755
--- a/docker/build-docker.sh
+++ b/docker/build-docker.sh
@@ -15,4 +15,4 @@ docker build . \
     --build-arg app_git_tag=$GIT_TAG \
     --build-arg app_git_depth=$GIT_DEPTH \
     --build-arg app_git_url=$GIT_URL \
-    -t bihealth/varfish-server:$DOCKER_VERSION
+    -t ghcr.io/bihealth/varfish-server:$DOCKER_VERSION
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 60d4ad66f..64443f5b1 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -69,8 +69,9 @@ if [[ "$1" == wsgi ]]; then
 elif [[ "$1" == celeryd ]]; then
   cd $APP_DIR
 
-  exec celery worker \
+  exec celery \
     --app config.celery_app \
+    worker \
     -Q "${CELERY_QUEUES}" \
     --concurrency "${CELERY_WORKERS}" \
     --loglevel info
@@ -78,8 +79,9 @@ elif [[ "$1" == celerybeat ]]; then
   cd $APP_DIR
   rm -f celerybeat.pid
 
-  exec celery beat \
+  exec celery \
     --max-interval 30 \
+    beat \
     --app config.celery_app \
     --loglevel info
 else