diff --git a/Dockerfile b/Dockerfile
index ee20314cd..047764da1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN /usr/bin/yarn --cwd website \
   && /usr/bin/yarn --cwd website build
 
 # Main image derived from openvsx-server
-FROM docker.io/amvanbaren/openvsx-server:b386833
+FROM ghcr.io/eclipse/openvsx-server:df28c16
 
 COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
 COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/ config/
diff --git a/configuration/application.yml b/configuration/application.yml
index 7fc04473b..2b750355f 100644
--- a/configuration/application.yml
+++ b/configuration/application.yml
@@ -17,6 +17,8 @@ spring:
   datasource:
     hikari:
       maximum-pool-size: 10
+  flyway:
+    baseline-on-migrate: false
   jpa:
     open-in-view: false
     properties: